From 6e025588a55ed84b25c7282f058f04b9269f8a6f Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:59:44 -0400
Subject: [PATCH] Fix how the gMtxClear is extracted and used by the Jabu scene
 DLs (#4375)

* fix how the clear mtx is extracted and used by the jabu scene DLs

* bump OTRExporter
---
 OTRExporter                                     | 2 +-
 soh/assets/xml/GC_MQ_D/code/sys_matrix.xml      | 4 ++--
 soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml  | 4 ++--
 soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml     | 4 ++--
 soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml | 4 ++--
 soh/assets/xml/N64_PAL_10/code/sys_matrix.xml   | 4 ++--
 soh/assets/xml/N64_PAL_11/code/sys_matrix.xml   | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/OTRExporter b/OTRExporter
index 2cfdb3960..467f36589 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit 2cfdb3960900ba059f570b2ded2fed3494a96a9b
+Subproject commit 467f36589b0d6fe6c7f9d248945650a459bce768
diff --git a/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml b/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml
index b39033d59..28a2adc4c 100644
--- a/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml
+++ b/soh/assets/xml/GC_MQ_D/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" RangeStart="0x110CC0" RangeEnd="0x110D00">
-        <Mtx Name="gMtxClear"  Offset="0x110CC0"/>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x1CE60" RangeStart="0x110CC0" RangeEnd="0x110D00">
+        <Mtx Name="gMtxClear" Offset="0x110CC0"/>
     </File>
 </Root>
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
index a3fed368b..52e78bcb1 100644
--- a/soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml
+++ b/soh/assets/xml/GC_MQ_PAL_F/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" RangeStart="0xEAD00" RangeEnd="0xEAD40">
-        <Mtx Name="gMtxClear"  Offset="0xEAD00"/>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x10F00" RangeStart="0xEAD00" RangeEnd="0xEAD40">
+        <Mtx Name="gMtxClear" Offset="0xEAD00"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml b/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml
index ed2a859c6..3811322d3 100644
--- a/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml
+++ b/soh/assets/xml/GC_NMQ_D/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" RangeStart="0x110CE0" RangeEnd="0x110D20">
-        <Mtx Name="gMtxClear"  Offset="0x110CE0"/>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x1CE60" RangeStart="0x110CE0" RangeEnd="0x110D20">
+        <Mtx Name="gMtxClear" Offset="0x110CE0"/>
     </File>
 </Root>
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
index d2143f4e4..486cb244d 100644
--- a/soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml
+++ b/soh/assets/xml/GC_NMQ_PAL_F/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" RangeStart="0xEAD20" RangeEnd="0xEAD60">
-        <Mtx Name="gMtxClear"  Offset="0xEAD20"/>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x10F00" RangeStart="0xEAD20" RangeEnd="0xEAD60">
+        <Mtx Name="gMtxClear" Offset="0xEAD20"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml b/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml
index 706c249d4..7877d0bdf 100644
--- a/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml
+++ b/soh/assets/xml/N64_PAL_10/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" RangeStart="0xEB620" RangeEnd="0xEB660">
-        <Mtx Name="gMtxClear"  Offset="0xEB620"/>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x116E0" RangeStart="0xEB620" RangeEnd="0xEB660">
+        <Mtx Name="gMtxClear" Offset="0xEB620"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml b/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml
index 97b57a57c..cee1835e9 100644
--- a/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml
+++ b/soh/assets/xml/N64_PAL_11/code/sys_matrix.xml
@@ -1,5 +1,5 @@
 <Root>
-    <File Name="code" OutName="sys_matrix" RangeStart="0xEB660" RangeEnd="0xEB6A0">
-        <Mtx Name="gMtxClear"  Offset="0xEB660"/>
+    <File Name="code" OutName="sys_matrix" BaseAddress="0x116E0" RangeStart="0xEB660" RangeEnd="0xEB6A0">
+        <Mtx Name="gMtxClear" Offset="0xEB660"/>
     </File>
 </Root>