From b926034d1d4e6770cb63cdd00abe56ed2fc36a81 Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Fri, 17 May 2024 14:22:42 +0200
Subject: [PATCH] Down to 1 regshuffle

---
 config/SOUE01/symbols.txt | 2 +-
 configure.py              | 2 +-
 src/m/m_dvd.cpp           | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index 765a1871..c655e4e2 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -49076,7 +49076,7 @@ s_UncompressInfoRL__4mDvd = .bss:0x805B85F0; // type:object size:0xC data:4byte
 likely_align__4mDvd = .bss:0x805B85FC; // type:object size:0x7A04
 more_empty_space__4mDvd = .bss:0x805C0000; // type:object size:0x1638
 decompressor_alloc_space__4mDvd = .bss:0x805C1638; // type:object size:0x9930
-DVD_MANAGER__4mDvd = .bss:0x805CAF68; // type:object size:0x30
+l_param__4mDvd = .bss:0x805CAF68; // type:object size:0x30
 lbl_805CAF98 = .bss:0x805CAF98; // type:object size:0xC
 @LOCAL@loadToMainRAM__4mDvdFiPcPQ23EGG4HeapQ33EGG9DvdRipper15EAllocDirectionlPUlPUlUl@DvdFile = .bss:0x805CAFA8; // type:object size:0xD0
 g_gameHeaps__5mHeap = .bss:0x805CB078; // type:object size:0x10 data:4byte
diff --git a/configure.py b/configure.py
index 571a23f9..30824191 100644
--- a/configure.py
+++ b/configure.py
@@ -301,7 +301,7 @@ config.libs = [
             Object(Matching, "f/f_list.cpp"),
             Object(Matching, "f/f_manager.cpp"),
             Object(Matching, "m/m_angle.cpp"),
-            Object(Matching, "m/m_dvd.cpp"),
+            Object(NonMatching, "m/m_dvd.cpp"),
             Object(Matching, "m/m_heap.cpp"),
             Object(NonMatching, "m/m_mtx.cpp"),
             # framework (f_name)
diff --git a/src/m/m_dvd.cpp b/src/m/m_dvd.cpp
index fad1585b..48058953 100644
--- a/src/m/m_dvd.cpp
+++ b/src/m/m_dvd.cpp
@@ -25,8 +25,9 @@ char likely_align[0x7A04];
 char more_empty_space[0x1638];
 char decompressor_alloc_space[0x9930];
 
-mDvd_param_c DVD_MANAGER;
+mDvd_param_c l_param;
 
+// unofficial
 TUncompressInfo_Base_c *decompressorPtrs[1] = {
         &s_UncompressInfoLZ,
 };
@@ -38,6 +39,7 @@ void *somePtr;
 u32 someNumber;
 TUncompressInfo_Base_c **compressors_ptr;
 TUncompressInfo_Base_c **compressors_last;
+// official
 OSThread *l_OSThread;
 mDvd::MyThread_c *l_MyThread;
 EGG::Heap *l_CommandHeap;