From 38bccb2de141a40957e736648a2d5898a9340946 Mon Sep 17 00:00:00 2001
From: cadmic <cadmic24@gmail.com>
Date: Wed, 19 Jun 2024 20:23:42 -0700
Subject: [PATCH] Reorganize ZAPD configs

---
 extract_assets.py                                        | 2 +-
 .../{MqDbg/ActorList_OoTMqDbg.txt => ActorList.txt}      | 0
 .../EntranceList_OoTMqDbg.txt => EntranceList.txt}       | 0
 tools/ZAPDConfigs/{MqDbg => }/EnumData.xml               | 0
 tools/ZAPDConfigs/MqDbg/Config.xml                       | 9 ---------
 .../{MqDbg/ObjectList_OoTMqDbg.txt => ObjectList.txt}    | 0
 ...EntranceList_OoTMqDbg.txt => SpecialEntranceList.txt} | 0
 tools/ZAPDConfigs/gc-eu-mq-dbg/Config.xml                | 9 +++++++++
 .../SymbolMap.txt}                                       | 0
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename tools/ZAPDConfigs/{MqDbg/ActorList_OoTMqDbg.txt => ActorList.txt} (100%)
 rename tools/ZAPDConfigs/{MqDbg/EntranceList_OoTMqDbg.txt => EntranceList.txt} (100%)
 rename tools/ZAPDConfigs/{MqDbg => }/EnumData.xml (100%)
 delete mode 100644 tools/ZAPDConfigs/MqDbg/Config.xml
 rename tools/ZAPDConfigs/{MqDbg/ObjectList_OoTMqDbg.txt => ObjectList.txt} (100%)
 rename tools/ZAPDConfigs/{MqDbg/SpecialEntranceList_OoTMqDbg.txt => SpecialEntranceList.txt} (100%)
 create mode 100644 tools/ZAPDConfigs/gc-eu-mq-dbg/Config.xml
 rename tools/ZAPDConfigs/{MqDbg/SymbolMap_OoTMqDbg.txt => gc-eu-mq-dbg/SymbolMap.txt} (100%)

diff --git a/extract_assets.py b/extract_assets.py
index 8c92bc9118..1acb4e112c 100755
--- a/extract_assets.py
+++ b/extract_assets.py
@@ -27,7 +27,7 @@ def ExtractFile(assetConfig, outputPath, outputSourcePath):
         return
 
     zapdPath = Path("tools") / "ZAPD" / "ZAPD.out"
-    configPath = Path("tools") / "ZAPDConfigs" / "MqDbg" / "Config.xml"
+    configPath = Path("tools") / "ZAPDConfigs" / version / "Config.xml"
 
     Path(outputPath).mkdir(parents=True, exist_ok=True)
     Path(outputSourcePath).mkdir(parents=True, exist_ok=True)
diff --git a/tools/ZAPDConfigs/MqDbg/ActorList_OoTMqDbg.txt b/tools/ZAPDConfigs/ActorList.txt
similarity index 100%
rename from tools/ZAPDConfigs/MqDbg/ActorList_OoTMqDbg.txt
rename to tools/ZAPDConfigs/ActorList.txt
diff --git a/tools/ZAPDConfigs/MqDbg/EntranceList_OoTMqDbg.txt b/tools/ZAPDConfigs/EntranceList.txt
similarity index 100%
rename from tools/ZAPDConfigs/MqDbg/EntranceList_OoTMqDbg.txt
rename to tools/ZAPDConfigs/EntranceList.txt
diff --git a/tools/ZAPDConfigs/MqDbg/EnumData.xml b/tools/ZAPDConfigs/EnumData.xml
similarity index 100%
rename from tools/ZAPDConfigs/MqDbg/EnumData.xml
rename to tools/ZAPDConfigs/EnumData.xml
diff --git a/tools/ZAPDConfigs/MqDbg/Config.xml b/tools/ZAPDConfigs/MqDbg/Config.xml
deleted file mode 100644
index f9660f90b2..0000000000
--- a/tools/ZAPDConfigs/MqDbg/Config.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Root>
-    <SymbolMap File="SymbolMap_OoTMqDbg.txt"/>
-    <ActorList File="ActorList_OoTMqDbg.txt"/>
-    <ObjectList File="ObjectList_OoTMqDbg.txt"/>
-    <EntranceList File="EntranceList_OoTMqDbg.txt"/>
-    <SpecialEntranceList File="SpecialEntranceList_OoTMqDbg.txt"/>
-    <EnumData File="EnumData.xml"/>
-    <ExternalXMLFolder Path="assets/xml/"/>
-</Root>
diff --git a/tools/ZAPDConfigs/MqDbg/ObjectList_OoTMqDbg.txt b/tools/ZAPDConfigs/ObjectList.txt
similarity index 100%
rename from tools/ZAPDConfigs/MqDbg/ObjectList_OoTMqDbg.txt
rename to tools/ZAPDConfigs/ObjectList.txt
diff --git a/tools/ZAPDConfigs/MqDbg/SpecialEntranceList_OoTMqDbg.txt b/tools/ZAPDConfigs/SpecialEntranceList.txt
similarity index 100%
rename from tools/ZAPDConfigs/MqDbg/SpecialEntranceList_OoTMqDbg.txt
rename to tools/ZAPDConfigs/SpecialEntranceList.txt
diff --git a/tools/ZAPDConfigs/gc-eu-mq-dbg/Config.xml b/tools/ZAPDConfigs/gc-eu-mq-dbg/Config.xml
new file mode 100644
index 0000000000..9960b22de5
--- /dev/null
+++ b/tools/ZAPDConfigs/gc-eu-mq-dbg/Config.xml
@@ -0,0 +1,9 @@
+<Root>
+    <SymbolMap File="SymbolMap.txt"/>
+    <ActorList File="../ActorList.txt"/>
+    <ObjectList File="../ObjectList.txt"/>
+    <EntranceList File="../EntranceList.txt"/>
+    <SpecialEntranceList File="../SpecialEntranceList.txt"/>
+    <EnumData File="../EnumData.xml"/>
+    <ExternalXMLFolder Path="assets/xml/"/>
+</Root>
diff --git a/tools/ZAPDConfigs/MqDbg/SymbolMap_OoTMqDbg.txt b/tools/ZAPDConfigs/gc-eu-mq-dbg/SymbolMap.txt
similarity index 100%
rename from tools/ZAPDConfigs/MqDbg/SymbolMap_OoTMqDbg.txt
rename to tools/ZAPDConfigs/gc-eu-mq-dbg/SymbolMap.txt