From 1f1651d6ba37d83b03c30a4b505853200f7d8a71 Mon Sep 17 00:00:00 2001
From: Blake Warner <blake@null3d.com>
Date: Sun, 20 Feb 2022 15:52:23 -0500
Subject: [PATCH] fixed some more retail XMLs

---
 roms/PAL_1.0/xml/scenes/dungeons/HIDAN.xml           | 1 +
 roms/PAL_1.0/xml/scenes/dungeons/ganon_final.xml     | 1 +
 roms/PAL_1.0/xml/scenes/dungeons/ganon_sonogo.xml    | 1 +
 roms/PAL_1.0/xml/scenes/dungeons/ganontika.xml       | 1 +
 roms/PAL_1.0/xml/scenes/dungeons/ganontikasonogo.xml | 1 +
 roms/PAL_1.0/xml/scenes/dungeons/gerudoway.xml       | 1 +
 roms/PAL_1.0/xml/scenes/dungeons/jyasinzou.xml       | 1 +
 roms/PAL_1.0/xml/scenes/overworld/spot03.xml         | 6 ++----
 roms/PAL_1.0/xml/scenes/overworld/spot04.xml         | 5 ++---
 roms/PAL_1.0/xml/scenes/overworld/spot06.xml         | 2 +-
 roms/PAL_1.0/xml/scenes/overworld/spot09.xml         | 3 +--
 roms/PAL_1.0/xml/scenes/overworld/spot10.xml         | 4 +---
 12 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/roms/PAL_1.0/xml/scenes/dungeons/HIDAN.xml b/roms/PAL_1.0/xml/scenes/dungeons/HIDAN.xml
index 84f4a5d90..b445c782b 100644
--- a/roms/PAL_1.0/xml/scenes/dungeons/HIDAN.xml
+++ b/roms/PAL_1.0/xml/scenes/dungeons/HIDAN.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="HIDAN_scene" Segment="2">
+        <Path Name="HIDAN_scenePathway_000558" Offset="0x0558" NumPaths="19"/>
         <Scene Name="HIDAN_scene" Offset="0x0"/>
     </File>
     <File Name="HIDAN_room_0" Segment="3">
diff --git a/roms/PAL_1.0/xml/scenes/dungeons/ganon_final.xml b/roms/PAL_1.0/xml/scenes/dungeons/ganon_final.xml
index 63b5f9172..e5ed114ca 100644
--- a/roms/PAL_1.0/xml/scenes/dungeons/ganon_final.xml
+++ b/roms/PAL_1.0/xml/scenes/dungeons/ganon_final.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="ganon_final_scene" Segment="2">
+        <Path Name="ganon_final_scenePathway_0001F4" Offset="0x01F4" NumPaths="6"/>
         <Scene Name="ganon_final_scene" Offset="0x0"/>
     </File>
     <File Name="ganon_final_room_0" Segment="3">
diff --git a/roms/PAL_1.0/xml/scenes/dungeons/ganon_sonogo.xml b/roms/PAL_1.0/xml/scenes/dungeons/ganon_sonogo.xml
index 4ede85b4e..463662dd5 100644
--- a/roms/PAL_1.0/xml/scenes/dungeons/ganon_sonogo.xml
+++ b/roms/PAL_1.0/xml/scenes/dungeons/ganon_sonogo.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="ganon_sonogo_scene" Segment="2">
+        <Path Name="ganon_sonogo_scenePathway_000254" Offset="0x0254" NumPaths="5"/>
         <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
     </File>
     <File Name="ganon_sonogo_room_0" Segment="3">
diff --git a/roms/PAL_1.0/xml/scenes/dungeons/ganontika.xml b/roms/PAL_1.0/xml/scenes/dungeons/ganontika.xml
index 34babb5be..b9e368a21 100644
--- a/roms/PAL_1.0/xml/scenes/dungeons/ganontika.xml
+++ b/roms/PAL_1.0/xml/scenes/dungeons/ganontika.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="ganontika_scene" Segment="2">
+        <Path Name="ganontika_scenePathway_000674" Offset="0x0674" NumPaths="3"/>
         <Cutscene Name="gForestTrialSageCs" Offset="0x19ED0"/>
         <Cutscene Name="gWaterTrialSageCs" Offset="0x1A8D0"/>
         <Cutscene Name="gShadowTrialSageCs" Offset="0x1B2A0"/>
diff --git a/roms/PAL_1.0/xml/scenes/dungeons/ganontikasonogo.xml b/roms/PAL_1.0/xml/scenes/dungeons/ganontikasonogo.xml
index 853fbde15..8eef779cb 100644
--- a/roms/PAL_1.0/xml/scenes/dungeons/ganontikasonogo.xml
+++ b/roms/PAL_1.0/xml/scenes/dungeons/ganontikasonogo.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="ganontikasonogo_scene" Segment="2">
+        <Path Name="ganontikasonogo_scenePathway_000184" Offset="0x0184" NumPaths="2"/>
         <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
     </File>
     <File Name="ganontikasonogo_room_0" Segment="3">
diff --git a/roms/PAL_1.0/xml/scenes/dungeons/gerudoway.xml b/roms/PAL_1.0/xml/scenes/dungeons/gerudoway.xml
index 3a77c8ded..a1a5b1893 100644
--- a/roms/PAL_1.0/xml/scenes/dungeons/gerudoway.xml
+++ b/roms/PAL_1.0/xml/scenes/dungeons/gerudoway.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="gerudoway_scene" Segment="2">
+        <Path Name="gerudoway_scenePathway_0002AC" Offset="0x02AC" NumPaths="4"/>
         <Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
         <Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
         <Scene Name="gerudoway_scene" Offset="0x0"/>
diff --git a/roms/PAL_1.0/xml/scenes/dungeons/jyasinzou.xml b/roms/PAL_1.0/xml/scenes/dungeons/jyasinzou.xml
index f75a3621a..a53b3bcd1 100644
--- a/roms/PAL_1.0/xml/scenes/dungeons/jyasinzou.xml
+++ b/roms/PAL_1.0/xml/scenes/dungeons/jyasinzou.xml
@@ -1,5 +1,6 @@
 <Root>
     <File Name="jyasinzou_scene" Segment="2">
+        <Path Name="jyasinzou_scenePathway_0004C0" Offset="0x04C0" NumPaths="6"/>
         <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18940"/>
         <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18040"/>
         <Scene Name="jyasinzou_scene" Offset="0x0"/>
diff --git a/roms/PAL_1.0/xml/scenes/overworld/spot03.xml b/roms/PAL_1.0/xml/scenes/overworld/spot03.xml
index cea3bc8a1..fb5e9b751 100644
--- a/roms/PAL_1.0/xml/scenes/overworld/spot03.xml
+++ b/roms/PAL_1.0/xml/scenes/overworld/spot03.xml
@@ -1,9 +1,7 @@
 <Root>
     <File Name="spot03_scene" Segment="2">
-        <Path Name="gSpot03Path_0002C4" Offset="0x2C4"/>
-        <Path Name="gSpot03Path_006910" Offset="0x6910"/>
-        <Path Name="gSpot03Path_006918" Offset="0x6918"/>
-
+        <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2" />
+        <Path Name="gSpot03Path_006908" Offset="0x6908" NumPaths="3" />
         <Scene Name="spot03_scene" Offset="0x0"/>
     </File>
     <File Name="spot03_room_0" Segment="3">
diff --git a/roms/PAL_1.0/xml/scenes/overworld/spot04.xml b/roms/PAL_1.0/xml/scenes/overworld/spot04.xml
index 692255b48..8821f0ef5 100644
--- a/roms/PAL_1.0/xml/scenes/overworld/spot04.xml
+++ b/roms/PAL_1.0/xml/scenes/overworld/spot04.xml
@@ -1,8 +1,7 @@
 <Root>
     <File Name="spot04_scene" Segment="2">
-        <Path Name="gSpot04Path_000314" Offset="0x314"/>
-        <Path Name="gSpot04Path_00031C" Offset="0x31C"/>
-        <Path Name="gSpot04Path_00D730" Offset="0xD760"/>
+        <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3" />
+        <Path Name="gSpot04Path_00D758" Offset="0xD758" NumPaths="2" />
         <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xCA00"/>
         <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E50"/>
 
diff --git a/roms/PAL_1.0/xml/scenes/overworld/spot06.xml b/roms/PAL_1.0/xml/scenes/overworld/spot06.xml
index 51fc842ea..38c8e0eaf 100644
--- a/roms/PAL_1.0/xml/scenes/overworld/spot06.xml
+++ b/roms/PAL_1.0/xml/scenes/overworld/spot06.xml
@@ -2,7 +2,7 @@
     <File Name="spot06_scene" Segment="2">
         <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7030"/>
         <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0D0"/>
-        <Path Name="gSpot06Path_00776C" Offset="0x777C"/>
+        <Path Name="spot06_scenePathway_007774" Offset="0x7774" NumPaths="2" />
         <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A40"/>
         <Scene Name="spot06_scene" Offset="0x0"/>
     </File>
diff --git a/roms/PAL_1.0/xml/scenes/overworld/spot09.xml b/roms/PAL_1.0/xml/scenes/overworld/spot09.xml
index 804cd47c3..2407c6212 100644
--- a/roms/PAL_1.0/xml/scenes/overworld/spot09.xml
+++ b/roms/PAL_1.0/xml/scenes/overworld/spot09.xml
@@ -3,8 +3,7 @@
         <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AF0"/>
         <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
         <Cutscene Name="gGerudoValleyIntroCs" Offset="0x3210"/>
-        <Path Name="gSpot09Path_002F60" Offset="0x2F90"/>
-        <Path Name="gSpot09Path_002F68" Offset="0x2F98"/>
+        <Path Name="gSpot09Path_002F88" Offset="0x2F88" NumPaths="3" />
 
         <Scene Name="spot09_scene" Offset="0x0"/>
     </File>
diff --git a/roms/PAL_1.0/xml/scenes/overworld/spot10.xml b/roms/PAL_1.0/xml/scenes/overworld/spot10.xml
index 9ae2c61e2..06349cf1e 100644
--- a/roms/PAL_1.0/xml/scenes/overworld/spot10.xml
+++ b/roms/PAL_1.0/xml/scenes/overworld/spot10.xml
@@ -1,8 +1,6 @@
 <Root>
     <File Name="spot10_scene" Segment="2">
-        <Path Name="gSpot10Path_00C088" Offset="0xC088"/>
-        <Path Name="gSpot10Path_00C090" Offset="0xC090"/>
-
+        <Path Name="gSpot10Path_00C080" Offset="0xC080" NumPaths="3"/>
         <Scene Name="spot10_scene" Offset="0x0"/>
     </File>
     <File Name="spot10_room_0" Segment="3">