From b8b65fdf33db2ad598e868a03318fd53621787ce Mon Sep 17 00:00:00 2001
From: robojumper <robojumper@gmail.com>
Date: Fri, 3 May 2024 09:58:23 +0200
Subject: [PATCH] Remove instance from dungeon flag mgr TU

---
 config/SOUE01/splits.txt               | 1 -
 config/SOUE01/symbols.txt              | 2 +-
 configure.py                           | 2 +-
 src/toBeSorted/dungeonflag_manager.cpp | 5 +++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index 79f8f510..afe56b13 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -124,7 +124,6 @@ toBeSorted/bitwise_flag_helper.cpp:
 
 toBeSorted/dungeonflag_manager.cpp:
 	.text       start:0x800BF8D0 end:0x800BFB9C
-	.sbss       start:0x80575404 end:0x80575408
 	.bss        start:0x805A9C58 end:0x805A9C68
 
 toBeSorted/skipflag_manager.cpp:
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index 4fe4a163..1e503497 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -39848,7 +39848,7 @@ sTBoxFlags__15TBoxFlagManager = .sbss:0x805753F4; // type:object size:0x4
 sInstance__18EnemyDefeatManager = .sbss:0x805753F8; // type:object size:0x4 data:4byte
 lbl_805753FC = .sbss:0x805753FC; // type:object size:0x4 data:4byte
 lbl_80575400 = .sbss:0x80575400; // type:object size:0x4 data:4byte
-sInstance__18DungeonflagManager = .sbss:0x80575404; // type:object size:0x4 data:4byte
+lbl_80575404 = .sbss:0x80575404; // type:object size:0x4 data:4byte
 sInstance__15SkipflagManager = .sbss:0x80575408; // type:object size:0x4 data:4byte
 lbl_80575410 = .sbss:0x80575410; // type:object size:0x8 data:4byte
 lbl_80575418 = .sbss:0x80575418; // type:object size:0x8
diff --git a/configure.py b/configure.py
index 0b18234e..103ebb33 100644
--- a/configure.py
+++ b/configure.py
@@ -274,7 +274,7 @@ config.libs = [
             Object(Matching, "toBeSorted/sceneflag_manager.cpp"),
             Object(NonMatching, "toBeSorted/flag_space.cpp"),
             Object(NonMatching, "toBeSorted/misc_flag_managers.cpp"),
-            Object(NonMatching, "toBeSorted/dungeonflag_manager.cpp"),
+            Object(Matching, "toBeSorted/dungeonflag_manager.cpp"),
             Object(Matching, "toBeSorted/skipflag_manager.cpp"),
             Object(Matching, "c/c_list.cpp"),
             Object(Matching, "c/c_tree.cpp"),
diff --git a/src/toBeSorted/dungeonflag_manager.cpp b/src/toBeSorted/dungeonflag_manager.cpp
index cf4410f5..7c4d083a 100644
--- a/src/toBeSorted/dungeonflag_manager.cpp
+++ b/src/toBeSorted/dungeonflag_manager.cpp
@@ -21,7 +21,7 @@ public:
     FlagSpace mFlagSpace;
 
     static u16 sDungeonFlags[8];
-    static DungeonflagManager *sInstance;
+    // static DungeonflagManager *sInstance;
 
     void copyFromSave(s16 flag);
     void copyFromSave(u16 flagIndex);
@@ -41,7 +41,8 @@ public:
 };
 
 /** 80575404 */
-DungeonflagManager *DungeonflagManager::sInstance = nullptr;
+// DungeonflagManager *DungeonflagManager::sInstance = nullptr;
+
 /** 805a9c58 */
 u16 DungeonflagManager::sDungeonFlags[8] = {};