Merge pull request #3 from Rozelette/master

Add lengths for pathway lists
MelonSpeedruns · Feb 3, 2022 · 8c9a00d · 8c9a00d
2 parents 7d932e2 + 37ca0e6
commit 8c9a00d
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 16 deletions.
diff --git a/soh/assets/xml/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/scenes/dungeons/HAKAdanCH.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="HAKAdanCH_scene" Segment="2">
+        <Path Name="HAKAdanCH_scenePathway_000248" Offset="0x248" NumPaths="2"/>
+
         <Scene Name="HAKAdanCH_scene" Offset="0x0"/>
     </File>
     <File Name="HAKAdanCH_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/HIDAN.xml b/soh/assets/xml/scenes/dungeons/HIDAN.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="HIDAN_scene" Segment="2">
+        <Path Name="HIDAN_scenePathway_000440" Offset="0x440" NumPaths="4"/>
+
         <Scene Name="HIDAN_scene" Offset="0x0"/>
     </File>
     <File Name="HIDAN_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/scenes/dungeons/MIZUsin.xml
@@ -2,6 +2,8 @@
     <File Name="MIZUsin_scene" Segment="2">
         <Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14C30"/>
         <Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x15830"/>
+        <Path Name="MIZUsin_scenePathway_000384" Offset="0x384" NumPaths="2"/>
+
         <Scene Name="MIZUsin_scene" Offset="0x0"/>
     </File>
     <File Name="MIZUsin_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/ganon_final.xml b/soh/assets/xml/scenes/dungeons/ganon_final.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="ganon_final_scene" Segment="2">
+        <Path Name="ganon_final_scenePathway_0001F4" Offset="0x1F4" NumPaths="4"/>
+
         <Scene Name="ganon_final_scene" Offset="0x0"/>
     </File>
     <File Name="ganon_final_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/ganon_sonogo.xml b/soh/assets/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="0x254" NumPaths="5"/>
         <Scene Name="ganon_sonogo_scene" Offset="0x0"/>
     </File>
     <File Name="ganon_sonogo_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/ganontika.xml b/soh/assets/xml/scenes/dungeons/ganontika.xml
@@ -16,6 +16,8 @@
         <Cutscene Name="gWaterBarrierCs" Offset="0x1EF70"/>
         <Cutscene Name="gShadowBarrierCs" Offset="0x21380"/>
 
+        <Path Name="ganontika_scenePathway_000668" Offset="0x668" NumPaths="6"/>
+
         <Scene Name="ganontika_scene" Offset="0x0"/>
     </File>
     <File Name="ganontika_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/scenes/dungeons/ganontikasonogo.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="ganontikasonogo_scene" Segment="2">
+        <Path Name="ganontikasonogo_scenePathway_000184" Offset="0x184" NumPaths="2"/>
+
         <Scene Name="ganontikasonogo_scene" Offset="0x0"/>
     </File>
     <File Name="ganontikasonogo_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/gerudoway.xml b/soh/assets/xml/scenes/dungeons/gerudoway.xml
@@ -2,6 +2,8 @@
     <File Name="gerudoway_scene" Segment="2">
         <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"/>
+        <Path Name="gerudoway_scenePathway_0002AC" Offset="0x2AC" NumPaths="4"/>
+
         <Scene Name="gerudoway_scene" Offset="0x0"/>
     </File>
     <File Name="gerudoway_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/scenes/dungeons/ice_doukutu.xml
@@ -3,6 +3,8 @@
         <Cutscene Name="gIceCavernSerenadeCs" Offset="0x330"/>
         <Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF8C0"/>
         <Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xFAC0"/>
+        <Path Name="ice_doukutu_scenePathway_000304" Offset="0x304" NumPaths="5"/>
+
         <Scene Name="ice_doukutu_scene" Offset="0x0"/>
     </File>
     <File Name="ice_doukutu_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/scenes/dungeons/jyasinzou.xml
@@ -2,6 +2,8 @@
     <File Name="jyasinzou_scene" Segment="2">
         <Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18920"/>
         <Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18020"/>
+        <Path Name="jyasinzou_scenePathway_00049C" Offset="0x49C" NumPaths="5"/>
+
         <Scene Name="jyasinzou_scene" Offset="0x0"/>
     </File>
     <File Name="jyasinzou_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/scenes/indoors/hairal_niwa.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="hairal_niwa_scene" Segment="2">
+        <Path Name="hairal_niwa_scenePathway_000268" Offset="0x268" NumPaths="8"/>
+
         <Scene Name="hairal_niwa_scene" Offset="0x0"/>
     </File>
     <File Name="hairal_niwa_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/misc/market_alley_n.xml b/soh/assets/xml/scenes/misc/market_alley_n.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="market_alley_n_scene" Segment="2">
+        <Path Name="market_alley_n_scenePathway_00019C" Offset="0x19C" NumPaths="3"/>
+
         <Scene Name="market_alley_n_scene" Offset="0x0"/>
     </File>
     <File Name="market_alley_n_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/misc/market_day.xml b/soh/assets/xml/scenes/misc/market_day.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="market_day_scene" Segment="2">
+        <Path Name="market_day_scenePathway_000330" Offset="0x330" NumPaths="4"/>
+
         <Scene Name="market_day_scene" Offset="0x0"/>
     </File>
     <File Name="market_day_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/misc/market_night.xml b/soh/assets/xml/scenes/misc/market_night.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="market_night_scene" Segment="2">
+        <Path Name="market_night_scenePathway_0002FC" Offset="0x2FC" NumPaths="7"/>
+
         <Scene Name="market_night_scene" Offset="0x0"/>
     </File>
     <File Name="market_night_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/misc/shrine_n.xml b/soh/assets/xml/scenes/misc/shrine_n.xml
@@ -1,5 +1,7 @@
 <Root>
     <File Name="shrine_n_scene" Segment="2">
+        <Path Name="shrine_n_scenePathway_000100" Offset="0x100" NumPaths="2"/>
+
         <Scene Name="shrine_n_scene" Offset="0x0"/>
     </File>
     <File Name="shrine_n_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/overworld/spot03.xml b/soh/assets/xml/scenes/overworld/spot03.xml
@@ -1,9 +1,7 @@
 <Root>
     <File Name="spot03_scene" Segment="2">
-      <Path Name="gSpot03Path_0002BC" Offset="0x2BC" NumPaths="2"/>
-      <!--<Path Name="gSpot03Path_0002C4" Offset="0x2C4" NumPaths="1"/>
-        <Path Name="gSpot03Path_006910" Offset="0x6910"/>
-        <Path Name="gSpot03Path_006918" Offset="0x6918"/>-->
+        <Path Name="spot03_scenePathway_0002BC" Offset="0x2BC" NumPaths="2"/>
+        <Path Name="spot03_scenePathway_006908" Offset="0x6908" NumPaths="3"/>
 
         <Scene Name="spot03_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/scenes/overworld/spot04.xml b/soh/assets/xml/scenes/overworld/spot04.xml
@@ -1,8 +1,7 @@
 <Root>
     <File Name="spot04_scene" Segment="2">
         <Path Name="gSpot04Path_00030C" Offset="0x30C" NumPaths="3"/>
-        <!-- <Path Name="gSpot04Path_00031C" Offset="0x31C"/> -->
-        <Path Name="gSpot04Path_00D730" Offset="0xD730"/>
+        <Path Name="gSpot04Path_00D728" Offset="0xD728" NumPaths="2"/>
         <Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
         <Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
 

diff --git a/soh/assets/xml/scenes/overworld/spot05.xml b/soh/assets/xml/scenes/overworld/spot05.xml
@@ -4,11 +4,7 @@
 
         <Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
 
-        <Path Name="gSpot05Path_0069D8" Offset="0x69D8"/>
-        <Path Name="gSpot05Path_0069E0" Offset="0x69E0"/>
-        <Path Name="gSpot05Path_0069E8" Offset="0x69E8"/>
-        <Path Name="gSpot05Path_0069F0" Offset="0x69F0"/>
-        <Path Name="gSpot05Path_0069F8" Offset="0x69F8"/>
+        <Path Name="spot05_scenePathway_0069D8" Offset="0x69D8" NumPaths="5"/>
 
         <Scene Name="spot05_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/scenes/overworld/spot06.xml b/soh/assets/xml/scenes/overworld/spot06.xml
@@ -2,7 +2,7 @@
     <File Name="spot06_scene" Segment="2">
         <Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
         <Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
-        <Path Name="gSpot06Path_00776C" Offset="0x776C"/>
+        <Path Name="gSpot06Path_007764" Offset="0x7764" NumPaths="2"/>
         <Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
         <Scene Name="spot06_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/scenes/overworld/spot07.xml b/soh/assets/xml/scenes/overworld/spot07.xml
@@ -3,6 +3,7 @@
         <Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
         <Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
         <Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
+        <Path Name="spot07_scenePathway_000234" Offset="0x234" NumPaths="2"/>
         <Scene Name="spot07_scene" Offset="0x0"/>
     </File>
     <File Name="spot07_room_0" Segment="3">

diff --git a/soh/assets/xml/scenes/overworld/spot09.xml b/soh/assets/xml/scenes/overworld/spot09.xml
@@ -3,8 +3,8 @@
         <Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
         <Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
         <Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
-        <Path Name="gSpot09Path_002F60" Offset="0x2F60"/>
-        <Path Name="gSpot09Path_002F68" Offset="0x2F68"/>
+
+        <Path Name="spot09_scenePathway_002F58" Offset="0x2F58" NumPaths="3"/>
 
         <Scene Name="spot09_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/scenes/overworld/spot10.xml b/soh/assets/xml/scenes/overworld/spot10.xml
@@ -1,7 +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>

diff --git a/soh/assets/xml/scenes/overworld/spot16.xml b/soh/assets/xml/scenes/overworld/spot16.xml
@@ -2,6 +2,8 @@
     <File Name="spot16_scene" Segment="2">
         <Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
         <Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
+        <Path Name="spot16_scenePathway_000254" Offset="0x254" NumPaths="2"/>
+        <Path Name="spot16_scenePathway_007884" Offset="0x7884" NumPaths="3"/>
         <Scene Name="spot16_scene" Offset="0x0"/>
         <Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
     </File>

diff --git a/soh/assets/xml/scenes/overworld/spot20.xml b/soh/assets/xml/scenes/overworld/spot20.xml
@@ -3,6 +3,7 @@
         <Cutscene Name="gLonLonRanchIntroCs" Offset="0x5BD0"/>
         <Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x81E0"/>
         <Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFBE0"/>
+        <Path Name="spot20_scenePathway_005844" Offset="0x5844" NumPaths="2"/>
         <Scene Name="spot20_scene" Offset="0x0"/>
     </File>
     <File Name="spot20_room_0" Segment="3">