From 9dbebfa38f99d50d051d862e380e25c599c5430c Mon Sep 17 00:00:00 2001
From: Anghelo Carvajal <angheloalf95@gmail.com>
Date: Fri, 30 Apr 2021 20:23:50 -0400
Subject: [PATCH] Change Hints in scene's XMLs (#800)

* Remove blobhint

* Add segments and offsets, and remove most hints

* Change PathHint to Path

* Add missing final new lines in scenes xmls
---
 assets/xml/scenes/dungeons/Bmori1.xml         |  97 +++++++-------
 assets/xml/scenes/dungeons/FIRE_bs.xml        |  12 +-
 assets/xml/scenes/dungeons/HAKAdan.xml        |  97 +++++++-------
 assets/xml/scenes/dungeons/HAKAdanCH.xml      |  33 +++--
 assets/xml/scenes/dungeons/HAKAdan_bs.xml     |  12 +-
 assets/xml/scenes/dungeons/HIDAN.xml          | 113 ++++++++--------
 assets/xml/scenes/dungeons/MIZUsin.xml        |  97 +++++++-------
 assets/xml/scenes/dungeons/MIZUsin_bs.xml     |  12 +-
 assets/xml/scenes/dungeons/bdan.xml           |  69 +++++-----
 assets/xml/scenes/dungeons/bdan_boss.xml      |  12 +-
 assets/xml/scenes/dungeons/ddan.xml           |  72 +++++------
 assets/xml/scenes/dungeons/ddan_boss.xml      |  12 +-
 assets/xml/scenes/dungeons/ganon.xml          |  45 ++++---
 assets/xml/scenes/dungeons/ganon_boss.xml     |   8 +-
 assets/xml/scenes/dungeons/ganon_demo.xml     |   8 +-
 assets/xml/scenes/dungeons/ganon_final.xml    |   8 +-
 assets/xml/scenes/dungeons/ganon_sonogo.xml   |  25 ++--
 assets/xml/scenes/dungeons/ganon_tou.xml      |   8 +-
 assets/xml/scenes/dungeons/ganontika.xml      | 117 +++++++++--------
 .../xml/scenes/dungeons/ganontikasonogo.xml   |  12 +-
 assets/xml/scenes/dungeons/gerudoway.xml      |  28 ++--
 assets/xml/scenes/dungeons/ice_doukutu.xml    |  53 ++++----
 assets/xml/scenes/dungeons/jyasinboss.xml     |  21 ++-
 assets/xml/scenes/dungeons/jyasinzou.xml      | 121 +++++++++---------
 assets/xml/scenes/dungeons/men.xml            |  53 ++++----
 assets/xml/scenes/dungeons/moribossroom.xml   |  12 +-
 assets/xml/scenes/dungeons/ydan.xml           |  52 ++++----
 assets/xml/scenes/dungeons/ydan_boss.xml      |  12 +-
 assets/xml/scenes/indoors/bowling.xml         |   9 +-
 assets/xml/scenes/indoors/daiyousei_izumi.xml |   8 +-
 assets/xml/scenes/indoors/hairal_niwa.xml     |   8 +-
 assets/xml/scenes/indoors/hairal_niwa2.xml    |   8 +-
 assets/xml/scenes/indoors/hairal_niwa_n.xml   |   8 +-
 assets/xml/scenes/indoors/hakasitarelay.xml   |  39 +++---
 assets/xml/scenes/indoors/hut.xml             |   8 +-
 assets/xml/scenes/indoors/hylia_labo.xml      |   8 +-
 assets/xml/scenes/indoors/impa.xml            |   8 +-
 assets/xml/scenes/indoors/kakariko.xml        |   8 +-
 assets/xml/scenes/indoors/kenjyanoma.xml      |   8 +-
 assets/xml/scenes/indoors/kokiri_home.xml     |   8 +-
 assets/xml/scenes/indoors/kokiri_home3.xml    |   8 +-
 assets/xml/scenes/indoors/kokiri_home4.xml    |   8 +-
 assets/xml/scenes/indoors/kokiri_home5.xml    |   8 +-
 assets/xml/scenes/indoors/labo.xml            |   8 +-
 assets/xml/scenes/indoors/link_home.xml       |   8 +-
 assets/xml/scenes/indoors/mahouya.xml         |   9 +-
 assets/xml/scenes/indoors/malon_stable.xml    |   8 +-
 assets/xml/scenes/indoors/miharigoya.xml      |  24 ++--
 assets/xml/scenes/indoors/nakaniwa.xml        |  19 ++-
 assets/xml/scenes/indoors/syatekijyou.xml     |  12 +-
 assets/xml/scenes/indoors/takaraya.xml        |  39 +++---
 assets/xml/scenes/indoors/tent.xml            |   8 +-
 assets/xml/scenes/indoors/tokinoma.xml        |  19 ++-
 .../xml/scenes/indoors/yousei_izumi_tate.xml  |   8 +-
 .../xml/scenes/indoors/yousei_izumi_yoko.xml  |   8 +-
 assets/xml/scenes/misc/enrui.xml              |   9 +-
 assets/xml/scenes/misc/entra_n.xml            |   9 +-
 assets/xml/scenes/misc/hakaana.xml            |   9 +-
 assets/xml/scenes/misc/hakaana2.xml           |   9 +-
 assets/xml/scenes/misc/hakaana_ouke.xml       |  19 ++-
 assets/xml/scenes/misc/hiral_demo.xml         |   9 +-
 assets/xml/scenes/misc/kakariko3.xml          |   9 +-
 assets/xml/scenes/misc/kakusiana.xml          |  60 ++++-----
 assets/xml/scenes/misc/kinsuta.xml            |  13 +-
 assets/xml/scenes/misc/market_alley.xml       |   9 +-
 assets/xml/scenes/misc/market_alley_n.xml     |   9 +-
 assets/xml/scenes/misc/market_day.xml         |   9 +-
 assets/xml/scenes/misc/market_night.xml       |   9 +-
 assets/xml/scenes/misc/market_ruins.xml       |   9 +-
 assets/xml/scenes/misc/shrine.xml             |   9 +-
 assets/xml/scenes/misc/shrine_n.xml           |   9 +-
 assets/xml/scenes/misc/shrine_r.xml           |   9 +-
 assets/xml/scenes/misc/turibori.xml           |   9 +-
 assets/xml/scenes/overworld/entra.xml         |   8 +-
 assets/xml/scenes/overworld/souko.xml         |  16 +--
 assets/xml/scenes/overworld/spot00.xml        |   9 +-
 assets/xml/scenes/overworld/spot01.xml        |  11 +-
 assets/xml/scenes/overworld/spot02.xml        |  16 +--
 assets/xml/scenes/overworld/spot03.xml        |  26 ++--
 assets/xml/scenes/overworld/spot04.xml        |  36 +++---
 assets/xml/scenes/overworld/spot05.xml        |  28 ++--
 assets/xml/scenes/overworld/spot06.xml        |  25 ++--
 assets/xml/scenes/overworld/spot07.xml        |  17 +--
 assets/xml/scenes/overworld/spot08.xml        |  12 +-
 assets/xml/scenes/overworld/spot09.xml        |  27 ++--
 assets/xml/scenes/overworld/spot10.xml        |  52 ++++----
 assets/xml/scenes/overworld/spot11.xml        |  11 +-
 assets/xml/scenes/overworld/spot12.xml        |  17 ++-
 assets/xml/scenes/overworld/spot13.xml        |  15 +--
 assets/xml/scenes/overworld/spot15.xml        |  11 +-
 assets/xml/scenes/overworld/spot16.xml        |  11 +-
 assets/xml/scenes/overworld/spot17.xml        |  17 ++-
 assets/xml/scenes/overworld/spot18.xml        |  28 ++--
 assets/xml/scenes/overworld/spot20.xml        |  16 +--
 assets/xml/scenes/shops/alley_shop.xml        |   8 +-
 assets/xml/scenes/shops/drag.xml              |   8 +-
 assets/xml/scenes/shops/face_shop.xml         |   8 +-
 assets/xml/scenes/shops/golon.xml             |   8 +-
 assets/xml/scenes/shops/kokiri_shop.xml       |   8 +-
 assets/xml/scenes/shops/night_shop.xml        |   8 +-
 assets/xml/scenes/shops/shop1.xml             |   8 +-
 assets/xml/scenes/shops/zoora.xml             |   8 +-
 assets/xml/scenes/test_levels/besitu.xml      |   8 +-
 assets/xml/scenes/test_levels/depth_test.xml  |   8 +-
 assets/xml/scenes/test_levels/sasatest.xml    |   9 +-
 assets/xml/scenes/test_levels/sutaru.xml      |  13 +-
 assets/xml/scenes/test_levels/syotes.xml      |  12 +-
 assets/xml/scenes/test_levels/syotes2.xml     |  12 +-
 assets/xml/scenes/test_levels/test01.xml      |   8 +-
 assets/xml/scenes/test_levels/testroom.xml    |  24 ++--
 110 files changed, 1126 insertions(+), 1211 deletions(-)

diff --git a/assets/xml/scenes/dungeons/Bmori1.xml b/assets/xml/scenes/dungeons/Bmori1.xml
index 2c95cf2c75..963c1273ba 100644
--- a/assets/xml/scenes/dungeons/Bmori1.xml
+++ b/assets/xml/scenes/dungeons/Bmori1.xml
@@ -1,75 +1,74 @@
 <Root>
-    <File Name="Bmori1_scene">
+    <File Name="Bmori1_scene" Segment="2">
         <Scene Name="Bmori1_scene"/>
     </File>
-    <File Name="Bmori1_room_0">
-        <Room Name="Bmori1_room_0"/>
+    <File Name="Bmori1_room_0" Segment="3">
+        <Room Name="Bmori1_room_0" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_1">
-        <Room Name="Bmori1_room_1"/>
+    <File Name="Bmori1_room_1" Segment="3">
+        <Room Name="Bmori1_room_1" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_2">
-        <Room Name="Bmori1_room_2">
-        </Room>
+    <File Name="Bmori1_room_2" Segment="3">
+        <Room Name="Bmori1_room_2" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_3">
-        <Room Name="Bmori1_room_3"/>
+    <File Name="Bmori1_room_3" Segment="3">
+        <Room Name="Bmori1_room_3" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_4">
-        <Room Name="Bmori1_room_4"/>
+    <File Name="Bmori1_room_4" Segment="3">
+        <Room Name="Bmori1_room_4" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_5">
-        <Room Name="Bmori1_room_5"/>
+    <File Name="Bmori1_room_5" Segment="3">
+        <Room Name="Bmori1_room_5" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_6">
-        <Room Name="Bmori1_room_6"/>
+    <File Name="Bmori1_room_6" Segment="3">
+        <Room Name="Bmori1_room_6" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_7">
-        <Room Name="Bmori1_room_7"/>
+    <File Name="Bmori1_room_7" Segment="3">
+        <Room Name="Bmori1_room_7" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_8">
-        <Room Name="Bmori1_room_8"/>
+    <File Name="Bmori1_room_8" Segment="3">
+        <Room Name="Bmori1_room_8" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_9">
-        <Room Name="Bmori1_room_9"/>
+    <File Name="Bmori1_room_9" Segment="3">
+        <Room Name="Bmori1_room_9" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_10">
-        <Room Name="Bmori1_room_10"/>
+    <File Name="Bmori1_room_10" Segment="3">
+        <Room Name="Bmori1_room_10" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_11">
-        <Room Name="Bmori1_room_11"/>
+    <File Name="Bmori1_room_11" Segment="3">
+        <Room Name="Bmori1_room_11" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_12">
-        <Room Name="Bmori1_room_12"/>
+    <File Name="Bmori1_room_12" Segment="3">
+        <Room Name="Bmori1_room_12" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_13">
-        <Room Name="Bmori1_room_13"/>
+    <File Name="Bmori1_room_13" Segment="3">
+        <Room Name="Bmori1_room_13" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_14">
-        <Room Name="Bmori1_room_14"/>
+    <File Name="Bmori1_room_14" Segment="3">
+        <Room Name="Bmori1_room_14" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_15">
-        <Room Name="Bmori1_room_15"/>
+    <File Name="Bmori1_room_15" Segment="3">
+        <Room Name="Bmori1_room_15" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_16">
-        <Room Name="Bmori1_room_16"/>
+    <File Name="Bmori1_room_16" Segment="3">
+        <Room Name="Bmori1_room_16" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_17">
-        <Room Name="Bmori1_room_17"/>
+    <File Name="Bmori1_room_17" Segment="3">
+        <Room Name="Bmori1_room_17" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_18">
-        <Room Name="Bmori1_room_18"/>
+    <File Name="Bmori1_room_18" Segment="3">
+        <Room Name="Bmori1_room_18" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_19">
-        <Room Name="Bmori1_room_19"/>
+    <File Name="Bmori1_room_19" Segment="3">
+        <Room Name="Bmori1_room_19" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_20">
-        <Room Name="Bmori1_room_20"/>
+    <File Name="Bmori1_room_20" Segment="3">
+        <Room Name="Bmori1_room_20" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_21">
-        <Room Name="Bmori1_room_21"/>
+    <File Name="Bmori1_room_21" Segment="3">
+        <Room Name="Bmori1_room_21" Offset="0x0"/>
     </File>
-    <File Name="Bmori1_room_22">
-        <Room Name="Bmori1_room_22"/>
+    <File Name="Bmori1_room_22" Segment="3">
+        <Room Name="Bmori1_room_22" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/FIRE_bs.xml b/assets/xml/scenes/dungeons/FIRE_bs.xml
index 85d4339390..d6fd3a0081 100644
--- a/assets/xml/scenes/dungeons/FIRE_bs.xml
+++ b/assets/xml/scenes/dungeons/FIRE_bs.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="FIRE_bs_scene">
+    <File Name="FIRE_bs_scene" Segment="2">
         <Scene Name="FIRE_bs_scene"/>
     </File>
-    <File Name="FIRE_bs_room_0">
-        <Room Name="FIRE_bs_room_0"/>
+    <File Name="FIRE_bs_room_0" Segment="3">
+        <Room Name="FIRE_bs_room_0" Offset="0x0"/>
     </File>
-    <File Name="FIRE_bs_room_1">
-        <Room Name="FIRE_bs_room_1"/>
+    <File Name="FIRE_bs_room_1" Segment="3">
+        <Room Name="FIRE_bs_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/HAKAdan.xml b/assets/xml/scenes/dungeons/HAKAdan.xml
index 6fb2e608e5..9d01f4fb15 100644
--- a/assets/xml/scenes/dungeons/HAKAdan.xml
+++ b/assets/xml/scenes/dungeons/HAKAdan.xml
@@ -1,75 +1,74 @@
 <Root>
-    <File Name="HAKAdan_scene">
+    <File Name="HAKAdan_scene" Segment="2">
         <Scene Name="HAKAdan_scene"/>
     </File>
-    <File Name="HAKAdan_room_0">
-        <Room Name="HAKAdan_room_0"/>
+    <File Name="HAKAdan_room_0" Segment="3">
+        <Room Name="HAKAdan_room_0" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_1">
-        <Room Name="HAKAdan_room_1"/>
+    <File Name="HAKAdan_room_1" Segment="3">
+        <Room Name="HAKAdan_room_1" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_2">
-        <Room Name="HAKAdan_room_2">
-        </Room>
+    <File Name="HAKAdan_room_2" Segment="3">
+        <Room Name="HAKAdan_room_2" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_3">
-        <Room Name="HAKAdan_room_3"/>
+    <File Name="HAKAdan_room_3" Segment="3">
+        <Room Name="HAKAdan_room_3" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_4">
-        <Room Name="HAKAdan_room_4"/>
+    <File Name="HAKAdan_room_4" Segment="3">
+        <Room Name="HAKAdan_room_4" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_5">
-        <Room Name="HAKAdan_room_5"/>
+    <File Name="HAKAdan_room_5" Segment="3">
+        <Room Name="HAKAdan_room_5" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_6">
-        <Room Name="HAKAdan_room_6"/>
+    <File Name="HAKAdan_room_6" Segment="3">
+        <Room Name="HAKAdan_room_6" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_7">
-        <Room Name="HAKAdan_room_7"/>
+    <File Name="HAKAdan_room_7" Segment="3">
+        <Room Name="HAKAdan_room_7" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_8">
-        <Room Name="HAKAdan_room_8"/>
+    <File Name="HAKAdan_room_8" Segment="3">
+        <Room Name="HAKAdan_room_8" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_9">
-        <Room Name="HAKAdan_room_9"/>
+    <File Name="HAKAdan_room_9" Segment="3">
+        <Room Name="HAKAdan_room_9" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_10">
-        <Room Name="HAKAdan_room_10"/>
+    <File Name="HAKAdan_room_10" Segment="3">
+        <Room Name="HAKAdan_room_10" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_11">
-        <Room Name="HAKAdan_room_11"/>
+    <File Name="HAKAdan_room_11" Segment="3">
+        <Room Name="HAKAdan_room_11" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_12">
-        <Room Name="HAKAdan_room_12"/>
+    <File Name="HAKAdan_room_12" Segment="3">
+        <Room Name="HAKAdan_room_12" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_13">
-        <Room Name="HAKAdan_room_13"/>
+    <File Name="HAKAdan_room_13" Segment="3">
+        <Room Name="HAKAdan_room_13" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_14">
-        <Room Name="HAKAdan_room_14"/>
+    <File Name="HAKAdan_room_14" Segment="3">
+        <Room Name="HAKAdan_room_14" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_15">
-        <Room Name="HAKAdan_room_15"/>
+    <File Name="HAKAdan_room_15" Segment="3">
+        <Room Name="HAKAdan_room_15" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_16">
-        <Room Name="HAKAdan_room_16"/>
+    <File Name="HAKAdan_room_16" Segment="3">
+        <Room Name="HAKAdan_room_16" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_17">
-        <Room Name="HAKAdan_room_17"/>
+    <File Name="HAKAdan_room_17" Segment="3">
+        <Room Name="HAKAdan_room_17" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_18">
-        <Room Name="HAKAdan_room_18"/>
+    <File Name="HAKAdan_room_18" Segment="3">
+        <Room Name="HAKAdan_room_18" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_19">
-        <Room Name="HAKAdan_room_19"/>
+    <File Name="HAKAdan_room_19" Segment="3">
+        <Room Name="HAKAdan_room_19" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_20">
-        <Room Name="HAKAdan_room_20"/>
+    <File Name="HAKAdan_room_20" Segment="3">
+        <Room Name="HAKAdan_room_20" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_21">
-        <Room Name="HAKAdan_room_21"/>
+    <File Name="HAKAdan_room_21" Segment="3">
+        <Room Name="HAKAdan_room_21" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_room_22">
-        <Room Name="HAKAdan_room_22"/>
+    <File Name="HAKAdan_room_22" Segment="3">
+        <Room Name="HAKAdan_room_22" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/HAKAdanCH.xml b/assets/xml/scenes/dungeons/HAKAdanCH.xml
index d6cffc0acc..ea93d5b727 100644
--- a/assets/xml/scenes/dungeons/HAKAdanCH.xml
+++ b/assets/xml/scenes/dungeons/HAKAdanCH.xml
@@ -1,27 +1,26 @@
 <Root>
-    <File Name="HAKAdanCH_scene">
+    <File Name="HAKAdanCH_scene" Segment="2">
         <Scene Name="HAKAdanCH_scene"/>
     </File>
-    <File Name="HAKAdanCH_room_0">
-        <Room Name="HAKAdanCH_room_0"/>
+    <File Name="HAKAdanCH_room_0" Segment="3">
+        <Room Name="HAKAdanCH_room_0" Offset="0x0"/>
     </File>
-    <File Name="HAKAdanCH_room_1">
-        <Room Name="HAKAdanCH_room_1"/>
+    <File Name="HAKAdanCH_room_1" Segment="3">
+        <Room Name="HAKAdanCH_room_1" Offset="0x0"/>
     </File>
-    <File Name="HAKAdanCH_room_2">
-        <Room Name="HAKAdanCH_room_2">
-        </Room>
+    <File Name="HAKAdanCH_room_2" Segment="3">
+        <Room Name="HAKAdanCH_room_2" Offset="0x0"/>
     </File>
-    <File Name="HAKAdanCH_room_3">
-        <Room Name="HAKAdanCH_room_3"/>
+    <File Name="HAKAdanCH_room_3" Segment="3">
+        <Room Name="HAKAdanCH_room_3" Offset="0x0"/>
     </File>
-    <File Name="HAKAdanCH_room_4">
-        <Room Name="HAKAdanCH_room_4"/>
+    <File Name="HAKAdanCH_room_4" Segment="3">
+        <Room Name="HAKAdanCH_room_4" Offset="0x0"/>
     </File>
-    <File Name="HAKAdanCH_room_5">
-        <Room Name="HAKAdanCH_room_5"/>
+    <File Name="HAKAdanCH_room_5" Segment="3">
+        <Room Name="HAKAdanCH_room_5" Offset="0x0"/>
     </File>
-    <File Name="HAKAdanCH_room_6">
-        <Room Name="HAKAdanCH_room_6"/>
+    <File Name="HAKAdanCH_room_6" Segment="3">
+        <Room Name="HAKAdanCH_room_6" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/HAKAdan_bs.xml b/assets/xml/scenes/dungeons/HAKAdan_bs.xml
index 6e2c0ca873..dd9040748b 100644
--- a/assets/xml/scenes/dungeons/HAKAdan_bs.xml
+++ b/assets/xml/scenes/dungeons/HAKAdan_bs.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="HAKAdan_bs_scene">
+    <File Name="HAKAdan_bs_scene" Segment="2">
         <Scene Name="HAKAdan_bs_scene"/>
     </File>
-    <File Name="HAKAdan_bs_room_0">
-        <Room Name="HAKAdan_bs_room_0"/>
+    <File Name="HAKAdan_bs_room_0" Segment="3">
+        <Room Name="HAKAdan_bs_room_0" Offset="0x0"/>
     </File>
-    <File Name="HAKAdan_bs_room_1">
-        <Room Name="HAKAdan_bs_room_1"/>
+    <File Name="HAKAdan_bs_room_1" Segment="3">
+        <Room Name="HAKAdan_bs_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/HIDAN.xml b/assets/xml/scenes/dungeons/HIDAN.xml
index aca6479610..b25f1a068c 100644
--- a/assets/xml/scenes/dungeons/HIDAN.xml
+++ b/assets/xml/scenes/dungeons/HIDAN.xml
@@ -1,87 +1,86 @@
 <Root>
-    <File Name="HIDAN_scene">
+    <File Name="HIDAN_scene" Segment="2">
         <Scene Name="HIDAN_scene"/>
     </File>
-    <File Name="HIDAN_room_0">
-        <Room Name="HIDAN_room_0"/>
+    <File Name="HIDAN_room_0" Segment="3">
+        <Room Name="HIDAN_room_0" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_1">
-        <Room Name="HIDAN_room_1"/>
+    <File Name="HIDAN_room_1" Segment="3">
+        <Room Name="HIDAN_room_1" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_2">
-        <Room Name="HIDAN_room_2">
-        </Room>
+    <File Name="HIDAN_room_2" Segment="3">
+        <Room Name="HIDAN_room_2" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_3">
-        <Room Name="HIDAN_room_3"/>
+    <File Name="HIDAN_room_3" Segment="3">
+        <Room Name="HIDAN_room_3" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_4">
-        <Room Name="HIDAN_room_4"/>
+    <File Name="HIDAN_room_4" Segment="3">
+        <Room Name="HIDAN_room_4" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_5">
-        <Room Name="HIDAN_room_5"/>
+    <File Name="HIDAN_room_5" Segment="3">
+        <Room Name="HIDAN_room_5" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_6">
-        <Room Name="HIDAN_room_6"/>
+    <File Name="HIDAN_room_6" Segment="3">
+        <Room Name="HIDAN_room_6" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_7">
-        <Room Name="HIDAN_room_7"/>
+    <File Name="HIDAN_room_7" Segment="3">
+        <Room Name="HIDAN_room_7" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_8">
-        <Room Name="HIDAN_room_8"/>
+    <File Name="HIDAN_room_8" Segment="3">
+        <Room Name="HIDAN_room_8" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_9">
-        <Room Name="HIDAN_room_9"/>
+    <File Name="HIDAN_room_9" Segment="3">
+        <Room Name="HIDAN_room_9" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_10">
-        <Room Name="HIDAN_room_10"/>
+    <File Name="HIDAN_room_10" Segment="3">
+        <Room Name="HIDAN_room_10" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_11">
-        <Room Name="HIDAN_room_11"/>
+    <File Name="HIDAN_room_11" Segment="3">
+        <Room Name="HIDAN_room_11" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_12">
-        <Room Name="HIDAN_room_12"/>
+    <File Name="HIDAN_room_12" Segment="3">
+        <Room Name="HIDAN_room_12" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_13">
-        <Room Name="HIDAN_room_13"/>
+    <File Name="HIDAN_room_13" Segment="3">
+        <Room Name="HIDAN_room_13" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_14">
-        <Room Name="HIDAN_room_14"/>
+    <File Name="HIDAN_room_14" Segment="3">
+        <Room Name="HIDAN_room_14" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_15">
-        <Room Name="HIDAN_room_15"/>
+    <File Name="HIDAN_room_15" Segment="3">
+        <Room Name="HIDAN_room_15" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_16">
-        <Room Name="HIDAN_room_16"/>
+    <File Name="HIDAN_room_16" Segment="3">
+        <Room Name="HIDAN_room_16" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_17">
-        <Room Name="HIDAN_room_17"/>
+    <File Name="HIDAN_room_17" Segment="3">
+        <Room Name="HIDAN_room_17" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_18">
-        <Room Name="HIDAN_room_18"/>
+    <File Name="HIDAN_room_18" Segment="3">
+        <Room Name="HIDAN_room_18" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_19">
-        <Room Name="HIDAN_room_19"/>
+    <File Name="HIDAN_room_19" Segment="3">
+        <Room Name="HIDAN_room_19" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_20">
-        <Room Name="HIDAN_room_20"/>
+    <File Name="HIDAN_room_20" Segment="3">
+        <Room Name="HIDAN_room_20" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_21">
-        <Room Name="HIDAN_room_21"/>
+    <File Name="HIDAN_room_21" Segment="3">
+        <Room Name="HIDAN_room_21" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_22">
-        <Room Name="HIDAN_room_22"/>
+    <File Name="HIDAN_room_22" Segment="3">
+        <Room Name="HIDAN_room_22" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_23">
-        <Room Name="HIDAN_room_23"/>
+    <File Name="HIDAN_room_23" Segment="3">
+        <Room Name="HIDAN_room_23" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_24">
-        <Room Name="HIDAN_room_24"/>
+    <File Name="HIDAN_room_24" Segment="3">
+        <Room Name="HIDAN_room_24" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_25">
-        <Room Name="HIDAN_room_25"/>
+    <File Name="HIDAN_room_25" Segment="3">
+        <Room Name="HIDAN_room_25" Offset="0x0"/>
     </File>
-    <File Name="HIDAN_room_26">
-        <Room Name="HIDAN_room_26"/>
+    <File Name="HIDAN_room_26" Segment="3">
+        <Room Name="HIDAN_room_26" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/MIZUsin.xml b/assets/xml/scenes/dungeons/MIZUsin.xml
index e7dd1d3329..7193294ac2 100644
--- a/assets/xml/scenes/dungeons/MIZUsin.xml
+++ b/assets/xml/scenes/dungeons/MIZUsin.xml
@@ -1,75 +1,74 @@
 <Root>
-    <File Name="MIZUsin_scene">
+    <File Name="MIZUsin_scene" Segment="2">
         <Scene Name="MIZUsin_scene"/>
     </File>
-    <File Name="MIZUsin_room_0">
-        <Room Name="MIZUsin_room_0"/>
+    <File Name="MIZUsin_room_0" Segment="3">
+        <Room Name="MIZUsin_room_0" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_1">
-        <Room Name="MIZUsin_room_1"/>
+    <File Name="MIZUsin_room_1" Segment="3">
+        <Room Name="MIZUsin_room_1" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_2">
-        <Room Name="MIZUsin_room_2">
-        </Room>
+    <File Name="MIZUsin_room_2" Segment="3">
+        <Room Name="MIZUsin_room_2" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_3">
-        <Room Name="MIZUsin_room_3"/>
+    <File Name="MIZUsin_room_3" Segment="3">
+        <Room Name="MIZUsin_room_3" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_4">
-        <Room Name="MIZUsin_room_4"/>
+    <File Name="MIZUsin_room_4" Segment="3">
+        <Room Name="MIZUsin_room_4" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_5">
-        <Room Name="MIZUsin_room_5"/>
+    <File Name="MIZUsin_room_5" Segment="3">
+        <Room Name="MIZUsin_room_5" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_6">
-        <Room Name="MIZUsin_room_6"/>
+    <File Name="MIZUsin_room_6" Segment="3">
+        <Room Name="MIZUsin_room_6" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_7">
-        <Room Name="MIZUsin_room_7"/>
+    <File Name="MIZUsin_room_7" Segment="3">
+        <Room Name="MIZUsin_room_7" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_8">
-        <Room Name="MIZUsin_room_8"/>
+    <File Name="MIZUsin_room_8" Segment="3">
+        <Room Name="MIZUsin_room_8" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_9">
-        <Room Name="MIZUsin_room_9"/>
+    <File Name="MIZUsin_room_9" Segment="3">
+        <Room Name="MIZUsin_room_9" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_10">
-        <Room Name="MIZUsin_room_10"/>
+    <File Name="MIZUsin_room_10" Segment="3">
+        <Room Name="MIZUsin_room_10" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_11">
-        <Room Name="MIZUsin_room_11"/>
+    <File Name="MIZUsin_room_11" Segment="3">
+        <Room Name="MIZUsin_room_11" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_12">
-        <Room Name="MIZUsin_room_12"/>
+    <File Name="MIZUsin_room_12" Segment="3">
+        <Room Name="MIZUsin_room_12" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_13">
-        <Room Name="MIZUsin_room_13"/>
+    <File Name="MIZUsin_room_13" Segment="3">
+        <Room Name="MIZUsin_room_13" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_14">
-        <Room Name="MIZUsin_room_14"/>
+    <File Name="MIZUsin_room_14" Segment="3">
+        <Room Name="MIZUsin_room_14" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_15">
-        <Room Name="MIZUsin_room_15"/>
+    <File Name="MIZUsin_room_15" Segment="3">
+        <Room Name="MIZUsin_room_15" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_16">
-        <Room Name="MIZUsin_room_16"/>
+    <File Name="MIZUsin_room_16" Segment="3">
+        <Room Name="MIZUsin_room_16" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_17">
-        <Room Name="MIZUsin_room_17"/>
+    <File Name="MIZUsin_room_17" Segment="3">
+        <Room Name="MIZUsin_room_17" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_18">
-        <Room Name="MIZUsin_room_18"/>
+    <File Name="MIZUsin_room_18" Segment="3">
+        <Room Name="MIZUsin_room_18" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_19">
-        <Room Name="MIZUsin_room_19"/>
+    <File Name="MIZUsin_room_19" Segment="3">
+        <Room Name="MIZUsin_room_19" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_20">
-        <Room Name="MIZUsin_room_20"/>
+    <File Name="MIZUsin_room_20" Segment="3">
+        <Room Name="MIZUsin_room_20" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_21">
-        <Room Name="MIZUsin_room_21"/>
+    <File Name="MIZUsin_room_21" Segment="3">
+        <Room Name="MIZUsin_room_21" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_room_22">
-        <Room Name="MIZUsin_room_22"/>
+    <File Name="MIZUsin_room_22" Segment="3">
+        <Room Name="MIZUsin_room_22" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/MIZUsin_bs.xml b/assets/xml/scenes/dungeons/MIZUsin_bs.xml
index 08b2754692..9942197fdc 100644
--- a/assets/xml/scenes/dungeons/MIZUsin_bs.xml
+++ b/assets/xml/scenes/dungeons/MIZUsin_bs.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="MIZUsin_bs_scene">
+    <File Name="MIZUsin_bs_scene" Segment="2">
         <Scene Name="MIZUsin_bs_scene"/>
     </File>
-    <File Name="MIZUsin_bs_room_0">
-        <Room Name="MIZUsin_bs_room_0"/>
+    <File Name="MIZUsin_bs_room_0" Segment="3">
+        <Room Name="MIZUsin_bs_room_0" Offset="0x0"/>
     </File>
-    <File Name="MIZUsin_bs_room_1">
-        <Room Name="MIZUsin_bs_room_1"/>
+    <File Name="MIZUsin_bs_room_1" Segment="3">
+        <Room Name="MIZUsin_bs_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/bdan.xml b/assets/xml/scenes/dungeons/bdan.xml
index 503b08ae55..be6a51c9ae 100644
--- a/assets/xml/scenes/dungeons/bdan.xml
+++ b/assets/xml/scenes/dungeons/bdan.xml
@@ -1,54 +1,53 @@
 <Root>
-    <File Name="bdan_scene">
+    <File Name="bdan_scene" Segment="2">
         <Scene Name="bdan_scene"/>
     </File>
-    <File Name="bdan_room_0">
-        <Room Name="bdan_room_0"/>
+    <File Name="bdan_room_0" Segment="3">
+        <Room Name="bdan_room_0" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_1">
-        <Room Name="bdan_room_1"/>
+    <File Name="bdan_room_1" Segment="3">
+        <Room Name="bdan_room_1" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_2">
-        <Room Name="bdan_room_2">
-        </Room>
+    <File Name="bdan_room_2" Segment="3">
+        <Room Name="bdan_room_2" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_3">
-        <Room Name="bdan_room_3"/>
+    <File Name="bdan_room_3" Segment="3">
+        <Room Name="bdan_room_3" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_4">
-        <Room Name="bdan_room_4"/>
+    <File Name="bdan_room_4" Segment="3">
+        <Room Name="bdan_room_4" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_5">
-        <Room Name="bdan_room_5"/>
+    <File Name="bdan_room_5" Segment="3">
+        <Room Name="bdan_room_5" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_6">
-        <Room Name="bdan_room_6"/>
+    <File Name="bdan_room_6" Segment="3">
+        <Room Name="bdan_room_6" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_7">
-        <Room Name="bdan_room_7"/>
+    <File Name="bdan_room_7" Segment="3">
+        <Room Name="bdan_room_7" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_8">
-        <Room Name="bdan_room_8"/>
+    <File Name="bdan_room_8" Segment="3">
+        <Room Name="bdan_room_8" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_9">
-        <Room Name="bdan_room_9"/>
+    <File Name="bdan_room_9" Segment="3">
+        <Room Name="bdan_room_9" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_10">
-        <Room Name="bdan_room_10"/>
+    <File Name="bdan_room_10" Segment="3">
+        <Room Name="bdan_room_10" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_11">
-        <Room Name="bdan_room_11"/>
+    <File Name="bdan_room_11" Segment="3">
+        <Room Name="bdan_room_11" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_12">
-        <Room Name="bdan_room_12"/>
+    <File Name="bdan_room_12" Segment="3">
+        <Room Name="bdan_room_12" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_13">
-        <Room Name="bdan_room_13"/>
+    <File Name="bdan_room_13" Segment="3">
+        <Room Name="bdan_room_13" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_14">
-        <Room Name="bdan_room_14"/>
+    <File Name="bdan_room_14" Segment="3">
+        <Room Name="bdan_room_14" Offset="0x0"/>
     </File>
-    <File Name="bdan_room_15">
-        <Room Name="bdan_room_15"/>
+    <File Name="bdan_room_15" Segment="3">
+        <Room Name="bdan_room_15" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/bdan_boss.xml b/assets/xml/scenes/dungeons/bdan_boss.xml
index dfe45de2dd..22c2c7b9df 100644
--- a/assets/xml/scenes/dungeons/bdan_boss.xml
+++ b/assets/xml/scenes/dungeons/bdan_boss.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="bdan_boss_scene">
+    <File Name="bdan_boss_scene" Segment="2">
         <Scene Name="bdan_boss_scene"/>
     </File>
-    <File Name="bdan_boss_room_0">
-        <Room Name="bdan_boss_room_0"/>
+    <File Name="bdan_boss_room_0" Segment="3">
+        <Room Name="bdan_boss_room_0" Offset="0x0"/>
     </File>
-    <File Name="bdan_boss_room_1">
-        <Room Name="bdan_boss_room_1"/>
+    <File Name="bdan_boss_room_1" Segment="3">
+        <Room Name="bdan_boss_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ddan.xml b/assets/xml/scenes/dungeons/ddan.xml
index ae877c9eb9..f145cd4886 100644
--- a/assets/xml/scenes/dungeons/ddan.xml
+++ b/assets/xml/scenes/dungeons/ddan.xml
@@ -1,56 +1,56 @@
 <Root>
-    <File Name="ddan_scene">
+    <File Name="ddan_scene" Segment="2">
         <Scene Name="ddan_scene"/>
     </File>
-    <File Name="ddan_room_0">
-        <Room Name="ddan_room_0"/>
+    <File Name="ddan_room_0" Segment="3">
+        <Room Name="ddan_room_0" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_1">
-        <Room Name="ddan_room_1"/>
+    <File Name="ddan_room_1" Segment="3">
+        <Room Name="ddan_room_1" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_2">
-        <Room Name="ddan_room_2"/>
+    <File Name="ddan_room_2" Segment="3">
+        <Room Name="ddan_room_2" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_3">
-        <Room Name="ddan_room_3"/>
+    <File Name="ddan_room_3" Segment="3">
+        <Room Name="ddan_room_3" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_4">
-        <Room Name="ddan_room_4"/>
+    <File Name="ddan_room_4" Segment="3">
+        <Room Name="ddan_room_4" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_5">
-        <Room Name="ddan_room_5"/>
+    <File Name="ddan_room_5" Segment="3">
+        <Room Name="ddan_room_5" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_6">
-        <Room Name="ddan_room_6"/>
+    <File Name="ddan_room_6" Segment="3">
+        <Room Name="ddan_room_6" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_7">
-        <Room Name="ddan_room_7"/>
+    <File Name="ddan_room_7" Segment="3">
+        <Room Name="ddan_room_7" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_8">
-        <Room Name="ddan_room_8"/>
+    <File Name="ddan_room_8" Segment="3">
+        <Room Name="ddan_room_8" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_9">
-        <Room Name="ddan_room_9"/>
+    <File Name="ddan_room_9" Segment="3">
+        <Room Name="ddan_room_9" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_10">
-        <Room Name="ddan_room_10"/>
+    <File Name="ddan_room_10" Segment="3">
+        <Room Name="ddan_room_10" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_11">
-        <Room Name="ddan_room_11"/>
+    <File Name="ddan_room_11" Segment="3">
+        <Room Name="ddan_room_11" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_12">
-        <Room Name="ddan_room_12"/>
+    <File Name="ddan_room_12" Segment="3">
+        <Room Name="ddan_room_12" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_13">
-        <Room Name="ddan_room_13"/>
+    <File Name="ddan_room_13" Segment="3">
+        <Room Name="ddan_room_13" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_14">
-        <Room Name="ddan_room_14"/>
+    <File Name="ddan_room_14" Segment="3">
+        <Room Name="ddan_room_14" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_15">
-        <Room Name="ddan_room_15"/>
+    <File Name="ddan_room_15" Segment="3">
+        <Room Name="ddan_room_15" Offset="0x0"/>
     </File>
-    <File Name="ddan_room_16">
-        <Room Name="ddan_room_16"/>
+    <File Name="ddan_room_16" Segment="3">
+        <Room Name="ddan_room_16" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ddan_boss.xml b/assets/xml/scenes/dungeons/ddan_boss.xml
index e4576938c4..2c325dcc77 100644
--- a/assets/xml/scenes/dungeons/ddan_boss.xml
+++ b/assets/xml/scenes/dungeons/ddan_boss.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="ddan_boss_scene">
+    <File Name="ddan_boss_scene" Segment="2">
         <Scene Name="ddan_boss_scene"/>
     </File>
-    <File Name="ddan_boss_room_0">
-        <Room Name="ddan_boss_room_0"/>
+    <File Name="ddan_boss_room_0" Segment="3">
+        <Room Name="ddan_boss_room_0" Offset="0x0"/>
     </File>
-    <File Name="ddan_boss_room_1">
-        <Room Name="ddan_boss_room_1"/>
+    <File Name="ddan_boss_room_1" Segment="3">
+        <Room Name="ddan_boss_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ganon.xml b/assets/xml/scenes/dungeons/ganon.xml
index ee3b2a56c7..7152f77430 100644
--- a/assets/xml/scenes/dungeons/ganon.xml
+++ b/assets/xml/scenes/dungeons/ganon.xml
@@ -1,36 +1,35 @@
 <Root>
-    <File Name="ganon_scene">
+    <File Name="ganon_scene" Segment="2">
         <Scene Name="ganon_scene"/>
     </File>
-    <File Name="ganon_room_0">
-        <Room Name="ganon_room_0"/>
+    <File Name="ganon_room_0" Segment="3">
+        <Room Name="ganon_room_0" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_1">
-        <Room Name="ganon_room_1"/>
+    <File Name="ganon_room_1" Segment="3">
+        <Room Name="ganon_room_1" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_2">
-        <Room Name="ganon_room_2">
-        </Room>
+    <File Name="ganon_room_2" Segment="3">
+        <Room Name="ganon_room_2" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_3">
-        <Room Name="ganon_room_3"/>
+    <File Name="ganon_room_3" Segment="3">
+        <Room Name="ganon_room_3" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_4">
-        <Room Name="ganon_room_4"/>
+    <File Name="ganon_room_4" Segment="3">
+        <Room Name="ganon_room_4" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_5">
-        <Room Name="ganon_room_5"/>
+    <File Name="ganon_room_5" Segment="3">
+        <Room Name="ganon_room_5" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_6">
-        <Room Name="ganon_room_6"/>
+    <File Name="ganon_room_6" Segment="3">
+        <Room Name="ganon_room_6" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_7">
-        <Room Name="ganon_room_7"/>
+    <File Name="ganon_room_7" Segment="3">
+        <Room Name="ganon_room_7" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_8">
-        <Room Name="ganon_room_8"/>
+    <File Name="ganon_room_8" Segment="3">
+        <Room Name="ganon_room_8" Offset="0x0"/>
     </File>
-    <File Name="ganon_room_9">
-        <Room Name="ganon_room_9"/>
+    <File Name="ganon_room_9" Segment="3">
+        <Room Name="ganon_room_9" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ganon_boss.xml b/assets/xml/scenes/dungeons/ganon_boss.xml
index ec864b2311..c34417f2b6 100644
--- a/assets/xml/scenes/dungeons/ganon_boss.xml
+++ b/assets/xml/scenes/dungeons/ganon_boss.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="ganon_boss_scene">
+    <File Name="ganon_boss_scene" Segment="2">
         <Scene Name="ganon_boss_scene"/>
     </File>
-    <File Name="ganon_boss_room_0">
-        <Room Name="ganon_boss_room_0"/>
+    <File Name="ganon_boss_room_0" Segment="3">
+        <Room Name="ganon_boss_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ganon_demo.xml b/assets/xml/scenes/dungeons/ganon_demo.xml
index 06cb759e01..125a6f44f3 100644
--- a/assets/xml/scenes/dungeons/ganon_demo.xml
+++ b/assets/xml/scenes/dungeons/ganon_demo.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="ganon_demo_scene">
+    <File Name="ganon_demo_scene" Segment="2">
         <Scene Name="ganon_demo_scene"/>
     </File>
-    <File Name="ganon_demo_room_0">
-        <Room Name="ganon_demo_room_0"/>
+    <File Name="ganon_demo_room_0" Segment="3">
+        <Room Name="ganon_demo_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ganon_final.xml b/assets/xml/scenes/dungeons/ganon_final.xml
index 558e164ab2..7026a7b3a5 100644
--- a/assets/xml/scenes/dungeons/ganon_final.xml
+++ b/assets/xml/scenes/dungeons/ganon_final.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="ganon_final_scene">
+    <File Name="ganon_final_scene" Segment="2">
         <Scene Name="ganon_final_scene"/>
     </File>
-    <File Name="ganon_final_room_0">
-        <Room Name="ganon_final_room_0"/>
+    <File Name="ganon_final_room_0" Segment="3">
+        <Room Name="ganon_final_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ganon_sonogo.xml b/assets/xml/scenes/dungeons/ganon_sonogo.xml
index 1a32d2bc59..8f876a93f8 100644
--- a/assets/xml/scenes/dungeons/ganon_sonogo.xml
+++ b/assets/xml/scenes/dungeons/ganon_sonogo.xml
@@ -1,21 +1,20 @@
 <Root>
-    <File Name="ganon_sonogo_scene">
+    <File Name="ganon_sonogo_scene" Segment="2">
         <Scene Name="ganon_sonogo_scene"/>
     </File>
-    <File Name="ganon_sonogo_room_0">
-        <Room Name="ganon_sonogo_room_0"/>
+    <File Name="ganon_sonogo_room_0" Segment="3">
+        <Room Name="ganon_sonogo_room_0" Offset="0x0"/>
     </File>
-    <File Name="ganon_sonogo_room_1">
-        <Room Name="ganon_sonogo_room_1"/>
+    <File Name="ganon_sonogo_room_1" Segment="3">
+        <Room Name="ganon_sonogo_room_1" Offset="0x0"/>
     </File>
-    <File Name="ganon_sonogo_room_2">
-        <Room Name="ganon_sonogo_room_2">
-        </Room>
+    <File Name="ganon_sonogo_room_2" Segment="3">
+        <Room Name="ganon_sonogo_room_2" Offset="0x0"/>
     </File>
-    <File Name="ganon_sonogo_room_3">
-        <Room Name="ganon_sonogo_room_3"/>
+    <File Name="ganon_sonogo_room_3" Segment="3">
+        <Room Name="ganon_sonogo_room_3" Offset="0x0"/>
     </File>
-    <File Name="ganon_sonogo_room_4">
-        <Room Name="ganon_sonogo_room_4"/>
+    <File Name="ganon_sonogo_room_4" Segment="3">
+        <Room Name="ganon_sonogo_room_4" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ganon_tou.xml b/assets/xml/scenes/dungeons/ganon_tou.xml
index c1da5c149e..1e7c9b136b 100644
--- a/assets/xml/scenes/dungeons/ganon_tou.xml
+++ b/assets/xml/scenes/dungeons/ganon_tou.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="ganon_tou_scene">
+    <File Name="ganon_tou_scene" Segment="2">
         <Scene Name="ganon_tou_scene"/>
     </File>
-    <File Name="ganon_tou_room_0">
-        <Room Name="ganon_tou_room_0"/>
+    <File Name="ganon_tou_room_0" Segment="3">
+        <Room Name="ganon_tou_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ganontika.xml b/assets/xml/scenes/dungeons/ganontika.xml
index 18c1543982..7456674dda 100644
--- a/assets/xml/scenes/dungeons/ganontika.xml
+++ b/assets/xml/scenes/dungeons/ganontika.xml
@@ -1,82 +1,81 @@
 <Root>
-    <File Name="ganontika_scene">
-        <Scene Name="ganontika_scene">
-            <CutsceneHint Name="gForestTrialSageCs" Offset="0x19EE0"/>
-            <CutsceneHint Name="gWaterTrialSageCs" Offset="0x1A8E0"/>
-            <CutsceneHint Name="gShadowTrialSageCs" Offset="0x1B2B0"/>
-            <CutsceneHint Name="gFireTrialSageCs" Offset="0x1BC80"/>
-            <CutsceneHint Name="gLightTrialSageCs" Offset="0x1C6B0"/>
-            <CutsceneHint Name="gSpiritTrialSageCs" Offset="0x1D080"/>
-            
-            <CutsceneHint Name="gTowerBarrierCs" Offset="0x1DA50"/>
+    <File Name="ganontika_scene" Segment="2">
+        <Cutscene Name="gForestTrialSageCs" Offset="0x19EE0"/>
+        <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8E0"/>
+        <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2B0"/>
+        <Cutscene Name="gFireTrialSageCs" Offset="0x1BC80"/>
+        <Cutscene Name="gLightTrialSageCs" Offset="0x1C6B0"/>
+        <Cutscene Name="gSpiritTrialSageCs" Offset="0x1D080"/>
 
-            <CutsceneHint Name="gLightBarrierCs" Offset="0x1DF90"/>
-            <CutsceneHint Name="gFireBarrierCs" Offset="0x1E3E0"/>
-            <CutsceneHint Name="gForestBarrierCs" Offset="0x1E790"/>
-            <CutsceneHint Name="gSpiritBarrierCs" Offset="0x1EB40"/>
-            <CutsceneHint Name="gWaterBarrierCs" Offset="0x1EF70"/>
-            <CutsceneHint Name="gShadowBarrierCs" Offset="0x21380"/>
-        </Scene>
+        <Cutscene Name="gTowerBarrierCs" Offset="0x1DA50"/>
+
+        <Cutscene Name="gLightBarrierCs" Offset="0x1DF90"/>
+        <Cutscene Name="gFireBarrierCs" Offset="0x1E3E0"/>
+        <Cutscene Name="gForestBarrierCs" Offset="0x1E790"/>
+        <Cutscene Name="gSpiritBarrierCs" Offset="0x1EB40"/>
+        <Cutscene Name="gWaterBarrierCs" Offset="0x1EF70"/>
+        <Cutscene Name="gShadowBarrierCs" Offset="0x21380"/>
+
+        <Scene Name="ganontika_scene" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_0">
-        <Room Name="ganontika_room_0"/>
+    <File Name="ganontika_room_0" Segment="3">
+        <Room Name="ganontika_room_0" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_1">
-        <Room Name="ganontika_room_1"/>
+    <File Name="ganontika_room_1" Segment="3">
+        <Room Name="ganontika_room_1" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_2">
-        <Room Name="ganontika_room_2">
-        </Room>
+    <File Name="ganontika_room_2" Segment="3">
+        <Room Name="ganontika_room_2" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_3">
-        <Room Name="ganontika_room_3"/>
+    <File Name="ganontika_room_3" Segment="3">
+        <Room Name="ganontika_room_3" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_4">
-        <Room Name="ganontika_room_4"/>
+    <File Name="ganontika_room_4" Segment="3">
+        <Room Name="ganontika_room_4" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_5">
-        <Room Name="ganontika_room_5"/>
+    <File Name="ganontika_room_5" Segment="3">
+        <Room Name="ganontika_room_5" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_6">
-        <Room Name="ganontika_room_6"/>
+    <File Name="ganontika_room_6" Segment="3">
+        <Room Name="ganontika_room_6" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_7">
-        <Room Name="ganontika_room_7"/>
+    <File Name="ganontika_room_7" Segment="3">
+        <Room Name="ganontika_room_7" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_8">
-        <Room Name="ganontika_room_8"/>
+    <File Name="ganontika_room_8" Segment="3">
+        <Room Name="ganontika_room_8" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_9">
-        <Room Name="ganontika_room_9"/>
+    <File Name="ganontika_room_9" Segment="3">
+        <Room Name="ganontika_room_9" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_10">
-        <Room Name="ganontika_room_10"/>
+    <File Name="ganontika_room_10" Segment="3">
+        <Room Name="ganontika_room_10" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_11">
-        <Room Name="ganontika_room_11"/>
+    <File Name="ganontika_room_11" Segment="3">
+        <Room Name="ganontika_room_11" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_12">
-        <Room Name="ganontika_room_12"/>
+    <File Name="ganontika_room_12" Segment="3">
+        <Room Name="ganontika_room_12" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_13">
-        <Room Name="ganontika_room_13"/>
+    <File Name="ganontika_room_13" Segment="3">
+        <Room Name="ganontika_room_13" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_14">
-        <Room Name="ganontika_room_14"/>
+    <File Name="ganontika_room_14" Segment="3">
+        <Room Name="ganontika_room_14" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_15">
-        <Room Name="ganontika_room_15"/>
+    <File Name="ganontika_room_15" Segment="3">
+        <Room Name="ganontika_room_15" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_16">
-        <Room Name="ganontika_room_16"/>
+    <File Name="ganontika_room_16" Segment="3">
+        <Room Name="ganontika_room_16" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_17">
-        <Room Name="ganontika_room_17"/>
+    <File Name="ganontika_room_17" Segment="3">
+        <Room Name="ganontika_room_17" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_18">
-        <Room Name="ganontika_room_18"/>
+    <File Name="ganontika_room_18" Segment="3">
+        <Room Name="ganontika_room_18" Offset="0x0"/>
     </File>
-    <File Name="ganontika_room_19">
-        <Room Name="ganontika_room_19"/>
+    <File Name="ganontika_room_19" Segment="3">
+        <Room Name="ganontika_room_19" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ganontikasonogo.xml b/assets/xml/scenes/dungeons/ganontikasonogo.xml
index 66ead96dc5..3d36e7a803 100644
--- a/assets/xml/scenes/dungeons/ganontikasonogo.xml
+++ b/assets/xml/scenes/dungeons/ganontikasonogo.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="ganontikasonogo_scene">
+    <File Name="ganontikasonogo_scene" Segment="2">
         <Scene Name="ganontikasonogo_scene"/>
     </File>
-    <File Name="ganontikasonogo_room_0">
-        <Room Name="ganontikasonogo_room_0"/>
+    <File Name="ganontikasonogo_room_0" Segment="3">
+        <Room Name="ganontikasonogo_room_0" Offset="0x0"/>
     </File>
-    <File Name="ganontikasonogo_room_1">
-        <Room Name="ganontikasonogo_room_1"/>
+    <File Name="ganontikasonogo_room_1" Segment="3">
+        <Room Name="ganontikasonogo_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/gerudoway.xml b/assets/xml/scenes/dungeons/gerudoway.xml
index e5c3b3c0b8..a9d01bfc7d 100644
--- a/assets/xml/scenes/dungeons/gerudoway.xml
+++ b/assets/xml/scenes/dungeons/gerudoway.xml
@@ -1,23 +1,23 @@
 <Root>
-    <File Name="gerudoway_scene">
+    <File Name="gerudoway_scene" Segment="2">
         <Scene Name="gerudoway_scene"/>
     </File>
-    <File Name="gerudoway_room_0">
-        <Room Name="gerudoway_room_0"/>
+    <File Name="gerudoway_room_0" Segment="3">
+        <Room Name="gerudoway_room_0" Offset="0x0"/>
     </File>
-     <File Name="gerudoway_room_1">
-        <Room Name="gerudoway_room_1"/>
+     <File Name="gerudoway_room_1" Segment="3">
+        <Room Name="gerudoway_room_1" Offset="0x0"/>
     </File>
-     <File Name="gerudoway_room_2">
-        <Room Name="gerudoway_room_2"/>
+     <File Name="gerudoway_room_2" Segment="3">
+        <Room Name="gerudoway_room_2" Offset="0x0"/>
     </File>
-     <File Name="gerudoway_room_3">
-        <Room Name="gerudoway_room_3"/>
+     <File Name="gerudoway_room_3" Segment="3">
+        <Room Name="gerudoway_room_3" Offset="0x0"/>
     </File>
-     <File Name="gerudoway_room_4">
-        <Room Name="gerudoway_room_4"/>
+     <File Name="gerudoway_room_4" Segment="3">
+        <Room Name="gerudoway_room_4" Offset="0x0"/>
     </File>
-     <File Name="gerudoway_room_5">
-        <Room Name="gerudoway_room_5"/>
+     <File Name="gerudoway_room_5" Segment="3">
+        <Room Name="gerudoway_room_5" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ice_doukutu.xml b/assets/xml/scenes/dungeons/ice_doukutu.xml
index 6ff76674a6..eaac729a33 100644
--- a/assets/xml/scenes/dungeons/ice_doukutu.xml
+++ b/assets/xml/scenes/dungeons/ice_doukutu.xml
@@ -1,42 +1,41 @@
 <Root>
-    <File Name="ice_doukutu_scene">
+    <File Name="ice_doukutu_scene" Segment="2">
         <Scene Name="ice_doukutu_scene"/>
     </File>
-    <File Name="ice_doukutu_room_0">
-        <Room Name="ice_doukutu_room_0"/>
+    <File Name="ice_doukutu_room_0" Segment="3">
+        <Room Name="ice_doukutu_room_0" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_1">
-        <Room Name="ice_doukutu_room_1"/>
+    <File Name="ice_doukutu_room_1" Segment="3">
+        <Room Name="ice_doukutu_room_1" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_2">
-        <Room Name="ice_doukutu_room_2">
-        </Room>
+    <File Name="ice_doukutu_room_2" Segment="3">
+        <Room Name="ice_doukutu_room_2" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_3">
-        <Room Name="ice_doukutu_room_3"/>
+    <File Name="ice_doukutu_room_3" Segment="3">
+        <Room Name="ice_doukutu_room_3" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_4">
-        <Room Name="ice_doukutu_room_4"/>
+    <File Name="ice_doukutu_room_4" Segment="3">
+        <Room Name="ice_doukutu_room_4" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_5">
-        <Room Name="ice_doukutu_room_5"/>
+    <File Name="ice_doukutu_room_5" Segment="3">
+        <Room Name="ice_doukutu_room_5" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_6">
-        <Room Name="ice_doukutu_room_6"/>
+    <File Name="ice_doukutu_room_6" Segment="3">
+        <Room Name="ice_doukutu_room_6" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_7">
-        <Room Name="ice_doukutu_room_7"/>
+    <File Name="ice_doukutu_room_7" Segment="3">
+        <Room Name="ice_doukutu_room_7" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_8">
-        <Room Name="ice_doukutu_room_8"/>
+    <File Name="ice_doukutu_room_8" Segment="3">
+        <Room Name="ice_doukutu_room_8" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_9">
-        <Room Name="ice_doukutu_room_9"/>
+    <File Name="ice_doukutu_room_9" Segment="3">
+        <Room Name="ice_doukutu_room_9" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_10">
-        <Room Name="ice_doukutu_room_10"/>
+    <File Name="ice_doukutu_room_10" Segment="3">
+        <Room Name="ice_doukutu_room_10" Offset="0x0"/>
     </File>
-    <File Name="ice_doukutu_room_11">
-        <Room Name="ice_doukutu_room_11"/>
+    <File Name="ice_doukutu_room_11" Segment="3">
+        <Room Name="ice_doukutu_room_11" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/jyasinboss.xml b/assets/xml/scenes/dungeons/jyasinboss.xml
index c70a67c3de..70b3f0dedc 100644
--- a/assets/xml/scenes/dungeons/jyasinboss.xml
+++ b/assets/xml/scenes/dungeons/jyasinboss.xml
@@ -1,18 +1,17 @@
 <Root>
-    <File Name="jyasinboss_scene">
+    <File Name="jyasinboss_scene" Segment="2">
         <Scene Name="jyasinboss_scene"/>
     </File>
-    <File Name="jyasinboss_room_0">
-        <Room Name="jyasinboss_room_0"/>
+    <File Name="jyasinboss_room_0" Segment="3">
+        <Room Name="jyasinboss_room_0" Offset="0x0"/>
     </File>
-    <File Name="jyasinboss_room_1">
-        <Room Name="jyasinboss_room_1"/>
+    <File Name="jyasinboss_room_1" Segment="3">
+        <Room Name="jyasinboss_room_1" Offset="0x0"/>
     </File>
-    <File Name="jyasinboss_room_2">
-        <Room Name="jyasinboss_room_2">
-        </Room>
+    <File Name="jyasinboss_room_2" Segment="3">
+        <Room Name="jyasinboss_room_2" Offset="0x0"/>
     </File>
-    <File Name="jyasinboss_room_3">
-        <Room Name="jyasinboss_room_3"/>
+    <File Name="jyasinboss_room_3" Segment="3">
+        <Room Name="jyasinboss_room_3" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/jyasinzou.xml b/assets/xml/scenes/dungeons/jyasinzou.xml
index 2c81bd2eda..585cd6271d 100644
--- a/assets/xml/scenes/dungeons/jyasinzou.xml
+++ b/assets/xml/scenes/dungeons/jyasinzou.xml
@@ -1,93 +1,92 @@
 <Root>
-    <File Name="jyasinzou_scene">
+    <File Name="jyasinzou_scene" Segment="2">
         <Scene Name="jyasinzou_scene"/>
     </File>
-    <File Name="jyasinzou_room_0">
-        <Room Name="jyasinzou_room_0"/>
+    <File Name="jyasinzou_room_0" Segment="3">
+        <Room Name="jyasinzou_room_0" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_1">
-        <Room Name="jyasinzou_room_1"/>
+    <File Name="jyasinzou_room_1" Segment="3">
+        <Room Name="jyasinzou_room_1" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_2">
-        <Room Name="jyasinzou_room_2">
-        </Room>
+    <File Name="jyasinzou_room_2" Segment="3">
+        <Room Name="jyasinzou_room_2" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_3">
-        <Room Name="jyasinzou_room_3"/>
+    <File Name="jyasinzou_room_3" Segment="3">
+        <Room Name="jyasinzou_room_3" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_4">
-        <Room Name="jyasinzou_room_4"/>
+    <File Name="jyasinzou_room_4" Segment="3">
+        <Room Name="jyasinzou_room_4" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_5">
-        <Room Name="jyasinzou_room_5"/>
+    <File Name="jyasinzou_room_5" Segment="3">
+        <Room Name="jyasinzou_room_5" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_6">
-        <Room Name="jyasinzou_room_6"/>
+    <File Name="jyasinzou_room_6" Segment="3">
+        <Room Name="jyasinzou_room_6" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_7">
-        <Room Name="jyasinzou_room_7"/>
+    <File Name="jyasinzou_room_7" Segment="3">
+        <Room Name="jyasinzou_room_7" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_8">
-        <Room Name="jyasinzou_room_8"/>
+    <File Name="jyasinzou_room_8" Segment="3">
+        <Room Name="jyasinzou_room_8" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_9">
-        <Room Name="jyasinzou_room_9"/>
+    <File Name="jyasinzou_room_9" Segment="3">
+        <Room Name="jyasinzou_room_9" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_10">
-        <Room Name="jyasinzou_room_10"/>
+    <File Name="jyasinzou_room_10" Segment="3">
+        <Room Name="jyasinzou_room_10" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_11">
-        <Room Name="jyasinzou_room_11"/>
+    <File Name="jyasinzou_room_11" Segment="3">
+        <Room Name="jyasinzou_room_11" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_12">
-        <Room Name="jyasinzou_room_12"/>
+    <File Name="jyasinzou_room_12" Segment="3">
+        <Room Name="jyasinzou_room_12" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_13">
-        <Room Name="jyasinzou_room_13"/>
+    <File Name="jyasinzou_room_13" Segment="3">
+        <Room Name="jyasinzou_room_13" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_14">
-        <Room Name="jyasinzou_room_14"/>
+    <File Name="jyasinzou_room_14" Segment="3">
+        <Room Name="jyasinzou_room_14" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_15">
-        <Room Name="jyasinzou_room_15"/>
+    <File Name="jyasinzou_room_15" Segment="3">
+        <Room Name="jyasinzou_room_15" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_16">
-        <Room Name="jyasinzou_room_16"/>
+    <File Name="jyasinzou_room_16" Segment="3">
+        <Room Name="jyasinzou_room_16" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_17">
-        <Room Name="jyasinzou_room_17"/>
+    <File Name="jyasinzou_room_17" Segment="3">
+        <Room Name="jyasinzou_room_17" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_18">
-        <Room Name="jyasinzou_room_18"/>
+    <File Name="jyasinzou_room_18" Segment="3">
+        <Room Name="jyasinzou_room_18" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_19">
-        <Room Name="jyasinzou_room_19"/>
+    <File Name="jyasinzou_room_19" Segment="3">
+        <Room Name="jyasinzou_room_19" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_20">
-        <Room Name="jyasinzou_room_20"/>
+    <File Name="jyasinzou_room_20" Segment="3">
+        <Room Name="jyasinzou_room_20" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_21">
-        <Room Name="jyasinzou_room_21"/>
+    <File Name="jyasinzou_room_21" Segment="3">
+        <Room Name="jyasinzou_room_21" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_22">
-        <Room Name="jyasinzou_room_22"/>
+    <File Name="jyasinzou_room_22" Segment="3">
+        <Room Name="jyasinzou_room_22" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_23">
-        <Room Name="jyasinzou_room_23"/>
+    <File Name="jyasinzou_room_23" Segment="3">
+        <Room Name="jyasinzou_room_23" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_24">
-        <Room Name="jyasinzou_room_24"/>
+    <File Name="jyasinzou_room_24" Segment="3">
+        <Room Name="jyasinzou_room_24" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_25">
-        <Room Name="jyasinzou_room_25"/>
+    <File Name="jyasinzou_room_25" Segment="3">
+        <Room Name="jyasinzou_room_25" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_26">
-        <Room Name="jyasinzou_room_26"/>
+    <File Name="jyasinzou_room_26" Segment="3">
+        <Room Name="jyasinzou_room_26" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_27">
-        <Room Name="jyasinzou_room_27"/>
+    <File Name="jyasinzou_room_27" Segment="3">
+        <Room Name="jyasinzou_room_27" Offset="0x0"/>
     </File>
-    <File Name="jyasinzou_room_28">
-        <Room Name="jyasinzou_room_28"/>
+    <File Name="jyasinzou_room_28" Segment="3">
+        <Room Name="jyasinzou_room_28" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/men.xml b/assets/xml/scenes/dungeons/men.xml
index e44b63f6ad..4a4444daf4 100644
--- a/assets/xml/scenes/dungeons/men.xml
+++ b/assets/xml/scenes/dungeons/men.xml
@@ -1,41 +1,40 @@
 <Root>
-    <File Name="men_scene">
+    <File Name="men_scene" Segment="2">
         <Scene Name="men_scene"/>
     </File>
-    <File Name="men_room_0">
-        <Room Name="men_room_0">
-            <DListHint Offset="0x8118" Comment="This display list appears to be unused..."/>
-            <DListHint Offset="0xFF78" Comment="This display list appears to be unused..."/>
-        </Room>
+    <File Name="men_room_0" Segment="3">
+        <DList Name="gMenDL_008118" Offset="0x8118"/>
+        <DList Name="gMenDL_00FF78" Offset="0xFF78"/>
+        <Room Name="men_room_0" Offset="0x0"/>
     </File>
-    <File Name="men_room_1">
-        <Room Name="men_room_1"/>
+    <File Name="men_room_1" Segment="3">
+        <Room Name="men_room_1" Offset="0x0"/>
     </File>
-    <File Name="men_room_2">
-        <Room Name="men_room_2"/>
+    <File Name="men_room_2" Segment="3">
+        <Room Name="men_room_2" Offset="0x0"/>
     </File>
-    <File Name="men_room_3">
-        <Room Name="men_room_3"/>
+    <File Name="men_room_3" Segment="3">
+        <Room Name="men_room_3" Offset="0x0"/>
     </File>
-    <File Name="men_room_4">
-        <Room Name="men_room_4"/>
+    <File Name="men_room_4" Segment="3">
+        <Room Name="men_room_4" Offset="0x0"/>
     </File>
-    <File Name="men_room_5">
-        <Room Name="men_room_5"/>
+    <File Name="men_room_5" Segment="3">
+        <Room Name="men_room_5" Offset="0x0"/>
     </File>
-    <File Name="men_room_6">
-        <Room Name="men_room_6"/>
+    <File Name="men_room_6" Segment="3">
+        <Room Name="men_room_6" Offset="0x0"/>
     </File>
-    <File Name="men_room_7">
-        <Room Name="men_room_7"/>
+    <File Name="men_room_7" Segment="3">
+        <Room Name="men_room_7" Offset="0x0"/>
     </File>
-    <File Name="men_room_8">
-        <Room Name="men_room_8"/>
+    <File Name="men_room_8" Segment="3">
+        <Room Name="men_room_8" Offset="0x0"/>
     </File>
-    <File Name="men_room_9">
-        <Room Name="men_room_9"/>
+    <File Name="men_room_9" Segment="3">
+        <Room Name="men_room_9" Offset="0x0"/>
     </File>
-    <File Name="men_room_10">
-        <Room Name="men_room_10"/>
+    <File Name="men_room_10" Segment="3">
+        <Room Name="men_room_10" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/moribossroom.xml b/assets/xml/scenes/dungeons/moribossroom.xml
index 70922f3a2e..b8ec1a09ab 100644
--- a/assets/xml/scenes/dungeons/moribossroom.xml
+++ b/assets/xml/scenes/dungeons/moribossroom.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="moribossroom_scene">
+    <File Name="moribossroom_scene" Segment="2">
         <Scene Name="moribossroom_scene"/>
     </File>
-    <File Name="moribossroom_room_0">
-        <Room Name="moribossroom_room_0"/>
+    <File Name="moribossroom_room_0" Segment="3">
+        <Room Name="moribossroom_room_0" Offset="0x0"/>
     </File>
-    <File Name="moribossroom_room_1">
-        <Room Name="moribossroom_room_1"/>
+    <File Name="moribossroom_room_1" Segment="3">
+        <Room Name="moribossroom_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ydan.xml b/assets/xml/scenes/dungeons/ydan.xml
index 302c0647b5..d37d955db1 100644
--- a/assets/xml/scenes/dungeons/ydan.xml
+++ b/assets/xml/scenes/dungeons/ydan.xml
@@ -1,41 +1,41 @@
 <Root>
-    <File Name="ydan_scene">
+    <File Name="ydan_scene" Segment="2">
         <Scene Name="ydan_scene"/>
     </File>
-    <File Name="ydan_room_0">
-        <Room Name="ydan_room_0"/>
+    <File Name="ydan_room_0" Segment="3">
+        <Room Name="ydan_room_0" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_1">
-        <Room Name="ydan_room_1"/>
+    <File Name="ydan_room_1" Segment="3">
+        <Room Name="ydan_room_1" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_2">
-        <Room Name="ydan_room_2"/>
+    <File Name="ydan_room_2" Segment="3">
+        <Room Name="ydan_room_2" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_3">
-        <Room Name="ydan_room_3"/>
+    <File Name="ydan_room_3" Segment="3">
+        <Room Name="ydan_room_3" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_4">
-        <Room Name="ydan_room_4"/>
+    <File Name="ydan_room_4" Segment="3">
+        <Room Name="ydan_room_4" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_5">
-        <Room Name="ydan_room_5"/>
+    <File Name="ydan_room_5" Segment="3">
+        <Room Name="ydan_room_5" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_6">
-        <Room Name="ydan_room_6"/>
+    <File Name="ydan_room_6" Segment="3">
+        <Room Name="ydan_room_6" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_7">
-        <Room Name="ydan_room_7"/>
+    <File Name="ydan_room_7" Segment="3">
+        <Room Name="ydan_room_7" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_8">
-        <Room Name="ydan_room_8"/>
+    <File Name="ydan_room_8" Segment="3">
+        <Room Name="ydan_room_8" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_9">
-        <Room Name="ydan_room_9"/>
+    <File Name="ydan_room_9" Segment="3">
+        <Room Name="ydan_room_9" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_10">
-        <Room Name="ydan_room_10"/>
+    <File Name="ydan_room_10" Segment="3">
+        <Room Name="ydan_room_10" Offset="0x0"/>
     </File>
-    <File Name="ydan_room_11">
-        <Room Name="ydan_room_11"/>
+    <File Name="ydan_room_11" Segment="3">
+        <Room Name="ydan_room_11" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/dungeons/ydan_boss.xml b/assets/xml/scenes/dungeons/ydan_boss.xml
index 8c84f705e6..c72f9f79eb 100644
--- a/assets/xml/scenes/dungeons/ydan_boss.xml
+++ b/assets/xml/scenes/dungeons/ydan_boss.xml
@@ -1,11 +1,11 @@
 <Root>
-    <File Name="ydan_boss_scene">
+    <File Name="ydan_boss_scene" Segment="2">
         <Scene Name="ydan_boss_scene"/>
     </File>
-    <File Name="ydan_boss_room_0">
-        <Room Name="ydan_boss_room_0"/>
+    <File Name="ydan_boss_room_0" Segment="3">
+        <Room Name="ydan_boss_room_0" Offset="0x0"/>
     </File>
-    <File Name="ydan_boss_room_1">
-        <Room Name="ydan_boss_room_1"/>
+    <File Name="ydan_boss_room_1" Segment="3">
+        <Room Name="ydan_boss_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/bowling.xml b/assets/xml/scenes/indoors/bowling.xml
index da21413ffe..86bad8f001 100644
--- a/assets/xml/scenes/indoors/bowling.xml
+++ b/assets/xml/scenes/indoors/bowling.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="bowling_scene">
+    <File Name="bowling_scene" Segment="2">
         <Scene Name="bowling_scene"/>
     </File>
-    <File Name="bowling_room_0">
-        <Room Name="bowling_room_0">
-        </Room>
+    <File Name="bowling_room_0" Segment="3">
+        <Room Name="bowling_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/daiyousei_izumi.xml b/assets/xml/scenes/indoors/daiyousei_izumi.xml
index 39a064a3cf..842a95a71d 100644
--- a/assets/xml/scenes/indoors/daiyousei_izumi.xml
+++ b/assets/xml/scenes/indoors/daiyousei_izumi.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="daiyousei_izumi_scene">
+    <File Name="daiyousei_izumi_scene" Segment="2">
         <Scene Name="daiyousei_izumi_scene"/>
     </File>
-    <File Name="daiyousei_izumi_room_0">
-        <Room Name="daiyousei_izumi_room_0"/>
+    <File Name="daiyousei_izumi_room_0" Segment="3">
+        <Room Name="daiyousei_izumi_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/hairal_niwa.xml b/assets/xml/scenes/indoors/hairal_niwa.xml
index dd617317e1..c35dab2513 100644
--- a/assets/xml/scenes/indoors/hairal_niwa.xml
+++ b/assets/xml/scenes/indoors/hairal_niwa.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="hairal_niwa_scene">
+    <File Name="hairal_niwa_scene" Segment="2">
         <Scene Name="hairal_niwa_scene"/>
     </File>
-    <File Name="hairal_niwa_room_0">
-        <Room Name="hairal_niwa_room_0"/>
+    <File Name="hairal_niwa_room_0" Segment="3">
+        <Room Name="hairal_niwa_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/hairal_niwa2.xml b/assets/xml/scenes/indoors/hairal_niwa2.xml
index 7e0648a8fc..24879ccb86 100644
--- a/assets/xml/scenes/indoors/hairal_niwa2.xml
+++ b/assets/xml/scenes/indoors/hairal_niwa2.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="hairal_niwa2_scene">
+    <File Name="hairal_niwa2_scene" Segment="2">
         <Scene Name="hairal_niwa2_scene"/>
     </File>
-    <File Name="hairal_niwa2_room_0">
-        <Room Name="hairal_niwa2_room_0"/>
+    <File Name="hairal_niwa2_room_0" Segment="3">
+        <Room Name="hairal_niwa2_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/hairal_niwa_n.xml b/assets/xml/scenes/indoors/hairal_niwa_n.xml
index 2d70481ba8..6654f5d2d5 100644
--- a/assets/xml/scenes/indoors/hairal_niwa_n.xml
+++ b/assets/xml/scenes/indoors/hairal_niwa_n.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="hairal_niwa_n_scene">
+    <File Name="hairal_niwa_n_scene" Segment="2">
         <Scene Name="hairal_niwa_n_scene"/>
     </File>
-    <File Name="hairal_niwa_n_room_0">
-        <Room Name="hairal_niwa_n_room_0"/>
+    <File Name="hairal_niwa_n_room_0" Segment="3">
+        <Room Name="hairal_niwa_n_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/hakasitarelay.xml b/assets/xml/scenes/indoors/hakasitarelay.xml
index a0ed677191..20fedf5bdf 100644
--- a/assets/xml/scenes/indoors/hakasitarelay.xml
+++ b/assets/xml/scenes/indoors/hakasitarelay.xml
@@ -1,33 +1,26 @@
 <Root>
-    <File Name="hakasitarelay_scene">
+    <File Name="hakasitarelay_scene" Segment="2">
         <Scene Name="hakasitarelay_scene"/>
     </File>
-    <File Name="hakasitarelay_room_0">
-        <Room Name="hakasitarelay_room_0">
-        </Room>
+    <File Name="hakasitarelay_room_0" Segment="3">
+        <Room Name="hakasitarelay_room_0" Offset="0x0"/>
     </File>
-    <File Name="hakasitarelay_room_1">
-        <Room Name="hakasitarelay_room_1">
-        </Room>
+    <File Name="hakasitarelay_room_1" Segment="3">
+        <Room Name="hakasitarelay_room_1" Offset="0x0"/>
     </File>
-    <File Name="hakasitarelay_room_2">
-        <Room Name="hakasitarelay_room_2">
-        </Room>
+    <File Name="hakasitarelay_room_2" Segment="3">
+        <Room Name="hakasitarelay_room_2" Offset="0x0"/>
     </File>
-    <File Name="hakasitarelay_room_3">
-        <Room Name="hakasitarelay_room_3">
-        </Room>
+    <File Name="hakasitarelay_room_3" Segment="3">
+        <Room Name="hakasitarelay_room_3" Offset="0x0"/>
     </File>
-    <File Name="hakasitarelay_room_4">
-        <Room Name="hakasitarelay_room_4">
-        </Room>
+    <File Name="hakasitarelay_room_4" Segment="3">
+        <Room Name="hakasitarelay_room_4" Offset="0x0"/>
     </File>
-    <File Name="hakasitarelay_room_5">
-        <Room Name="hakasitarelay_room_5">
-        </Room>
+    <File Name="hakasitarelay_room_5" Segment="3">
+        <Room Name="hakasitarelay_room_5" Offset="0x0"/>
     </File>
-    <File Name="hakasitarelay_room_6">
-        <Room Name="hakasitarelay_room_6">
-        </Room>
+    <File Name="hakasitarelay_room_6" Segment="3">
+        <Room Name="hakasitarelay_room_6" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/hut.xml b/assets/xml/scenes/indoors/hut.xml
index bc3936f4a3..3d63d60aba 100644
--- a/assets/xml/scenes/indoors/hut.xml
+++ b/assets/xml/scenes/indoors/hut.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="hut_scene">
+    <File Name="hut_scene" Segment="2">
         <Scene Name="hut_scene"/>
     </File>
-    <File Name="hut_room_0">
-        <Room Name="hut_room_0"/>
+    <File Name="hut_room_0" Segment="3">
+        <Room Name="hut_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/hylia_labo.xml b/assets/xml/scenes/indoors/hylia_labo.xml
index 07ecda72d8..ba8c7749c4 100644
--- a/assets/xml/scenes/indoors/hylia_labo.xml
+++ b/assets/xml/scenes/indoors/hylia_labo.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="hylia_labo_scene">
+    <File Name="hylia_labo_scene" Segment="2">
         <Scene Name="hylia_labo_scene"/>
     </File>
-    <File Name="hylia_labo_room_0">
-        <Room Name="hylia_labo_room_0"/>
+    <File Name="hylia_labo_room_0" Segment="3">
+        <Room Name="hylia_labo_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/impa.xml b/assets/xml/scenes/indoors/impa.xml
index 22829842cd..21aab064a0 100644
--- a/assets/xml/scenes/indoors/impa.xml
+++ b/assets/xml/scenes/indoors/impa.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="impa_scene">
+    <File Name="impa_scene" Segment="2">
         <Scene Name="impa_scene"/>
     </File>
-    <File Name="impa_room_0">
-        <Room Name="impa_room_0"/>
+    <File Name="impa_room_0" Segment="3">
+        <Room Name="impa_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/kakariko.xml b/assets/xml/scenes/indoors/kakariko.xml
index bc8f0e5705..61ea822a0b 100644
--- a/assets/xml/scenes/indoors/kakariko.xml
+++ b/assets/xml/scenes/indoors/kakariko.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="kakariko_scene">
+    <File Name="kakariko_scene" Segment="2">
         <Scene Name="kakariko_scene"/>
     </File>
-    <File Name="kakariko_room_0">
-        <Room Name="kakariko_room_0"/>
+    <File Name="kakariko_room_0" Segment="3">
+        <Room Name="kakariko_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/kenjyanoma.xml b/assets/xml/scenes/indoors/kenjyanoma.xml
index 04d064d90a..254a41bbd9 100644
--- a/assets/xml/scenes/indoors/kenjyanoma.xml
+++ b/assets/xml/scenes/indoors/kenjyanoma.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="kenjyanoma_scene">
+    <File Name="kenjyanoma_scene" Segment="2">
         <Scene Name="kenjyanoma_scene"/>
     </File>
-    <File Name="kenjyanoma_room_0">
-        <Room Name="kenjyanoma_room_0"/>
+    <File Name="kenjyanoma_room_0" Segment="3">
+        <Room Name="kenjyanoma_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/kokiri_home.xml b/assets/xml/scenes/indoors/kokiri_home.xml
index 78ead77881..635618e98c 100644
--- a/assets/xml/scenes/indoors/kokiri_home.xml
+++ b/assets/xml/scenes/indoors/kokiri_home.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="kokiri_home_scene">
+    <File Name="kokiri_home_scene" Segment="2">
         <Scene Name="kokiri_home_scene"/>
     </File>
-    <File Name="kokiri_home_room_0">
-        <Room Name="kokiri_home_room_0"/>
+    <File Name="kokiri_home_room_0" Segment="3">
+        <Room Name="kokiri_home_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/kokiri_home3.xml b/assets/xml/scenes/indoors/kokiri_home3.xml
index 57c26dae1d..2ab54b9881 100644
--- a/assets/xml/scenes/indoors/kokiri_home3.xml
+++ b/assets/xml/scenes/indoors/kokiri_home3.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="kokiri_home3_scene">
+    <File Name="kokiri_home3_scene" Segment="2">
         <Scene Name="kokiri_home3_scene"/>
     </File>
-    <File Name="kokiri_home3_room_0">
-        <Room Name="kokiri_home3_room_0"/>
+    <File Name="kokiri_home3_room_0" Segment="3">
+        <Room Name="kokiri_home3_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/kokiri_home4.xml b/assets/xml/scenes/indoors/kokiri_home4.xml
index 7a01c0eaeb..529a061720 100644
--- a/assets/xml/scenes/indoors/kokiri_home4.xml
+++ b/assets/xml/scenes/indoors/kokiri_home4.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="kokiri_home4_scene">
+    <File Name="kokiri_home4_scene" Segment="2">
         <Scene Name="kokiri_home4_scene"/>
     </File>
-    <File Name="kokiri_home4_room_0">
-        <Room Name="kokiri_home4_room_0"/>
+    <File Name="kokiri_home4_room_0" Segment="3">
+        <Room Name="kokiri_home4_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/kokiri_home5.xml b/assets/xml/scenes/indoors/kokiri_home5.xml
index 489815db1a..dd8d625eda 100644
--- a/assets/xml/scenes/indoors/kokiri_home5.xml
+++ b/assets/xml/scenes/indoors/kokiri_home5.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="kokiri_home5_scene">
+    <File Name="kokiri_home5_scene" Segment="2">
         <Scene Name="kokiri_home5_scene"/>
     </File>
-    <File Name="kokiri_home5_room_0">
-        <Room Name="kokiri_home5_room_0"/>
+    <File Name="kokiri_home5_room_0" Segment="3">
+        <Room Name="kokiri_home5_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/labo.xml b/assets/xml/scenes/indoors/labo.xml
index d69ae4219e..702c914e44 100644
--- a/assets/xml/scenes/indoors/labo.xml
+++ b/assets/xml/scenes/indoors/labo.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="labo_scene">
+    <File Name="labo_scene" Segment="2">
         <Scene Name="labo_scene"/>
     </File>
-    <File Name="labo_room_0">
-        <Room Name="labo_room_0"/>
+    <File Name="labo_room_0" Segment="3">
+        <Room Name="labo_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/link_home.xml b/assets/xml/scenes/indoors/link_home.xml
index 86b6183715..a415e00aa6 100644
--- a/assets/xml/scenes/indoors/link_home.xml
+++ b/assets/xml/scenes/indoors/link_home.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="link_home_scene">
+    <File Name="link_home_scene" Segment="2">
         <Scene Name="link_home_scene"/>
     </File>
-    <File Name="link_home_room_0">
-        <Room Name="link_home_room_0"/>
+    <File Name="link_home_room_0" Segment="3">
+        <Room Name="link_home_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/mahouya.xml b/assets/xml/scenes/indoors/mahouya.xml
index 145d761137..dd6b367044 100644
--- a/assets/xml/scenes/indoors/mahouya.xml
+++ b/assets/xml/scenes/indoors/mahouya.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="mahouya_scene">
+    <File Name="mahouya_scene" Segment="2">
         <Scene Name="mahouya_scene"/>
     </File>
-    <File Name="mahouya_room_0">
-        <Room Name="mahouya_room_0">
-        </Room>
+    <File Name="mahouya_room_0" Segment="3">
+        <Room Name="mahouya_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/malon_stable.xml b/assets/xml/scenes/indoors/malon_stable.xml
index df1f7a852b..37ac365d9b 100644
--- a/assets/xml/scenes/indoors/malon_stable.xml
+++ b/assets/xml/scenes/indoors/malon_stable.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="malon_stable_scene">
+    <File Name="malon_stable_scene" Segment="2">
         <Scene Name="malon_stable_scene"/>
     </File>
-    <File Name="malon_stable_room_0">
-        <Room Name="malon_stable_room_0"/>
+    <File Name="malon_stable_room_0" Segment="3">
+        <Room Name="malon_stable_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/miharigoya.xml b/assets/xml/scenes/indoors/miharigoya.xml
index cc78c7a582..8dca8d7194 100644
--- a/assets/xml/scenes/indoors/miharigoya.xml
+++ b/assets/xml/scenes/indoors/miharigoya.xml
@@ -1,17 +1,13 @@
 <Root>
-    <File Name="miharigoya_scene">
-        <Scene Name="miharigoya_scene">
-            <BlobHint Offset="0xFC" Size="0x04"/>
-            <BlobHint Offset="0xC48" Size="0x08"/>
-            <BlobHint Offset="0x1350" Size="0x2000"/>
-            <BlobHint Offset="0x3550" Size="0x1000"/>
-            <BlobHint Offset="0x6550" Size="0x1000"/>
-        </Scene>
+    <File Name="miharigoya_scene" Segment="2">
+        <Blob Name="gMiharigoyaBlob_001350" Offset="0x1350" Size="0x2000"/>
+        <Blob Name="gMiharigoyaBlob_003550" Offset="0x3550" Size="0x1000"/>
+        <Blob Name="gMiharigoyaBlob_006550" Offset="0x6550" Size="0x1000"/>
+        <Scene Name="miharigoya_scene" Offset="0x0"/>
     </File>
-    <File Name="miharigoya_room_0">
-        <Room Name="miharigoya_room_0">
-            <BlobHint Offset="0x38D8" Size="0x68"/>
-            <DListHint Offset="0x3DA0" Comment="This display list appears to be unused..."/>
-        </Room>
+    <File Name="miharigoya_room_0" Segment="3">
+        <Blob Name="gMiharigoyaBlob_0038D8" Offset="0x38D8" Size="0x68"/>
+        <Room Name="miharigoya_room_0" Offset="0x0"/>
+        <DList Name="gMiharigoyaDL_003DA0" Offset="0x3DA0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/nakaniwa.xml b/assets/xml/scenes/indoors/nakaniwa.xml
index 22850b5832..230338193a 100644
--- a/assets/xml/scenes/indoors/nakaniwa.xml
+++ b/assets/xml/scenes/indoors/nakaniwa.xml
@@ -1,13 +1,12 @@
 <Root>
-    <File Name="nakaniwa_scene">
-        <Scene Name="nakaniwa_scene">
-            <CutsceneHint Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
-            <CutsceneHint Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
-            <CutsceneHint Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
-        </Scene>
+    <File Name="nakaniwa_scene" Segment="2">
+        <Cutscene Name="gZeldasCourtyardGanonCs" Offset="0x104"/>
+        <Cutscene Name="gZeldasCourtyardWindowCs" Offset="0x444"/>
+        <Cutscene Name="gZeldasCourtyardMeetCs" Offset="0x3994"/>
+
+        <Scene Name="nakaniwa_scene" Offset="0x0"/>
     </File>
-    <File Name="nakaniwa_room_0">
-        <Room Name="nakaniwa_room_0">
-        </Room>
+    <File Name="nakaniwa_room_0" Segment="3">
+        <Room Name="nakaniwa_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/syatekijyou.xml b/assets/xml/scenes/indoors/syatekijyou.xml
index de6f9cadaf..5490e84f13 100644
--- a/assets/xml/scenes/indoors/syatekijyou.xml
+++ b/assets/xml/scenes/indoors/syatekijyou.xml
@@ -1,10 +1,8 @@
 <Root>
-    <File Name="syatekijyou_scene">
-        <Scene Name="syatekijyou_scene">
-        </Scene>
+    <File Name="syatekijyou_scene" Segment="2">
+        <Scene Name="syatekijyou_scene" Offset="0x0"/>
     </File>
-    <File Name="syatekijyou_room_0">
-        <Room Name="syatekijyou_room_0">
-        </Room>
+    <File Name="syatekijyou_room_0" Segment="3">
+        <Room Name="syatekijyou_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/takaraya.xml b/assets/xml/scenes/indoors/takaraya.xml
index 2edf392e31..c3a14c50f9 100644
--- a/assets/xml/scenes/indoors/takaraya.xml
+++ b/assets/xml/scenes/indoors/takaraya.xml
@@ -1,33 +1,26 @@
 <Root>
-    <File Name="takaraya_scene">
+    <File Name="takaraya_scene" Segment="2">
         <Scene Name="takaraya_scene"/>
     </File>
-    <File Name="takaraya_room_0">
-        <Room Name="takaraya_room_0">
-        </Room>
+    <File Name="takaraya_room_0" Segment="3">
+        <Room Name="takaraya_room_0" Offset="0x0"/>
     </File>
-    <File Name="takaraya_room_1">
-        <Room Name="takaraya_room_1">
-        </Room>
+    <File Name="takaraya_room_1" Segment="3">
+        <Room Name="takaraya_room_1" Offset="0x0"/>
     </File>
-    <File Name="takaraya_room_2">
-        <Room Name="takaraya_room_2">
-        </Room>
+    <File Name="takaraya_room_2" Segment="3">
+        <Room Name="takaraya_room_2" Offset="0x0"/>
     </File>
-    <File Name="takaraya_room_3">
-        <Room Name="takaraya_room_3">
-        </Room>
+    <File Name="takaraya_room_3" Segment="3">
+        <Room Name="takaraya_room_3" Offset="0x0"/>
     </File>
-    <File Name="takaraya_room_4">
-        <Room Name="takaraya_room_4">
-        </Room>
+    <File Name="takaraya_room_4" Segment="3">
+        <Room Name="takaraya_room_4" Offset="0x0"/>
     </File>
-    <File Name="takaraya_room_5">
-        <Room Name="takaraya_room_5">
-        </Room>
+    <File Name="takaraya_room_5" Segment="3">
+        <Room Name="takaraya_room_5" Offset="0x0"/>
     </File>
-    <File Name="takaraya_room_6">
-        <Room Name="takaraya_room_6">
-        </Room>
+    <File Name="takaraya_room_6" Segment="3">
+        <Room Name="takaraya_room_6" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/tent.xml b/assets/xml/scenes/indoors/tent.xml
index 973155b54b..571fd7f80f 100644
--- a/assets/xml/scenes/indoors/tent.xml
+++ b/assets/xml/scenes/indoors/tent.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="tent_scene">
+    <File Name="tent_scene" Segment="2">
         <Scene Name="tent_scene"/>
     </File>
-    <File Name="tent_room_0">
-        <Room Name="tent_room_0"/>
+    <File Name="tent_room_0" Segment="3">
+        <Room Name="tent_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/tokinoma.xml b/assets/xml/scenes/indoors/tokinoma.xml
index af1b892cf2..62f0150d5a 100644
--- a/assets/xml/scenes/indoors/tokinoma.xml
+++ b/assets/xml/scenes/indoors/tokinoma.xml
@@ -1,14 +1,13 @@
 <Root>
-    <File Name="tokinoma_scene">
-        <Scene Name="tokinoma_scene">
-        <CutsceneHint Name="gFirstAdultCs" Offset="0x0046F0"/>
-        <CutsceneHint Name="gPreludeCs" Offset="0x006D20"/>
-        </Scene>
+    <File Name="tokinoma_scene" Segment="2">
+        <Cutscene  Name="gFirstAdultCs" Offset="0x46F0"/>
+        <Cutscene  Name="gPreludeCs" Offset="0x6D20"/>
+        <Scene Name="tokinoma_scene" Offset="0x0"/>
     </File>
-    <File Name="tokinoma_room_0">
-        <Room Name="tokinoma_room_0"/>
+    <File Name="tokinoma_room_0" Segment="3">
+        <Room Name="tokinoma_room_0" Offset="0x0"/>
     </File>
-    <File Name="tokinoma_room_1">
-        <Room Name="tokinoma_room_1"/>
+    <File Name="tokinoma_room_1" Segment="3">
+        <Room Name="tokinoma_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/yousei_izumi_tate.xml b/assets/xml/scenes/indoors/yousei_izumi_tate.xml
index ab54d8d18f..3c4ac734bb 100644
--- a/assets/xml/scenes/indoors/yousei_izumi_tate.xml
+++ b/assets/xml/scenes/indoors/yousei_izumi_tate.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="yousei_izumi_tate_scene">
+    <File Name="yousei_izumi_tate_scene" Segment="2">
         <Scene Name="yousei_izumi_tate_scene"/>
     </File>
-    <File Name="yousei_izumi_tate_room_0">
-        <Room Name="yousei_izumi_tate_room_0"/>
+    <File Name="yousei_izumi_tate_room_0" Segment="3">
+        <Room Name="yousei_izumi_tate_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/indoors/yousei_izumi_yoko.xml b/assets/xml/scenes/indoors/yousei_izumi_yoko.xml
index c202a283b6..f483307841 100644
--- a/assets/xml/scenes/indoors/yousei_izumi_yoko.xml
+++ b/assets/xml/scenes/indoors/yousei_izumi_yoko.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="yousei_izumi_yoko_scene">
+    <File Name="yousei_izumi_yoko_scene" Segment="2">
         <Scene Name="yousei_izumi_yoko_scene"/>
     </File>
-    <File Name="yousei_izumi_yoko_room_0">
-        <Room Name="yousei_izumi_yoko_room_0"/>
+    <File Name="yousei_izumi_yoko_room_0" Segment="3">
+        <Room Name="yousei_izumi_yoko_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/enrui.xml b/assets/xml/scenes/misc/enrui.xml
index 2507e56054..f616fb7a25 100644
--- a/assets/xml/scenes/misc/enrui.xml
+++ b/assets/xml/scenes/misc/enrui.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="enrui_scene">
+    <File Name="enrui_scene" Segment="2">
         <Scene Name="enrui_scene"/>
     </File>
-    <File Name="enrui_room_0">
-        <Room Name="enrui_room_0">
-        </Room>
+    <File Name="enrui_room_0" Segment="3">
+        <Room Name="enrui_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/entra_n.xml b/assets/xml/scenes/misc/entra_n.xml
index e186ff9ae9..6abd69581f 100644
--- a/assets/xml/scenes/misc/entra_n.xml
+++ b/assets/xml/scenes/misc/entra_n.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="entra_n_scene">
+    <File Name="entra_n_scene" Segment="2">
         <Scene Name="entra_n_scene"/>
     </File>
-    <File Name="entra_n_room_0">
-        <Room Name="entra_n_room_0">
-        </Room>
+    <File Name="entra_n_room_0" Segment="3">
+        <Room Name="entra_n_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/hakaana.xml b/assets/xml/scenes/misc/hakaana.xml
index 4cff72c6d4..d999d27329 100644
--- a/assets/xml/scenes/misc/hakaana.xml
+++ b/assets/xml/scenes/misc/hakaana.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="hakaana_scene">
+    <File Name="hakaana_scene" Segment="2">
         <Scene Name="hakaana_scene"/>
     </File>
-    <File Name="hakaana_room_0">
-        <Room Name="hakaana_room_0">
-        </Room>
+    <File Name="hakaana_room_0" Segment="3">
+        <Room Name="hakaana_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/hakaana2.xml b/assets/xml/scenes/misc/hakaana2.xml
index 993bb492b8..6df64d7a4d 100644
--- a/assets/xml/scenes/misc/hakaana2.xml
+++ b/assets/xml/scenes/misc/hakaana2.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="hakaana2_scene">
+    <File Name="hakaana2_scene" Segment="2">
         <Scene Name="hakaana2_scene"/>
     </File>
-    <File Name="hakaana2_room_0">
-        <Room Name="hakaana2_room_0">
-        </Room>
+    <File Name="hakaana2_room_0" Segment="3">
+        <Room Name="hakaana2_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/hakaana_ouke.xml b/assets/xml/scenes/misc/hakaana_ouke.xml
index f84f85131d..e4bf4f47d9 100644
--- a/assets/xml/scenes/misc/hakaana_ouke.xml
+++ b/assets/xml/scenes/misc/hakaana_ouke.xml
@@ -1,17 +1,14 @@
 <Root>
-    <File Name="hakaana_ouke_scene">
+    <File Name="hakaana_ouke_scene" Segment="2">
         <Scene Name="hakaana_ouke_scene"/>
     </File>
-    <File Name="hakaana_ouke_room_0">
-        <Room Name="hakaana_ouke_room_0">
-        </Room>
+    <File Name="hakaana_ouke_room_0" Segment="3">
+        <Room Name="hakaana_ouke_room_0" Offset="0x0"/>
     </File>
-    <File Name="hakaana_ouke_room_1">
-        <Room Name="hakaana_ouke_room_1">
-        </Room>
+    <File Name="hakaana_ouke_room_1" Segment="3">
+        <Room Name="hakaana_ouke_room_1" Offset="0x0"/>
     </File>
-    <File Name="hakaana_ouke_room_2">
-        <Room Name="hakaana_ouke_room_2">
-        </Room>
+    <File Name="hakaana_ouke_room_2" Segment="3">
+        <Room Name="hakaana_ouke_room_2" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/hiral_demo.xml b/assets/xml/scenes/misc/hiral_demo.xml
index 880a1c2215..9bb473a5fb 100644
--- a/assets/xml/scenes/misc/hiral_demo.xml
+++ b/assets/xml/scenes/misc/hiral_demo.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="hiral_demo_scene">
+    <File Name="hiral_demo_scene" Segment="2">
         <Scene Name="hiral_demo_scene"/>
     </File>
-    <File Name="hiral_demo_room_0">
-        <Room Name="hiral_demo_room_0">
-        </Room>
+    <File Name="hiral_demo_room_0" Segment="3">
+        <Room Name="hiral_demo_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/kakariko3.xml b/assets/xml/scenes/misc/kakariko3.xml
index fcf9fcac2f..51a01ce8ea 100644
--- a/assets/xml/scenes/misc/kakariko3.xml
+++ b/assets/xml/scenes/misc/kakariko3.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="kakariko3_scene">
+    <File Name="kakariko3_scene" Segment="2">
         <Scene Name="kakariko3_scene"/>
     </File>
-    <File Name="kakariko3_room_0">
-        <Room Name="kakariko3_room_0">
-        </Room>
+    <File Name="kakariko3_room_0" Segment="3">
+        <Room Name="kakariko3_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/kakusiana.xml b/assets/xml/scenes/misc/kakusiana.xml
index 83a9a695c0..fec595c116 100644
--- a/assets/xml/scenes/misc/kakusiana.xml
+++ b/assets/xml/scenes/misc/kakusiana.xml
@@ -1,47 +1,47 @@
 <Root>
-    <File Name="kakusiana_scene">
+    <File Name="kakusiana_scene" Segment="2">
         <Scene Name="kakusiana_scene"/>
     </File>
-    <File Name="kakusiana_room_0">
-        <Room Name="kakusiana_room_0"/>
+    <File Name="kakusiana_room_0" Segment="3">
+        <Room Name="kakusiana_room_0" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_1">
-        <Room Name="kakusiana_room_1"/>
+    <File Name="kakusiana_room_1" Segment="3">
+        <Room Name="kakusiana_room_1" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_2">
-        <Room Name="kakusiana_room_2"/>
+    <File Name="kakusiana_room_2" Segment="3">
+        <Room Name="kakusiana_room_2" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_3">
-        <Room Name="kakusiana_room_3"/>
+    <File Name="kakusiana_room_3" Segment="3">
+        <Room Name="kakusiana_room_3" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_4">
-        <Room Name="kakusiana_room_4"/>
+    <File Name="kakusiana_room_4" Segment="3">
+        <Room Name="kakusiana_room_4" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_5">
-        <Room Name="kakusiana_room_5"/>
+    <File Name="kakusiana_room_5" Segment="3">
+        <Room Name="kakusiana_room_5" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_6">
-        <Room Name="kakusiana_room_6"/>
+    <File Name="kakusiana_room_6" Segment="3">
+        <Room Name="kakusiana_room_6" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_7">
-        <Room Name="kakusiana_room_7"/>
+    <File Name="kakusiana_room_7" Segment="3">
+        <Room Name="kakusiana_room_7" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_8">
-        <Room Name="kakusiana_room_8"/>
+    <File Name="kakusiana_room_8" Segment="3">
+        <Room Name="kakusiana_room_8" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_9">
-        <Room Name="kakusiana_room_9"/>
+    <File Name="kakusiana_room_9" Segment="3">
+        <Room Name="kakusiana_room_9" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_10">
-        <Room Name="kakusiana_room_10"/>
+    <File Name="kakusiana_room_10" Segment="3">
+        <Room Name="kakusiana_room_10" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_11">
-        <Room Name="kakusiana_room_11"/>
+    <File Name="kakusiana_room_11" Segment="3">
+        <Room Name="kakusiana_room_11" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_12">
-        <Room Name="kakusiana_room_12"/>
+    <File Name="kakusiana_room_12" Segment="3">
+        <Room Name="kakusiana_room_12" Offset="0x0"/>
     </File>
-    <File Name="kakusiana_room_13">
-        <Room Name="kakusiana_room_13"/>
+    <File Name="kakusiana_room_13" Segment="3">
+        <Room Name="kakusiana_room_13" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/kinsuta.xml b/assets/xml/scenes/misc/kinsuta.xml
index 974b3955e2..84eb664847 100644
--- a/assets/xml/scenes/misc/kinsuta.xml
+++ b/assets/xml/scenes/misc/kinsuta.xml
@@ -1,11 +1,10 @@
 <Root>
-    <File Name="kinsuta_scene">
+    <File Name="kinsuta_scene" Segment="2">
         <Scene Name="kinsuta_scene"/>
     </File>
-    <File Name="kinsuta_room_0">
-        <Room Name="kinsuta_room_0">
-            <DListHint Offset="0x30B0" Comment="This display list appears to be unused..."/>
-            <DListHint Offset="0xB088" Comment="This display list appears to be unused..."/>
-        </Room>
+    <File Name="kinsuta_room_0" Segment="3">
+        <DList Name="gKinsutaDL_0030B0" Offset="0x30B0"/>
+        <DList Name="gKinsutaDL_00B088" Offset="0xB088"/>
+        <Room Name="kinsuta_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/market_alley.xml b/assets/xml/scenes/misc/market_alley.xml
index bb254a29d8..843512c130 100644
--- a/assets/xml/scenes/misc/market_alley.xml
+++ b/assets/xml/scenes/misc/market_alley.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="market_alley_scene">
+    <File Name="market_alley_scene" Segment="2">
         <Scene Name="market_alley_scene"/>
     </File>
-    <File Name="market_alley_room_0">
-        <Room Name="market_alley_room_0">
-        </Room>
+    <File Name="market_alley_room_0" Segment="3">
+        <Room Name="market_alley_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/market_alley_n.xml b/assets/xml/scenes/misc/market_alley_n.xml
index 114aef4f37..b6c6608951 100644
--- a/assets/xml/scenes/misc/market_alley_n.xml
+++ b/assets/xml/scenes/misc/market_alley_n.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="market_alley_n_scene">
+    <File Name="market_alley_n_scene" Segment="2">
         <Scene Name="market_alley_n_scene"/>
     </File>
-    <File Name="market_alley_n_room_0">
-        <Room Name="market_alley_n_room_0">
-        </Room>
+    <File Name="market_alley_n_room_0" Segment="3">
+        <Room Name="market_alley_n_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/market_day.xml b/assets/xml/scenes/misc/market_day.xml
index a4bf8e3640..5552ae7f56 100644
--- a/assets/xml/scenes/misc/market_day.xml
+++ b/assets/xml/scenes/misc/market_day.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="market_day_scene">
+    <File Name="market_day_scene" Segment="2">
         <Scene Name="market_day_scene"/>
     </File>
-    <File Name="market_day_room_0">
-        <Room Name="market_day_room_0">
-        </Room>
+    <File Name="market_day_room_0" Segment="3">
+        <Room Name="market_day_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/market_night.xml b/assets/xml/scenes/misc/market_night.xml
index b322d35859..611d5f7d25 100644
--- a/assets/xml/scenes/misc/market_night.xml
+++ b/assets/xml/scenes/misc/market_night.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="market_night_scene">
+    <File Name="market_night_scene" Segment="2">
         <Scene Name="market_night_scene"/>
     </File>
-    <File Name="market_night_room_0">
-        <Room Name="market_night_room_0">
-        </Room>
+    <File Name="market_night_room_0" Segment="3">
+        <Room Name="market_night_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/market_ruins.xml b/assets/xml/scenes/misc/market_ruins.xml
index ceaff25ffc..c84c4e093e 100644
--- a/assets/xml/scenes/misc/market_ruins.xml
+++ b/assets/xml/scenes/misc/market_ruins.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="market_ruins_scene">
+    <File Name="market_ruins_scene" Segment="2">
         <Scene Name="market_ruins_scene"/>
     </File>
-    <File Name="market_ruins_room_0">
-        <Room Name="market_ruins_room_0">
-        </Room>
+    <File Name="market_ruins_room_0" Segment="3">
+        <Room Name="market_ruins_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/shrine.xml b/assets/xml/scenes/misc/shrine.xml
index 03410ee3f6..78a5fd279c 100644
--- a/assets/xml/scenes/misc/shrine.xml
+++ b/assets/xml/scenes/misc/shrine.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="shrine_scene">
+    <File Name="shrine_scene" Segment="2">
         <Scene Name="shrine_scene"/>
     </File>
-    <File Name="shrine_room_0">
-        <Room Name="shrine_room_0">
-        </Room>
+    <File Name="shrine_room_0" Segment="3">
+        <Room Name="shrine_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/shrine_n.xml b/assets/xml/scenes/misc/shrine_n.xml
index 0201def0c0..8425e85c30 100644
--- a/assets/xml/scenes/misc/shrine_n.xml
+++ b/assets/xml/scenes/misc/shrine_n.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="shrine_n_scene">
+    <File Name="shrine_n_scene" Segment="2">
         <Scene Name="shrine_n_scene"/>
     </File>
-    <File Name="shrine_n_room_0">
-        <Room Name="shrine_n_room_0">
-        </Room>
+    <File Name="shrine_n_room_0" Segment="3">
+        <Room Name="shrine_n_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/shrine_r.xml b/assets/xml/scenes/misc/shrine_r.xml
index b8004c7e1f..16a5ec0c32 100644
--- a/assets/xml/scenes/misc/shrine_r.xml
+++ b/assets/xml/scenes/misc/shrine_r.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="shrine_r_scene">
+    <File Name="shrine_r_scene" Segment="2">
         <Scene Name="shrine_r_scene"/>
     </File>
-    <File Name="shrine_r_room_0">
-        <Room Name="shrine_r_room_0">
-        </Room>
+    <File Name="shrine_r_room_0" Segment="3">
+        <Room Name="shrine_r_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/misc/turibori.xml b/assets/xml/scenes/misc/turibori.xml
index 294b13749f..a6fed0f437 100644
--- a/assets/xml/scenes/misc/turibori.xml
+++ b/assets/xml/scenes/misc/turibori.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="turibori_scene">
+    <File Name="turibori_scene" Segment="2">
         <Scene Name="turibori_scene"/>
     </File>
-    <File Name="turibori_room_0">
-        <Room Name="turibori_room_0">
-        </Room>
+    <File Name="turibori_room_0" Segment="3">
+        <Room Name="turibori_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/entra.xml b/assets/xml/scenes/overworld/entra.xml
index a55e676bb7..ec560ee4db 100644
--- a/assets/xml/scenes/overworld/entra.xml
+++ b/assets/xml/scenes/overworld/entra.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="entra_scene">
+    <File Name="entra_scene" Segment="2">
         <Scene Name="entra_scene"/>
     </File>
-    <File Name="entra_room_0">
-        <Room Name="entra_room_0"/>
+    <File Name="entra_room_0" Segment="3">
+        <Room Name="entra_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/souko.xml b/assets/xml/scenes/overworld/souko.xml
index 10e0b08a8b..7d361be169 100644
--- a/assets/xml/scenes/overworld/souko.xml
+++ b/assets/xml/scenes/overworld/souko.xml
@@ -1,14 +1,14 @@
 <Root>
-    <File Name="souko_scene">
+    <File Name="souko_scene" Segment="2">
         <Scene Name="souko_scene"/>
     </File>
-    <File Name="souko_room_0">
-        <Room Name="souko_room_0"/>
+    <File Name="souko_room_0" Segment="3">
+        <Room Name="souko_room_0" Offset="0x0"/>
     </File>
-    <File Name="souko_room_1">
-        <Room Name="souko_room_1"/>
+    <File Name="souko_room_1" Segment="3">
+        <Room Name="souko_room_1" Offset="0x0"/>
     </File>
-    <File Name="souko_room_2">
-        <Room Name="souko_room_2"/>
+    <File Name="souko_room_2" Segment="3">
+        <Room Name="souko_room_2" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot00.xml b/assets/xml/scenes/overworld/spot00.xml
index f8e3439251..b332d1203c 100644
--- a/assets/xml/scenes/overworld/spot00.xml
+++ b/assets/xml/scenes/overworld/spot00.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="spot00_scene">
+    <File Name="spot00_scene" Segment="2">
         <Scene Name="spot00_scene"/>
     </File>
-    <File Name="spot00_room_0">
-        <Room Name="spot00_room_0">
-        </Room>
+    <File Name="spot00_room_0" Segment="3">
+        <Room Name="spot00_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot01.xml b/assets/xml/scenes/overworld/spot01.xml
index 224bdcd27b..bb9b1eb807 100644
--- a/assets/xml/scenes/overworld/spot01.xml
+++ b/assets/xml/scenes/overworld/spot01.xml
@@ -1,10 +1,9 @@
 <Root>
-    <File Name="spot01_scene">
+    <File Name="spot01_scene" Segment="2">
         <Scene Name="spot01_scene"/>
     </File>
-    <File Name="spot01_room_0">
-        <Room Name="spot01_room_0">
-        <DListHint Offset="0x9E38" Comment="This display list appears to be unused..."/>
-        </Room>
+    <File Name="spot01_room_0" Segment="3">
+        <DList Name="gSpot01DL_009E38" Offset="0x9E38"/>
+        <Room Name="spot01_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot02.xml b/assets/xml/scenes/overworld/spot02.xml
index 01151316a9..a980d0359a 100644
--- a/assets/xml/scenes/overworld/spot02.xml
+++ b/assets/xml/scenes/overworld/spot02.xml
@@ -1,14 +1,12 @@
 <Root>
-    <File Name="spot02_scene">
+    <File Name="spot02_scene" Segment="2">
         <Scene Name="spot02_scene"/>
     </File>
-    <File Name="spot02_room_0">
-        <Room Name="spot02_room_0">
-        <DListHint Offset="0x26D0" Comment="This display list appears to be unused..."/>
-        </Room>
+    <File Name="spot02_room_0" Segment="3">
+        <DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>
+        <Room Name="spot02_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot02_room_1">
-        <Room Name="spot02_room_1">
-        </Room>
+    <File Name="spot02_room_1" Segment="3">
+        <Room Name="spot02_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot03.xml b/assets/xml/scenes/overworld/spot03.xml
index b3462234b4..3a1626645e 100644
--- a/assets/xml/scenes/overworld/spot03.xml
+++ b/assets/xml/scenes/overworld/spot03.xml
@@ -1,18 +1,16 @@
 <Root>
-    <File Name="spot03_scene">
-        <Scene Name="spot03_scene">
-            <PathHint Offset="0x02C4"/>
-            <PathHint Offset="0x6910"/>
-            <PathHint Offset="0x6918"/>
-        </Scene>
+    <File Name="spot03_scene" Segment="2">
+        <Path Name="gSpot03Path_0002C4" Offset="0x2C4"/>
+        <Path Name="gSpot03Path_006910" Offset="0x6910"/>
+        <Path Name="gSpot03Path_006918" Offset="0x6918"/>
+
+        <Scene Name="spot03_scene" Offset="0x0"/>
     </File>
-    <File Name="spot03_room_0">
-        <Room Name="spot03_room_0">
-        </Room>
+    <File Name="spot03_room_0" Segment="3">
+        <Room Name="spot03_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot03_room_1">
-        <Room Name="spot03_room_1">
-            <DListHint Offset="0x74E8" Comment="This display list appears to be unused..."/>
-        </Room>
+    <File Name="spot03_room_1" Segment="3">
+        <DList Name="gSpot03DL_0074E8" Offset="0x74E8"/>
+        <Room Name="spot03_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot04.xml b/assets/xml/scenes/overworld/spot04.xml
index 3f668e7748..ff0df63c66 100644
--- a/assets/xml/scenes/overworld/spot04.xml
+++ b/assets/xml/scenes/overworld/spot04.xml
@@ -1,24 +1,22 @@
 <Root>
-    <File Name="spot04_scene">
-        <Scene Name="spot04_scene">
-            <PathHint Offset="0x314"/>
-            <PathHint Offset="0x31C"/>
-            <PathHint Offset="0xD730"/>
-            <CutsceneHint Offset="0x10E20"/>
-        </Scene>
+    <File Name="spot04_scene" Segment="2">
+        <Path Name="gSpot04Path_000314" Offset="0x314"/>
+        <Path Name="gSpot04Path_00031C" Offset="0x31C"/>
+        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+
+        <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
+
+        <Scene Name="spot04_scene" Offset="0x0"/>
     </File>
-    <File Name="spot04_room_0">
-        <Room Name="spot04_room_0">
-        </Room>
+    <File Name="spot04_room_0" Segment="3">
+        <Room Name="spot04_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot04_room_1">
-        <Room Name="spot04_room_1">
-        </Room>
+    <File Name="spot04_room_1" Segment="3">
+        <Room Name="spot04_room_1" Offset="0x0"/>
     </File>
-    <File Name="spot04_room_2">
-        <Room Name="spot04_room_2">
-            <DListHint Offset="0x2BB8" Comment="This display list appears to be unused..."/>
-            <DListHint Offset="0x5058" Comment="This display list appears to be unused..."/>
-        </Room>
+    <File Name="spot04_room_2" Segment="3">
+        <DList Name="gSpot04DL_002BB8" Offset="0x2BB8"/>
+        <DList Name="gSpot04DL_005058" Offset="0x5058"/>
+        <Room Name="spot04_room_2" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot05.xml b/assets/xml/scenes/overworld/spot05.xml
index e2a437fb63..b621691145 100644
--- a/assets/xml/scenes/overworld/spot05.xml
+++ b/assets/xml/scenes/overworld/spot05.xml
@@ -1,17 +1,17 @@
 <Root>
-    <File Name="spot05_scene">
-        <Scene Name="spot05_scene">
-            <PathHint Offset="0x69E0"/>
-            <PathHint Offset="0x69E8"/>
-            <PathHint Offset="0x69F0"/>
-            <PathHint Offset="0x69F8"/>
-            <CutsceneHint Name="gMinuetCs" Offset="0x003F80"/>
-        </Scene>
+    <File Name="spot05_scene" Segment="2">
+        <Cutscene Name="gMinuetCs" Offset="0x3F80"/>
+
+        <Path Name="gSpot05Path_0069E0" Offset="0x69E0"/>
+        <Path Name="gSpot05Path_0069E8" Offset="0x69E8"/>
+        <Path Name="gSpot05Path_0069F0" Offset="0x69F0"/>
+        <Path Name="gSpot05Path_0069F8" Offset="0x69F8"/>
+
+        <Scene Name="spot05_scene" Offset="0x0"/>
     </File>
-    <File Name="spot05_room_0">
-        <Room Name="spot05_room_0">
-            <DListHint Offset="0x9A60"/>
-            <DListHint Offset="0x9EE0"/>
-        </Room>
+    <File Name="spot05_room_0" Segment="3">
+        <DList Name="gSpot05DL_009A60" Offset="0x9A60"/>
+        <DList Name="gSpot05DL_009EE0" Offset="0x9EE0"/>
+        <Room Name="spot05_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot06.xml b/assets/xml/scenes/overworld/spot06.xml
index df64dff795..a71acc3ce2 100644
--- a/assets/xml/scenes/overworld/spot06.xml
+++ b/assets/xml/scenes/overworld/spot06.xml
@@ -1,15 +1,16 @@
 <Root>
-    <File Name="spot06_scene">
-        <Scene Name="spot06_scene">
-            <CutsceneHint Offset="0x7020"/>
-            <PathHint Offset="0x776C"/>
-            <CutsceneHint Offset="0x1B0C0"/>
-        </Scene>
+    <File Name="spot06_scene" Segment="2">
+        <Cutscene Name="gSpot06Cs_007020" Offset="0x7020"/>
+        <Cutscene Name="gSpot06Cs_01B0C0" Offset="0x1B0C0"/>
+
+        <Path Name="gSpot06Path_00776C" Offset="0x776C"/>
+
+        <Scene Name="spot06_scene" Offset="0x0"/>
     </File>
-    <File Name="spot06_room_0">
-        <Room Name="spot06_room_0">
-            <DListHint Offset="0xA400" Comment="This display list appears to be unused..."/>
-            <DListHint Offset="0xA608" Comment="This display list appears to be unused..."/>
-        </Room>
+    <File Name="spot06_room_0" Segment="3">
+        <DList Name="gSpot06DL_00A400" Offset="0xA400"/>
+        <DList Name="gSpot06DL_00A608" Offset="0xA608"/>
+
+        <Room Name="spot06_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot07.xml b/assets/xml/scenes/overworld/spot07.xml
index 24b8a5a66d..fd7e3f9df2 100644
--- a/assets/xml/scenes/overworld/spot07.xml
+++ b/assets/xml/scenes/overworld/spot07.xml
@@ -1,14 +1,11 @@
 <Root>
-    <File Name="spot07_scene">
-        <Scene Name="spot07_scene">
-        </Scene>
+    <File Name="spot07_scene" Segment="2">
+        <Scene Name="spot07_scene" Offset="0x0"/>
     </File>
-    <File Name="spot07_room_0">
-        <Room Name="spot07_room_0">
-        </Room>
+    <File Name="spot07_room_0" Segment="3">
+        <Room Name="spot07_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot07_room_1">
-        <Room Name="spot07_room_1">
-        </Room>
+    <File Name="spot07_room_1" Segment="3">
+        <Room Name="spot07_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot08.xml b/assets/xml/scenes/overworld/spot08.xml
index a07906104f..3e079f7aae 100644
--- a/assets/xml/scenes/overworld/spot08.xml
+++ b/assets/xml/scenes/overworld/spot08.xml
@@ -1,10 +1,8 @@
 <Root>
-    <File Name="spot08_scene">
-        <Scene Name="spot08_scene">
-        </Scene>
+    <File Name="spot08_scene" Segment="2">
+        <Scene Name="spot08_scene" Offset="0x0"/>
     </File>
-    <File Name="spot08_room_0">
-        <Room Name="spot08_room_0">
-        </Room>
+    <File Name="spot08_room_0" Segment="3">
+        <Room Name="spot08_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot09.xml b/assets/xml/scenes/overworld/spot09.xml
index 21d03cb646..c592258b85 100644
--- a/assets/xml/scenes/overworld/spot09.xml
+++ b/assets/xml/scenes/overworld/spot09.xml
@@ -1,16 +1,17 @@
 <Root>
-    <File Name="spot09_scene">
-        <Scene Name="spot09_scene">
-            <PathHint Offset="0x2F60"/>
-            <PathHint Offset="0x2F68"/>
-            <CutsceneHint Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
-            <CutsceneHint Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
-        </Scene>
+    <File Name="spot09_scene" Segment="2">
+        <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
+        <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
+
+        <Path Name="gSpot09Path_002F60" Offset="0x2F60"/>
+        <Path Name="gSpot09Path_002F68" Offset="0x2F68"/>
+
+        <Scene Name="spot09_scene" Offset="0x0"/>
     </File>
-    <File Name="spot09_room_0">
-        <Room Name="spot09_room_0">
-            <DListHint Offset="0x7108"/>
-            <DListHint Offset="0x8780"/>
-        </Room>
+    <File Name="spot09_room_0" Segment="3">
+        <DList Name="gSpot09DL_007108" Offset="0x7108"/>
+        <DList Name="gSpot09DL_008780" Offset="0x8780"/>
+
+        <Room Name="spot09_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot10.xml b/assets/xml/scenes/overworld/spot10.xml
index 77195310ab..9ae2c61e20 100644
--- a/assets/xml/scenes/overworld/spot10.xml
+++ b/assets/xml/scenes/overworld/spot10.xml
@@ -1,38 +1,38 @@
 <Root>
-    <File Name="spot10_scene">
-        <Scene Name="spot10_scene">
-            <PathHint Offset="0xC088"/>
-            <PathHint Offset="0xC090"/>
-        </Scene>
+    <File Name="spot10_scene" Segment="2">
+        <Path Name="gSpot10Path_00C088" Offset="0xC088"/>
+        <Path Name="gSpot10Path_00C090" Offset="0xC090"/>
+
+        <Scene Name="spot10_scene" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_0">
-        <Room Name="spot10_room_0"/>
+    <File Name="spot10_room_0" Segment="3">
+        <Room Name="spot10_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_1">
-        <Room Name="spot10_room_1"/>
+    <File Name="spot10_room_1" Segment="3">
+        <Room Name="spot10_room_1" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_2">
-        <Room Name="spot10_room_2"/>
+    <File Name="spot10_room_2" Segment="3">
+        <Room Name="spot10_room_2" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_3">
-        <Room Name="spot10_room_3"/>
+    <File Name="spot10_room_3" Segment="3">
+        <Room Name="spot10_room_3" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_4">
-        <Room Name="spot10_room_4"/>
+    <File Name="spot10_room_4" Segment="3">
+        <Room Name="spot10_room_4" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_5">
-        <Room Name="spot10_room_5"/>
+    <File Name="spot10_room_5" Segment="3">
+        <Room Name="spot10_room_5" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_6">
-        <Room Name="spot10_room_6"/>
+    <File Name="spot10_room_6" Segment="3">
+        <Room Name="spot10_room_6" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_7">
-        <Room Name="spot10_room_7"/>
+    <File Name="spot10_room_7" Segment="3">
+        <Room Name="spot10_room_7" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_8">
-        <Room Name="spot10_room_8"/>
+    <File Name="spot10_room_8" Segment="3">
+        <Room Name="spot10_room_8" Offset="0x0"/>
     </File>
-    <File Name="spot10_room_9">
-        <Room Name="spot10_room_9"/>
+    <File Name="spot10_room_9" Segment="3">
+        <Room Name="spot10_room_9" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot11.xml b/assets/xml/scenes/overworld/spot11.xml
index 8e1e567477..72b7dccf00 100644
--- a/assets/xml/scenes/overworld/spot11.xml
+++ b/assets/xml/scenes/overworld/spot11.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="spot11_scene">
-        <Scene Name="spot11_scene">
-        </Scene>
+    <File Name="spot11_scene" Segment="2">
+        <Scene Name="spot11_scene" Offset="0x0"/>
     </File>
-    <File Name="spot11_room_0">
-        <Room Name="spot11_room_0"/>
+    <File Name="spot11_room_0" Segment="3">
+        <Room Name="spot11_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot12.xml b/assets/xml/scenes/overworld/spot12.xml
index 47dfb8be1c..fa679878d4 100644
--- a/assets/xml/scenes/overworld/spot12.xml
+++ b/assets/xml/scenes/overworld/spot12.xml
@@ -1,13 +1,12 @@
 <Root>
-    <File Name="spot12_scene">
-        <Scene Name="spot12_scene">
-        <CutsceneHint Offset="0x6490"/>
-        </Scene>
+    <File Name="spot12_scene" Segment="2">
+        <Cutscene  Offset="0x6490"/>
+        <Scene Name="spot12_scene" Offset="0x0"/>
     </File>
-    <File Name="spot12_room_0">
-        <Room Name="spot12_room_0"/>
+    <File Name="spot12_room_0" Segment="3">
+        <Room Name="spot12_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot12_room_1">
-        <Room Name="spot12_room_1"/>
+    <File Name="spot12_room_1" Segment="3">
+        <Room Name="spot12_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot13.xml b/assets/xml/scenes/overworld/spot13.xml
index c92c879862..5686bbde51 100644
--- a/assets/xml/scenes/overworld/spot13.xml
+++ b/assets/xml/scenes/overworld/spot13.xml
@@ -1,12 +1,11 @@
 <Root>
-    <File Name="spot13_scene">
-        <Scene Name="spot13_scene">
-        </Scene>
+    <File Name="spot13_scene" Segment="2">
+        <Scene Name="spot13_scene" Offset="0x0"/>
     </File>
-    <File Name="spot13_room_0">
-        <Room Name="spot13_room_0"/>
+    <File Name="spot13_room_0" Segment="3">
+        <Room Name="spot13_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot13_room_1">
-        <Room Name="spot13_room_1"/>
+    <File Name="spot13_room_1" Segment="3">
+        <Room Name="spot13_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot15.xml b/assets/xml/scenes/overworld/spot15.xml
index c26d8dad93..67e550a93b 100644
--- a/assets/xml/scenes/overworld/spot15.xml
+++ b/assets/xml/scenes/overworld/spot15.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="spot15_scene">
-        <Scene Name="spot15_scene">
-        </Scene>
+    <File Name="spot15_scene" Segment="2">
+        <Scene Name="spot15_scene" Offset="0x0"/>
     </File>
-    <File Name="spot15_room_0">
-        <Room Name="spot15_room_0"/>
+    <File Name="spot15_room_0" Segment="3">
+        <Room Name="spot15_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot16.xml b/assets/xml/scenes/overworld/spot16.xml
index 0d445acaef..fb4efc9cd9 100644
--- a/assets/xml/scenes/overworld/spot16.xml
+++ b/assets/xml/scenes/overworld/spot16.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="spot16_scene">
-        <Scene Name="spot16_scene">
-        </Scene>
+    <File Name="spot16_scene" Segment="2">
+        <Scene Name="spot16_scene" Offset="0x0"/>
     </File>
-    <File Name="spot16_room_0">
-        <Room Name="spot16_room_0"/>
+    <File Name="spot16_room_0" Segment="3">
+        <Room Name="spot16_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot17.xml b/assets/xml/scenes/overworld/spot17.xml
index 17e502a422..e9a103f3ca 100644
--- a/assets/xml/scenes/overworld/spot17.xml
+++ b/assets/xml/scenes/overworld/spot17.xml
@@ -1,13 +1,12 @@
 <Root>
-    <File Name="spot17_scene">
-        <Scene Name="spot17_scene">
-        <CutsceneHint Name="gBoleroCs" Offset="0x0045D0"/>
-        </Scene>
+    <File Name="spot17_scene" Segment="2">
+        <Cutscene Name="gBoleroCs" Offset="0x45D0"/>
+        <Scene Name="spot17_scene" Offset="0x0"/>
     </File>
-    <File Name="spot17_room_0">
-        <Room Name="spot17_room_0"/>
+    <File Name="spot17_room_0" Segment="3">
+        <Room Name="spot17_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot17_room_1">
-        <Room Name="spot17_room_1"/>
+    <File Name="spot17_room_1" Segment="3">
+        <Room Name="spot17_room_1" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/overworld/spot18.xml b/assets/xml/scenes/overworld/spot18.xml
index bcc4fa72ac..5fc03e551e 100644
--- a/assets/xml/scenes/overworld/spot18.xml
+++ b/assets/xml/scenes/overworld/spot18.xml
@@ -1,23 +1,21 @@
 <Root>
-    <File Name="spot18_scene">
-        <Scene Name="spot18_scene">
-            <CutsceneHint Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+    <File Name="spot18_scene" Segment="2">
+        <Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
+        <Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
+        <Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
 
-            <CutsceneHint Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
-
-            <CutsceneHint Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
-        </Scene>
+        <Scene Name="spot18_scene" Offset="0x0"/>
     </File>
-    <File Name="spot18_room_0">
-        <Room Name="spot18_room_0"/>
+    <File Name="spot18_room_0" Segment="3">
+        <Room Name="spot18_room_0" Offset="0x0"/>
     </File>
-    <File Name="spot18_room_1">
-        <Room Name="spot18_room_1"/>
+    <File Name="spot18_room_1" Segment="3">
+        <Room Name="spot18_room_1" Offset="0x0"/>
     </File>
-    <File Name="spot18_room_2">
-        <Room Name="spot18_room_2"/>
+    <File Name="spot18_room_2" Segment="3">
+        <Room Name="spot18_room_2" Offset="0x0"/>
     </File>
-    <File Name="spot18_room_3">
-        <Room Name="spot18_room_3"/>
+    <File Name="spot18_room_3" Segment="3">
+        <Room Name="spot18_room_3" Offset="0x0"/>
     </File>
 </Root>
diff --git a/assets/xml/scenes/overworld/spot20.xml b/assets/xml/scenes/overworld/spot20.xml
index ea798035b5..d409d8e261 100644
--- a/assets/xml/scenes/overworld/spot20.xml
+++ b/assets/xml/scenes/overworld/spot20.xml
@@ -1,12 +1,10 @@
 <Root>
-    <File Name="spot20_scene">
-        <Scene Name="spot20_scene">
-        </Scene>
+    <File Name="spot20_scene" Segment="2">
+        <Scene Name="spot20_scene" Offset="0x0"/>
     </File>
-    <File Name="spot20_room_0">
-        <Room Name="spot20_room_0">
-            <DListHint Offset="0x5E50"/>
-            <DListHint Offset="0x66B8"/>
-        </Room>
+    <File Name="spot20_room_0" Segment="3">
+        <DList Name="gSpot20DL_005E50" Offset="0x5E50"/>
+        <DList Name="gSpot20DL_0066B8" Offset="0x66B8"/>
+        <Room Name="spot20_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/shops/alley_shop.xml b/assets/xml/scenes/shops/alley_shop.xml
index 3df0dd011d..449e724081 100644
--- a/assets/xml/scenes/shops/alley_shop.xml
+++ b/assets/xml/scenes/shops/alley_shop.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="alley_shop_scene">
+    <File Name="alley_shop_scene" Segment="2">
         <Scene Name="alley_shop_scene"/>
     </File>
-    <File Name="alley_shop_room_0">
-        <Room Name="alley_shop_room_0"/>
+    <File Name="alley_shop_room_0" Segment="3">
+        <Room Name="alley_shop_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/shops/drag.xml b/assets/xml/scenes/shops/drag.xml
index bb3660cde7..ec4296fec9 100644
--- a/assets/xml/scenes/shops/drag.xml
+++ b/assets/xml/scenes/shops/drag.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="drag_scene">
+    <File Name="drag_scene" Segment="2">
         <Scene Name="drag_scene"/>
     </File>
-    <File Name="drag_room_0">
-        <Room Name="drag_room_0"/>
+    <File Name="drag_room_0" Segment="3">
+        <Room Name="drag_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/shops/face_shop.xml b/assets/xml/scenes/shops/face_shop.xml
index 7eba877318..56ebdfaa2e 100644
--- a/assets/xml/scenes/shops/face_shop.xml
+++ b/assets/xml/scenes/shops/face_shop.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="face_shop_scene">
+    <File Name="face_shop_scene" Segment="2">
         <Scene Name="face_shop_scene"/>
     </File>
-    <File Name="face_shop_room_0">
-        <Room Name="face_shop_room_0"/>
+    <File Name="face_shop_room_0" Segment="3">
+        <Room Name="face_shop_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/shops/golon.xml b/assets/xml/scenes/shops/golon.xml
index 232bfe4e5b..7d7cc373bc 100644
--- a/assets/xml/scenes/shops/golon.xml
+++ b/assets/xml/scenes/shops/golon.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="golon_scene">
+    <File Name="golon_scene" Segment="2">
         <Scene Name="golon_scene"/>
     </File>
-    <File Name="golon_room_0">
-        <Room Name="golon_room_0"/>
+    <File Name="golon_room_0" Segment="3">
+        <Room Name="golon_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/shops/kokiri_shop.xml b/assets/xml/scenes/shops/kokiri_shop.xml
index fe1a4f26f8..98af7796eb 100644
--- a/assets/xml/scenes/shops/kokiri_shop.xml
+++ b/assets/xml/scenes/shops/kokiri_shop.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="kokiri_shop_scene">
+    <File Name="kokiri_shop_scene" Segment="2">
         <Scene Name="kokiri_shop_scene"/>
     </File>
-    <File Name="kokiri_shop_room_0">
-        <Room Name="kokiri_shop_room_0"/>
+    <File Name="kokiri_shop_room_0" Segment="3">
+        <Room Name="kokiri_shop_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/shops/night_shop.xml b/assets/xml/scenes/shops/night_shop.xml
index 0cf376f583..dafb54c938 100644
--- a/assets/xml/scenes/shops/night_shop.xml
+++ b/assets/xml/scenes/shops/night_shop.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="night_shop_scene">
+    <File Name="night_shop_scene" Segment="2">
         <Scene Name="night_shop_scene"/>
     </File>
-    <File Name="night_shop_room_0">
-        <Room Name="night_shop_room_0"/>
+    <File Name="night_shop_room_0" Segment="3">
+        <Room Name="night_shop_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/shops/shop1.xml b/assets/xml/scenes/shops/shop1.xml
index 5506efeb70..34a5f9732a 100644
--- a/assets/xml/scenes/shops/shop1.xml
+++ b/assets/xml/scenes/shops/shop1.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="shop1_scene">
+    <File Name="shop1_scene" Segment="2">
         <Scene Name="shop1_scene"/>
     </File>
-    <File Name="shop1_room_0">
-        <Room Name="shop1_room_0"/>
+    <File Name="shop1_room_0" Segment="3">
+        <Room Name="shop1_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/shops/zoora.xml b/assets/xml/scenes/shops/zoora.xml
index f6996d0ff2..917b34bd10 100644
--- a/assets/xml/scenes/shops/zoora.xml
+++ b/assets/xml/scenes/shops/zoora.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="zoora_scene">
+    <File Name="zoora_scene" Segment="2">
         <Scene Name="zoora_scene"/>
     </File>
-    <File Name="zoora_room_0">
-        <Room Name="zoora_room_0"/>
+    <File Name="zoora_room_0" Segment="3">
+        <Room Name="zoora_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/test_levels/besitu.xml b/assets/xml/scenes/test_levels/besitu.xml
index 6dba6e4db2..d3a7e0f922 100644
--- a/assets/xml/scenes/test_levels/besitu.xml
+++ b/assets/xml/scenes/test_levels/besitu.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="besitu_scene">
+    <File Name="besitu_scene" Segment="2">
         <Scene Name="besitu_scene"/>
     </File>
-    <File Name="besitu_room_0">
-        <Room Name="besitu_room_0"/>
+    <File Name="besitu_room_0" Segment="3">
+        <Room Name="besitu_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/test_levels/depth_test.xml b/assets/xml/scenes/test_levels/depth_test.xml
index ab0ce511bb..71d41f5790 100644
--- a/assets/xml/scenes/test_levels/depth_test.xml
+++ b/assets/xml/scenes/test_levels/depth_test.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="depth_test_scene">
+    <File Name="depth_test_scene" Segment="2">
         <Scene Name="depth_test_scene"/>
     </File>
-    <File Name="depth_test_room_0">
-        <Room Name="depth_test_room_0"/>
+    <File Name="depth_test_room_0" Segment="3">
+        <Room Name="depth_test_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/test_levels/sasatest.xml b/assets/xml/scenes/test_levels/sasatest.xml
index 1ba06f9eb9..507be9b16e 100644
--- a/assets/xml/scenes/test_levels/sasatest.xml
+++ b/assets/xml/scenes/test_levels/sasatest.xml
@@ -1,9 +1,8 @@
 <Root>
-    <File Name="sasatest_scene">
+    <File Name="sasatest_scene" Segment="2">
         <Scene Name="sasatest_scene"/>
     </File>
-    <File Name="sasatest_room_0">
-        <Room Name="sasatest_room_0">
-        </Room>
+    <File Name="sasatest_room_0" Segment="3">
+        <Room Name="sasatest_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/test_levels/sutaru.xml b/assets/xml/scenes/test_levels/sutaru.xml
index f4227fede0..7c3e822d88 100644
--- a/assets/xml/scenes/test_levels/sutaru.xml
+++ b/assets/xml/scenes/test_levels/sutaru.xml
@@ -1,11 +1,8 @@
 <Root>
-    <File Name="sutaru_scene">
-        <Scene Name="sutaru_scene">
-            <BlobHint Offset="0xC4" Size="0x0C"/>
-        </Scene>
+    <File Name="sutaru_scene" Segment="2">
+        <Scene Name="sutaru_scene" Offset="0x0"/>
     </File>
-    <File Name="sutaru_room_0">
-        <Room Name="sutaru_room_0">
-        </Room>
+    <File Name="sutaru_room_0" Segment="3">
+        <Room Name="sutaru_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/test_levels/syotes.xml b/assets/xml/scenes/test_levels/syotes.xml
index c3c24642da..0d0b2340ca 100644
--- a/assets/xml/scenes/test_levels/syotes.xml
+++ b/assets/xml/scenes/test_levels/syotes.xml
@@ -1,10 +1,8 @@
 <Root>
-    <File Name="syotes_scene">
-        <Scene Name="syotes_scene">
-        </Scene>
+    <File Name="syotes_scene" Segment="2">
+        <Scene Name="syotes_scene" Offset="0x0"/>
     </File>
-    <File Name="syotes_room_0">
-        <Room Name="syotes_room_0">
-        </Room>
+    <File Name="syotes_room_0" Segment="3">
+        <Room Name="syotes_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/test_levels/syotes2.xml b/assets/xml/scenes/test_levels/syotes2.xml
index ffe712da1f..2dc61577f3 100644
--- a/assets/xml/scenes/test_levels/syotes2.xml
+++ b/assets/xml/scenes/test_levels/syotes2.xml
@@ -1,10 +1,8 @@
 <Root>
-    <File Name="syotes2_scene">
-        <Scene Name="syotes2_scene">
-        </Scene>
+    <File Name="syotes2_scene" Segment="2">
+        <Scene Name="syotes2_scene" Offset="0x0"/>
     </File>
-    <File Name="syotes2_room_0">
-        <Room Name="syotes2_room_0">
-        </Room>
+    <File Name="syotes2_room_0" Segment="3">
+        <Room Name="syotes2_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/test_levels/test01.xml b/assets/xml/scenes/test_levels/test01.xml
index 39ee077fdd..39179a11dc 100644
--- a/assets/xml/scenes/test_levels/test01.xml
+++ b/assets/xml/scenes/test_levels/test01.xml
@@ -1,8 +1,8 @@
 <Root>
-    <File Name="test01_scene">
+    <File Name="test01_scene" Segment="2">
         <Scene Name="test01_scene"/>
     </File>
-    <File Name="test01_room_0">
-        <Room Name="test01_room_0"/>
+    <File Name="test01_room_0" Segment="3">
+        <Room Name="test01_room_0" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>
diff --git a/assets/xml/scenes/test_levels/testroom.xml b/assets/xml/scenes/test_levels/testroom.xml
index 4a7f99661c..7bb08a785c 100644
--- a/assets/xml/scenes/test_levels/testroom.xml
+++ b/assets/xml/scenes/test_levels/testroom.xml
@@ -1,20 +1,20 @@
 <Root>
-    <File Name="testroom_scene">
+    <File Name="testroom_scene" Segment="2">
         <Scene Name="testroom_scene"/>
     </File>
-    <File Name="testroom_room_0">
-        <Room Name="testroom_room_0"/>
+    <File Name="testroom_room_0" Segment="3">
+        <Room Name="testroom_room_0" Offset="0x0"/>
     </File>
-    <File Name="testroom_room_1">
-        <Room Name="testroom_room_1"/>
+    <File Name="testroom_room_1" Segment="3">
+        <Room Name="testroom_room_1" Offset="0x0"/>
     </File>
-    <File Name="testroom_room_2">
-        <Room Name="testroom_room_2"/>
+    <File Name="testroom_room_2" Segment="3">
+        <Room Name="testroom_room_2" Offset="0x0"/>
     </File>
-    <File Name="testroom_room_3">
-        <Room Name="testroom_room_3"/>
+    <File Name="testroom_room_3" Segment="3">
+        <Room Name="testroom_room_3" Offset="0x0"/>
     </File>
-    <File Name="testroom_room_4">
-        <Room Name="testroom_room_4"/>
+    <File Name="testroom_room_4" Segment="3">
+        <Room Name="testroom_room_4" Offset="0x0"/>
     </File>
-</Root>
\ No newline at end of file
+</Root>