Merge remote-tracking branch 'origin/develop' into develop_wiiu

HarbourMasters · Jun 3, 2024 · 397bd32 · 397bd32
2 parents 55a46f7 + 736dccb
commit 397bd32
Show file tree

Hide file tree

Showing 29 changed files with 211 additions and 144 deletions.
diff --git a/CMake/lus-cvars.cmake b/CMake/lus-cvars.cmake
@@ -16,7 +16,6 @@ set(CVAR_STATS_WINDOW_OPEN "${CVAR_PREFIX_WINDOW}.Stats" CACHE STRING "")
 set(CVAR_ENABLE_MULTI_VIEWPORTS "${CVAR_PREFIX_SETTING}.EnableMultiViewports" CACHE STRING "")
 set(CVAR_LOW_RES_MODE "${CVAR_PREFIX_SETTING}.LowResMode" CACHE STRING "")
 set(CVAR_SIMULATED_INPUT_LAG "${CVAR_PREFIX_SETTING}.SimulatedInputLag" CACHE STRING "")
-set(CVAR_ALT_ASSETS "${CVAR_PREFIX_ENHANCEMENT}.AltAssets" CACHE STRING "")
 set(CVAR_GAME_OVERLAY_FONT "${CVAR_PREFIX_SETTING}.OverlayFont" CACHE STRING "")
 set(CVAR_MENU_BAR_OPEN "${CVAR_PREFIX_SETTING}.OpenMenuBar" CACHE STRING "")
 set(CVAR_PREFIX_CONTROLLERS "${CVAR_PREFIX_SETTING}.Controllers" CACHE STRING "")

diff --git a/libultraship b/libultraship
diff --git a/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml b/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" RangeStart="0x110CC0" RangeEnd="0x110D00">
+        <Mtx Name="gMtxClear"  Offset="0x110CC0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_scene" Segment="2">
         <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13E00" TlutOffset="0x13BF8" AddedByScript="true"/>
         <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x14600" TlutOffset="0x13BF8" AddedByScript="true"/>

diff --git a/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_MQ_D/scenes/dungeons/bdan_boss.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_boss_scene" Segment="2">
         <Scene Name="bdan_boss_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml b/soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" RangeStart="0xEAD00" RangeEnd="0xEAD40">
+        <Mtx Name="gMtxClear"  Offset="0xEAD00"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_MQ_PAL_F/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_MQ_PAL_F/scenes/dungeons/bdan.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_scene" Segment="2">
         <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13E00" TlutOffset="0x13BF8" AddedByScript="true"/>
         <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x14600" TlutOffset="0x13BF8" AddedByScript="true"/>

diff --git a/soh/assets/xml/GC_MQ_PAL_F/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_MQ_PAL_F/scenes/dungeons/bdan_boss.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_boss_scene" Segment="2">
         <Scene Name="bdan_boss_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml b/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" RangeStart="0x110CE0" RangeEnd="0x110D20">
+        <Mtx Name="gMtxClear"  Offset="0x110CE0"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_scene" Segment="2">
         <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
         <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>

diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/bdan_boss.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_boss_scene" Segment="2">
         <Scene Name="bdan_boss_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml b/soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" RangeStart="0xEAD20" RangeEnd="0xEAD60">
+        <Mtx Name="gMtxClear"  Offset="0xEAD20"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_scene" Segment="2">
         <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
         <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>

diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/bdan_boss.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_boss_scene" Segment="2">
         <Scene Name="bdan_boss_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml b/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" RangeStart="0xEB620" RangeEnd="0xEB660">
+        <Mtx Name="gMtxClear"  Offset="0xEB620"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_scene" Segment="2">
         <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
         <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>

diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_boss_scene" Segment="2">
         <Scene Name="bdan_boss_scene" Offset="0x0"/>
     </File>

diff --git a/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml b/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml
@@ -0,0 +1,5 @@
+<Root>
+    <File Name="code" OutName="sys_matrix" RangeStart="0xEB660" RangeEnd="0xEB6A0">
+        <Mtx Name="gMtxClear"  Offset="0xEB660"/>
+    </File>
+</Root>
diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_scene" Segment="2">
         <Texture Name="bdan_sceneTex_013E00" OutName="bdan_sceneTex_013E00" Format="ci8" Width="32" Height="64" Offset="0x13DE0" TlutOffset="0x13BD8" AddedByScript="true"/>
         <Texture Name="bdan_sceneTex_014600" OutName="bdan_sceneTex_014600" Format="ci8" Width="32" Height="32" Offset="0x145E0" TlutOffset="0x13BD8" AddedByScript="true"/>

diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/bdan_boss.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="code/sys_matrix.xml" OutPath="code/sys_matrix/"/>
     <File Name="bdan_boss_scene" Segment="2">
         <Scene Name="bdan_boss_scene" Offset="0x0"/>
     </File>