merge upstream/master

2025-08-22 14:23:44 -07:00 · 2022-05-02 00:19:14 +09:00 · 2022-05-02 00:19:14 +09:00 · edc20b637d
commit edc20b637d
parent 31dcd86d43 73194eee14
1290 changed files with 34599 additions and 2170 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,403 @@
+# Cache files
+__pycache__/
+.pyc
+.DS_Store
+
+# Text editor remnants
+.vscode/
+.vs/
+.idea/
+CMakeLists.txt
+cmake-build-debug
+venv/
+
+# Project-specific ignores
+build/
+expected/
+notes/
+baserom/
+docs/doxygen/
+*.elf
+*.sra
+*.z64
+*.n64
+*.v64
+*.map
+*.dump
+out.txt
+
+# Tool artifacts
+tools/mipspro7.2_compiler/
+tools/overlayhelpers/batchdisasm/output/*
+tools/overlayhelpers/batchdisasm/output2/*
+tools/overlayhelpers/batchdisasm/mipsdisasm/*
+tools/disasm/output/*
+tools/asmsplitter/asm/*
+tools/asmsplitter/c/*
+ctx.c
+tools/*dSYM/
+graphs/
+
+# Assets
+*.png
+*.jpg
+*.mdli
+*.anmi
+*.obj
+*.mtl
+*.fbx
+!*_custom*
+.extracted-assets.json
+
+# Docs
+!docs/tutorial/
+
+# Per-user configuration
+.python-version
+
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+*.out
+*.o
+*.d
+lib/libgfxd/libgfxd.a
+ExporterTest/ExporterTest.a
+ZAPDUtils/ZAPDUtils.a
+.vscode/
+build/
+external/
+ZAPDUtils/build/
+ZAPD/BuildInfo.h
+
+DebugObj/*
+ReleaseObj/*
--- a/BUILDING.md
+++ b/BUILDING.md
@ -0,0 +1,53 @@
+# Building Ship of Harkinian
+
+## Windows
+
+ 1. Install [Python](https://www.python.org/ftp/python/3.10.2/python-3.10.2-amd64.exe)
+ 2. Install [Visual Studio 2022 Community Edition](https://visualstudio.microsoft.com/vs/community/)
+ 2b. In the Visual Studio Installer, install `MSVC v142 - VS 2019 C++`.
+ 4. Clone the Ship of Harkinian repository.
+ 5. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice.
+ 6. Run `OTRExporter/OTRExporter.sln`.
+ 7. Switch the solution to `Release x64`.
+ 8. Build the solution.
+ 9. Launching `OTRExporter/extract_assets.py` will generate an `oot.otr` archive file in `OTRExporter/oot.otr`.
+ 10. Run `soh/soh.sln`
+ 11. Switch the solution to `Release x86`.
+ 12. Build the solution.
+ 13. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
+ 14. Launch `soh.exe`.
+
+## Linux
+
+```bash
+# Clone the repo
+git clone git@github.com:HarbourMasters/ShipWright.git
+cd ShipWright
+# Copy the baserom to the soh folder
+cp .../baserom_non_mq.z64 soh
+# Build the docker image
+sudo docker build . -t soh
+# Run the docker image with the working directory mounted to /soh
+sudo docker run --rm -it -v $(pwd):/soh soh /bin/bash
+```
+Inside the Docker container:
+```bash
+# Clone and build StormLib
+git clone https://github.com/ladislav-zezula/StormLib external/StormLib
+cmake -B external/StormLib/build -S external/StormLib
+cmake --build external/StormLib/build
+cp external/StormLib/build/libstorm.a external
+cp /usr/local/lib/libGLEW.a external
+
+cd soh
+# Extract the assets/Compile the exporter/Run the exporter
+make setup -j$(nproc)
+# Compile the code
+make -j $(nproc)
+```
+
+# Compatible Roms
+```
+OOT_PAL_GC      checksum 0x09465AC3
+OOT_PAL_GC_DBG1 checksum 0x871E1C92 (debug non-master quest)
+```
--- a/3
+++ b/3
@ -12,7 +12,7 @@ RUN dpkg --add-architecture i386 && \
        binutils:i386 \
        gcc-10:i386 \
        g++-10:i386 \
-        python3 \
+        python3.10 \
        python \
        make \
        cmake \
@ -23,6 +23,7 @@ RUN dpkg --add-architecture i386 && \
        libbz2-dev:i386 \
        libpng-dev:i386 \
        libgles2-mesa-dev && \
+    ln -s /usr/bin/python3.10 /usr/bin/python3.10 \
    ln -s /usr/bin/gcc-10 /usr/bin/gcc && \
    ln -s /usr/bin/gcc-10 /usr/bin/cc && \
    ln -s /usr/bin/g++-10 /usr/bin/g++ && \
--- a/OTRExporter/.gitignore
+++ b/OTRExporter/.gitignore
@ -345,6 +345,8 @@ baserom/
 *.otr
 *.swp
 *.a
+*.z64
+*.n64
 Extract/

 tmp.txt
--- a/OTRExporter/CFG/Config.xml
+++ b/OTRExporter/CFG/Config.xml
@ -2,7 +2,7 @@
    <SymbolMap File="SymbolMap_OoTMqDbg.txt"/>
    <ActorList File="ActorList_OoTMqDbg.txt"/>
    <ObjectList File="ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="../soh/assets/xml/"/>
+    <ExternalXMLFolder Path="../soh/assets/xml/GC_NMQ_PAL_F/"/>
 	<TexturePool File="TexturePool.xml"/>
    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>
--- a/OTRExporter/CFG/filelists/dbg.txt
+++ b/OTRExporter/CFG/filelists/dbg.txt
--- a/OTRExporter/CFG/filelists/gamecube.txt
+++ b/OTRExporter/CFG/filelists/gamecube.txt
--- a/OTRExporter/CFG/filelists/gamecube_pal.txt
+++ b/OTRExporter/CFG/filelists/gamecube_pal.txt
--- a/OTRExporter/OTRExporter/DisplayListExporter.cpp
+++ b/OTRExporter/OTRExporter/DisplayListExporter.cpp
@ -195,7 +195,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 		break;
 		case G_MTX:
 		{
-			if ((!Globals::Instance->HasSegment(GETSEGNUM(data))) || ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7
+			if ((!Globals::Instance->HasSegment(GETSEGNUM(data), res->parent->workerID)) || ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7
 			{
 				uint32_t pp = (data & 0x000000FF00000000) >> 32;
 				uint32_t mm = (data & 0x00000000FFFFFFFF);
@ -356,7 +356,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 					//std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dListDecl2->varName.c_str());
 					std::string fName = OTRExporter_DisplayList::GetPathToRes(res, dListDecl2->varName.c_str());

-					if (!File::Exists("Extract/" + fName))
+					if (files.find(fName) == files.end() && !File::Exists("Extract/" + fName))
 					{
 						MemoryStream* dlStream = new MemoryStream();
 						BinaryWriter dlWriter = BinaryWriter(dlStream);
@ -368,7 +368,10 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 							//otrArchive->RemoveFile(fName);
 #endif

+						if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 							File::WriteAllBytes("Extract/" + fName, dlStream->ToVector());
+						else
+							files[fName] = dlStream->ToVector();

 						//otrArchive->AddFile(fName, (uintptr_t)dlStream->ToVector().data(), dlWriter.GetBaseAddress());
 					}
@ -387,7 +390,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 		//case G_BRANCH_Z:
 		case G_DL:
 		{
-			if ((!Globals::Instance->HasSegment(GETSEGNUM(data)) && (int)opF3D != G_BRANCH_Z)
+			if ((!Globals::Instance->HasSegment(GETSEGNUM(data), res->parent->workerID) && (int)opF3D != G_BRANCH_Z)
 				|| ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7
 			{
 				int32_t pp = (data & 0x00FF000000000000) >> 56;
@ -450,14 +453,17 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 						//std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dListDecl2->varName.c_str());
 						std::string fName = OTRExporter_DisplayList::GetPathToRes(res, dListDecl2->varName.c_str());

-						if (!File::Exists("Extract/" + fName))
+						if (files.find(fName) == files.end() && !File::Exists("Extract/" + fName))
 						{
 							MemoryStream* dlStream = new MemoryStream();
 							BinaryWriter dlWriter = BinaryWriter(dlStream);

 							Save(dList->otherDLists[i], outPath, &dlWriter);

+							if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 								File::WriteAllBytes("Extract/" + fName, dlStream->ToVector());
+							else
+								files[fName] = dlStream->ToVector();
 						}
 					}
 					else
@ -647,7 +653,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 		{
 			int sss =	(data & 0x00FFF00000000000) >> 44;
 			int ttt =	(data & 0x00000FFF00000000) >> 32;
-			int i =		(data & 0x000000000F000000) >> 16;
+			int i =		(data & 0x000000000F000000) >> 24;
 			int uuu =	(data & 0x0000000000FFF000) >> 12;
 			int vvv=	(data & 0x0000000000000FFF);

@ -661,7 +667,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			uint32_t seg = data & 0xFFFFFFFF;
 			int32_t texAddress = Seg2Filespace(data, dList->parent->baseAddress);

-			if (!Globals::Instance->HasSegment(GETSEGNUM(seg)))
+			if (!Globals::Instance->HasSegment(GETSEGNUM(seg), res->parent->workerID))
 			{
 				int32_t __ = (data & 0x00FF000000000000) >> 48;
 				int32_t www = (data & 0x00000FFF00000000) >> 32;
@ -669,7 +675,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				uint32_t fmt = (__ & 0xE0) >> 5;
 				uint32_t siz = (__ & 0x18) >> 3;

-				Gfx value = gsDPSetTextureImage(fmt, siz, www - 1, (seg & 0x0FFFFFFF) + 1);
+				Gfx value = gsDPSetTextureImage(fmt, siz, www + 1, (seg & 0x0FFFFFFF) + 1);
 				word0 = value.words.w0;
 				word1 = value.words.w1;

@ -679,7 +685,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 			else
 			{
 				std::string texName = "";
-				bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", texName);
+				bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", texName, res->parent->workerID);

 				int32_t __ = (data & 0x00FF000000000000) >> 48;
 				int32_t www = (data & 0x00000FFF00000000) >> 32;
@ -687,7 +693,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				uint32_t fmt = (__ & 0xE0) >> 5;
 				uint32_t siz = (__ & 0x18) >> 3;

-				Gfx value = gsDPSetTextureImage(fmt, siz, www - 1, __);
+				Gfx value = gsDPSetTextureImage(fmt, siz, www + 1, __);
 				word0 = value.words.w0 & 0x00FFFFFF;
 				word0 += (G_SETTIMG_OTR << 24);
 				//word1 = value.words.w1;
@ -698,7 +704,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina

 				if (foundDecl)
 				{
-					ZFile* assocFile = Globals::Instance->GetSegment(GETSEGNUM(seg));
+					ZFile* assocFile = Globals::Instance->GetSegment(GETSEGNUM(seg), res->parent->workerID);
 					std::string assocFileName = assocFile->GetName();
 					std::string fName = "";

@ -736,42 +742,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				word1 = value.words.w1 | 1;
 			}
 			else
-			//if (dList->vertices.size() > 0)
 			{
-				// Connect neighboring vertex arrays
-				std::vector<std::pair<uint32_t, std::vector<ZVtx>>> vertsKeys(dList->vertices.begin(),
-					dList->vertices.end());
-
-				if (vertsKeys.size() > 0)
-				{
-					auto lastItem = vertsKeys[0];
-
-					for (size_t i = 1; i < vertsKeys.size(); i++)
-					{
-						auto curItem = vertsKeys[i];
-
-						int32_t sizeDiff = curItem.first - (lastItem.first + (lastItem.second.size() * 16));
-
-						// Make sure there isn't an unaccounted inbetween these two
-						if (sizeDiff == 0)
-						{
-							for (auto v : curItem.second)
-							{
-								dList->vertices[lastItem.first].push_back(v);
-								lastItem.second.push_back(v);
-							}
-
-							dList->vertices.erase(curItem.first);
-							vertsKeys.erase(vertsKeys.begin() + i);
-
-							i--;
-							continue;
-						}
-
-						lastItem = curItem;
-					}
-				}
-
 				// Write CRC64 of vtx file name
 				uint32_t addr = data & 0xFFFFFFFF;

@ -779,10 +750,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 					addr -= dList->parent->baseAddress;

 				auto segOffset = GETSEGOFFSET(addr);
-				//uint32_t seg = data & 0xFFFFFFFF;
 				Declaration* vtxDecl = dList->parent->GetDeclarationRanged(segOffset);
-				//std::string vtxName = "";
-				//bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", vtxName);

 				int32_t aa = (data & 0x000000FF00000000ULL) >> 32;
 				int32_t nn = (data & 0x000FF00000000000ULL) >> 44;
@ -808,9 +776,8 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 					word0 = hash >> 32;
 					word1 = hash & 0xFFFFFFFF;

-					if (!File::Exists("Extract/" + fName))
+					if (files.find(fName) == files.end() && !File::Exists("Extract/" + fName))
 					{
-						//printf("Exporting VTX Data %s\n", fName.c_str());
 						// Write vertices to file
 						MemoryStream* vtxStream = new MemoryStream();
 						BinaryWriter vtxWriter = BinaryWriter(vtxStream);
@ -833,10 +800,6 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 						vtxWriter.Write((uint32_t)ZResourceType::Vertex);
 						vtxWriter.Write((uint32_t)arrCnt);

-						size_t sz = dList->vertices[vtxDecl->address].size();
-
-						//if (sz > 0)
-						{
 						auto start = std::chrono::steady_clock::now();

 						// God dammit this is so dumb
@ -864,13 +827,13 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 							}
 						}

+						if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 							File::WriteAllBytes("Extract/" + fName, vtxStream->ToVector());
+						else
+							files[fName] = vtxStream->ToVector();

 						auto end = std::chrono::steady_clock::now();
 						size_t diff = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
-
-							//printf("Exported VTX Array %s in %zums\n", fName.c_str(), diff);
-						}
 					}
 				}
 				else
@ -878,15 +841,6 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 					spdlog::error("vtxDecl == nullptr!");
 				}
 			}
-			/*else
-			{
-				writer->Write(word0);
-				writer->Write(word1);
-				word0 = 0;
-				word1 = 0;
-
-				spdlog::error("dList->vertices.size() <= 0!");
-			}*/
 		}
 		break;
 		}
--- a/OTRExporter/OTRExporter/Main.cpp
+++ b/OTRExporter/OTRExporter/Main.cpp
@ -25,6 +25,7 @@ std::string otrFileName = "oot.otr";
 std::shared_ptr<Ship::Archive> otrArchive;
 BinaryWriter* fileWriter;
 std::chrono::steady_clock::time_point fileStart, resStart;
+std::map<std::string, std::vector<char>> files;

 void InitVersionInfo();

@ -39,6 +40,8 @@ static void ExporterParseFileMode(const std::string& buildMode, ZFileMode& fileM
 	{
 		fileMode = (ZFileMode)ExporterFileMode::BuildOTR;

+		printf("BOTR: Generating OTR Archive...\n");
+
 		if (File::Exists(otrFileName))
 			otrArchive = std::shared_ptr<Ship::Archive>(new Ship::Archive(otrFileName, true));
 		else
@ -54,6 +57,35 @@ static void ExporterParseFileMode(const std::string& buildMode, ZFileMode& fileM
 	}
 }

+static void ExporterProgramEnd()
+{
+	if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory)
+	{
+		printf("Generating OTR Archive...\n");
+		otrArchive = Ship::Archive::CreateArchive(otrFileName, 65536 / 2);
+
+		for (auto item : files)
+		{
+			auto fileData = item.second;
+			otrArchive->AddFile(item.first, (uintptr_t)fileData.data(), fileData.size());
+		}
+
+		// Add any additional files that need to be manually copied...
+		auto lst = Directory::ListFiles("Extract");
+
+		for (auto item : lst)
+		{
+			auto fileData = File::ReadAllBytes(item);
+			otrArchive->AddFile(StringHelper::Split(item, "Extract/")[1], (uintptr_t)fileData.data(), fileData.size());
+		}
+
+		otrArchive->AddFile("Audiobank", (uintptr_t)Globals::Instance->GetBaseromFile("Audiobank").data(), Globals::Instance->GetBaseromFile("Audiobank").size());
+		otrArchive->AddFile("Audioseq", (uintptr_t)Globals::Instance->GetBaseromFile("Audioseq").data(), Globals::Instance->GetBaseromFile("Audioseq").size());
+		otrArchive->AddFile("Audiotable", (uintptr_t)Globals::Instance->GetBaseromFile("Audiotable").data(), Globals::Instance->GetBaseromFile("Audiotable").size());
+	}
+}
+
+
 static void ExporterParseArgs(int argc, char* argv[], int& i)
 {
 	std::string arg = argv[i];
@ -85,7 +117,7 @@ static void ExporterFileBegin(ZFile* file)

 static void ExporterFileEnd(ZFile* file)
 {
-	delete fileWriter;
+	// delete fileWriter;
 }

 static void ExporterResourceEnd(ZResource* res, BinaryWriter& writer)
@ -125,6 +157,9 @@ static void ExporterResourceEnd(ZResource* res, BinaryWriter& writer)
 		else
 			fName = StringHelper::Sprintf("%s/%s", oName.c_str(), rName.c_str());

+		if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory)
+			files[fName] = strem->ToVector();
+		else
 			File::WriteAllBytes("Extract/" + fName, strem->ToVector());
 	}

@ -156,6 +191,8 @@ static void ImportExporters()
 	exporterSet->beginXMLFunc = ExporterXMLBegin;
 	exporterSet->endXMLFunc = ExporterXMLEnd;
 	exporterSet->resSaveFunc = ExporterResourceEnd;
+	exporterSet->endProgramFunc = ExporterProgramEnd;
+
 	exporterSet->exporters[ZResourceType::Background] = new OTRExporter_Background();
 	exporterSet->exporters[ZResourceType::Texture] = new OTRExporter_Texture();
 	exporterSet->exporters[ZResourceType::Room] = new OTRExporter_Room();
--- a/OTRExporter/OTRExporter/Main.h
+++ b/OTRExporter/OTRExporter/Main.h
@ -3,3 +3,4 @@
 #include <Archive.h>

 extern std::shared_ptr<Ship::Archive> otrArchive;
+extern std::map<std::string, std::vector<char>> files;
--- a/OTRExporter/OTRExporter/OTRExporter.vcxproj
+++ b/OTRExporter/OTRExporter/OTRExporter.vcxproj
@ -63,6 +63,12 @@
    <ClCompile Include="VersionInfo.cpp" />
    <ClCompile Include="VtxExporter.cpp" />
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\OTRGui\build\ZERO_CHECK.vcxproj">
+      <Project>{02d10590-9542-3f55-aaf8-6055677e2a2a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
  <PropertyGroup Label="Globals">
    <VCProjectVersion>16.0</VCProjectVersion>
    <Keyword>Win32Proj</Keyword>
@ -118,19 +124,31 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
    <IncludePath>$(SolutionDir)otrlib;$(SolutionDir)\ZAPD\ZAPD\;$(SolutionDir)\ZAPD\lib\tinyxml2;$(SolutionDir)\ZAPD\lib\libgfxd;$(SolutionDir)\ZAPD\lib\elfio;$(SolutionDir)\ZAPD\lib\assimp\include;$(SolutionDir)\ZAPD\lib\stb;$(ProjectDir);$(IncludePath)</IncludePath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPD;$(ProjectDir)..\..\ZAPDTR\lib\tinyxml2;$(ProjectDir)..\..\ZAPDTR\lib\libgfxd;$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\..\libultraship\libultraship;$(ProjectDir)..\..\libultraship\libultraship\lib\spdlog\include;$(ProjectDir)..\..\libultraship\libultraship\Lib\Fast3D\U64;$(IncludePath)</IncludePath>
    <LibraryPath>$(ProjectDir)..\..\libultraship\libultraship;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <IncludePath>$(ProjectDir)..\..\ZAPDTR\ZAPD;$(ProjectDir)..\..\ZAPDTR\lib\tinyxml2;$(ProjectDir)..\..\ZAPDTR\lib\libgfxd;$(ProjectDir)..\..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\..\libultraship\libultraship;$(ProjectDir)..\..\libultraship\libultraship\lib\spdlog\include;$(ProjectDir)..\..\libultraship\libultraship\Lib\Fast3D\U64;$(IncludePath)</IncludePath>
    <LibraryPath>$(ProjectDir)..\..\libultraship\libultraship;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
--- a/OTRExporter/OTRExporter/RoomExporter.cpp
+++ b/OTRExporter/OTRExporter/RoomExporter.cpp
@ -407,7 +407,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 			{
 				uint32_t seg = cmdHeaders->headers[i] & 0xFFFFFFFF;
 				std::string headerName = "";
-				bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, room->parent, "", headerName);
+				bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, room->parent, "", headerName, res->parent->workerID);
 				if (headerName == "NULL")
 					writer->Write("");
 				else
@ -443,7 +443,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 			SetCutscenes* cmdSetCutscenes = (SetCutscenes*)cmd;

 			std::string listName;
-			Globals::Instance->GetSegmentedPtrName(cmdSetCutscenes->cmdArg2, room->parent, "CutsceneData", listName);
+			Globals::Instance->GetSegmentedPtrName(cmdSetCutscenes->cmdArg2, room->parent, "CutsceneData", listName, res->parent->workerID);
 			std::string fName = OTRExporter_DisplayList::GetPathToRes(room, listName);
 			//std::string fName = StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), listName.c_str());
 			writer->Write(fName);
@ -453,7 +453,10 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 			OTRExporter_Cutscene cs;
 			cs.Save(cmdSetCutscenes->cutscenes[0], "", &csWriter);

+			if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 				File::WriteAllBytes("Extract/" + fName, csStream->ToVector());
+			else
+				files[fName] = csStream->ToVector();

 			//std::string fName = OTRExporter_DisplayList::GetPathToRes(res, vtxDecl->varName);
 			//otrArchive->AddFile(fName, (uintptr_t)csStream->ToVector().data(), csWriter.GetBaseAddress());
@ -477,7 +480,10 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 				OTRExporter_Path pathExp;
 				pathExp.Save(&cmdSetPathways->pathwayList, outPath, &pathWriter);

+				if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 					File::WriteAllBytes("Extract/" + path, pathStream->ToVector());
+				else
+					files[path] = pathStream->ToVector();

 				//otrArchive->AddFile(path, (uintptr_t)pathStream->ToVector().data(), pathWriter.GetBaseAddress());

--- a/OTRExporter/OTRExporter/SkeletonExporter.cpp
+++ b/OTRExporter/OTRExporter/SkeletonExporter.cpp
@ -23,7 +23,7 @@ void OTRExporter_Skeleton::Save(ZResource* res, const fs::path& outPath, BinaryW
 		Declaration* skelDecl = skel->parent->GetDeclarationRanged(GETSEGOFFSET(skel->limbsTable.limbsAddresses[i]));

 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(skel->limbsTable.limbsAddresses[i], skel->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(skel->limbsTable.limbsAddresses[i], skel->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')
--- a/OTRExporter/OTRExporter/SkeletonLimbExporter.cpp
+++ b/OTRExporter/OTRExporter/SkeletonLimbExporter.cpp
@ -86,7 +86,7 @@ void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, Bin
 	if (limb->childPtr != 0)
 	{
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->childPtr, limb->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->childPtr, limb->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')
@ -107,7 +107,7 @@ void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, Bin
 	if (limb->siblingPtr != 0)
 	{
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->siblingPtr, limb->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->siblingPtr, limb->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')
@ -128,7 +128,7 @@ void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, Bin
 	if (limb->dListPtr != 0)
 	{
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dListPtr, limb->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dListPtr, limb->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')
@ -149,7 +149,7 @@ void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, Bin
 	if (limb->dList2Ptr != 0)
 	{
 		std::string name;
-		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dList2Ptr, limb->parent, "", name);
+		bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dList2Ptr, limb->parent, "", name, res->parent->workerID);
 		if (foundDecl)
 		{
 			if (name.at(0) == '&')
--- a/OTRExporter/extract_assets.py
+++ b/OTRExporter/extract_assets.py
@ -1,24 +1,51 @@
 #!/usr/bin/env python3

-import argparse, json, os, signal, time, sys, shutil
+# How to use:
+#   Place a rom in this directory then run the script.
+#   If you are using multiple roms, the script will let you choose one.
+#   To choose with a commandline argument:
+#      Python3 extract_assets.py <number>
+#      Invalid input results in the first rom being selected
+
+import json, os, signal, time, sys, shutil, glob
 from multiprocessing import Pool, cpu_count, Event, Manager, ProcessError
+from enum import Enum
 import shutil

-def SignalHandler(sig, frame):
-    print(f'Signal {sig} received. Aborting...')
-    mainAbort.set()
-    # Don't exit immediately to update the extracted assets file.
+romVer = "..\\soh\\baserom_non_mq.z64"
+roms = [];
+checksums = ["", "", ""];

-def BuildOTR():
-    shutil.copyfile("../soh/baserom/Audiobank", "Extract/Audiobank")
-    shutil.copyfile("../soh/baserom/Audioseq", "Extract/Audioseq")
-    shutil.copyfile("../soh/baserom/Audiotable", "Extract/Audiotable")
+class Checksums(Enum):
+    OOT_NTSC_10 = "EC7011B7"
+    OOT_NTSC_11 = "D43DA81F"
+    OOT_NTSC_12 = "693BA2AE"
+    OOT_PAL_10 = "B044B569"
+    OOT_PAL_11 = "B2055FBD"
+    OOT_NTSC_JP_GC_CE = "F7F52DB8"
+    OOT_NTSC_JP_GC = "F611F4BA"
+    OOT_NTSC_US_GC = "F3DD35BA"
+    OOT_PAL_GC = "09465AC3"
+    OOT_NTSC_JP_MQ = "F43B45BA"
+    OOT_NTSC_US_MQ = "F034001A"
+    OOT_PAL_MQ = "1D4136F3"
+    OOT_PAL_GC_DBG1 = "871E1C92"
+    OOT_PAL_GC_DBG2 = "87121EFE"
+    OOT_PAL_GC_MQ_DBG = "917D18F6"
+    OOT_IQUE_TW = "3D81FB3E"
+    OOT_IQUE_CN = "B1E1E07B"
+    OOT_UNKNOWN = "FFFFFFFF"

+CompatibleChecksums = [
+    Checksums.OOT_PAL_GC,
+    Checksums.OOT_PAL_GC_DBG1
+]
+
+def BuildOTR(xmlPath, rom):
    shutil.copytree("assets", "Extract/assets")

    execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
-
-    execStr += " botr -se OTR"
+    execStr += " ed -i %s -b %s -fl CFG/filelists -o placeholder -osf placeholder -gsf 1 -rconf CFG/Config.xml -se OTR" % (xmlPath, rom)

    print(execStr)
    exitValue = os.system(execStr)
@ -28,90 +55,95 @@ def BuildOTR():
        print("Aborting...", file=os.sys.stderr)
        print("\n")

-def ExtractFile(xmlPath, outputPath, outputSourcePath):
-    execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
-    execStr += " e -eh -i %s -b ../soh/baserom/ -o %s -osf %s -gsf 1 -rconf CFG/Config.xml -se OTR" % (xmlPath, outputPath, outputSourcePath)
+def checkChecksum(rom):
+    r = open(rom, "rb")
+    r.seek(16)
+    bytes = r.read(4).hex().upper()
+    r.close()

-    if "overlays" in xmlPath:
-        execStr += " --static"
+    for checksum in Checksums:
+        if (checksum.value == bytes):

-    print(execStr)
-    exitValue = os.system(execStr)
-    #exitValue = 0
-    if exitValue != 0:
-        print("\n")
-        print("Error when extracting from file " + xmlPath, file=os.sys.stderr)
-        print("Aborting...", file=os.sys.stderr)
-        print("\n")
-
-def ExtractFunc(fullPath):
-    *pathList, xmlName = fullPath.split(os.sep)
-    objectName = os.path.splitext(xmlName)[0]
-
-    outPath = os.path.join("../soh/assets/", *pathList[4:], objectName)
-    os.makedirs(outPath, exist_ok=True)
-    outSourcePath = outPath
-
-    ExtractFile(fullPath, outPath, outSourcePath)
-
-def initializeWorker(abort, test):
-    global globalAbort
-    globalAbort = abort
+            for compat in CompatibleChecksums:
+                if (checksum.name == compat.name):
+                    print("Compatible rom found!")
+                    return checksum
+            print("Valid oot rom found. However, not compatible with SoH.")
+            print("Compatible roms:")
+            for compat in CompatibleChecksums:
+                print(compat.name+" | 0x"+compat.value)
+            sys.exit(1)

+    print("Wrong rom! No valid checksum found")
+    sys.exit(1)

 def main():
-    parser = argparse.ArgumentParser(description="baserom asset extractor")
-    parser.add_argument("-s", "--single", help="asset path relative to assets/, e.g. objects/gameplay_keep")
-    parser.add_argument("-f", "--force", help="Force the extraction of every xml instead of checking the touched ones.", action="store_true")
-    parser.add_argument("-u", "--unaccounted", help="Enables ZAPD unaccounted detector warning system.", action="store_true")
-    args = parser.parse_args()

-    global mainAbort
-    mainAbort = Event()
-    manager = Manager()
-    signal.signal(signal.SIGINT, SignalHandler)
+    romToUse = "";

-    extractedAssetsTracker = manager.dict()
+    for file in glob.glob("*.z64"):
+        roms.append(file)

-    asset_path = args.single
-    if asset_path is not None:
-        fullPath = os.path.join("../soh/assets", "xml", asset_path + ".xml")
-        if not os.path.exists(fullPath):
-            print(f"Error. File {fullPath} doesn't exists.", file=os.sys.stderr)
-            exit(1)
+    if not (roms):
+        print("Error: No roms located, place one in the OTRExporter directory", file=os.sys.stderr)
+        sys.exit(1)

-        ExtractFunc(fullPath)
-    else:
-        extract_text_path = "assets/text/message_data.h"
-        if os.path.isfile(extract_text_path):
-            extract_text_path = None
-        extract_staff_text_path = "assets/text/message_data_staff.h"
-        if os.path.isfile(extract_staff_text_path):
-            extract_staff_text_path = None
-
-        xmlFiles = []
-        for currentPath, _, files in os.walk(os.path.join("../soh/assets", "xml")):
-            for file in files:
-                fullPath = os.path.join(currentPath, file)
-                if file.endswith(".xml"):
-                    xmlFiles.append(fullPath)
+    if (len(roms) > 1):

+        # If commandline args exist
+        if (len(sys.argv) > 1):
            try:
-            numCores = 2
-            print("Extracting assets with " + str(numCores) + " CPU cores.")
-            with Pool(numCores, initializer=initializeWorker, initargs=(mainAbort, 0)) as p:
-                p.map(ExtractFunc, xmlFiles)
-        except Exception as e:
-            print("Warning: Multiprocessing exception ocurred.", file=os.sys.stderr)
-            print("Disabling mutliprocessing.", file=os.sys.stderr)
+                if ((int(sys.argv[1]) - 1) < 1):
+                    romToUse = roms[0]

-            initializeWorker(mainAbort, 0)
-            for singlePath in xmlFiles:
-                ExtractFunc(singlePath)
+                elif ((int(sys.argv[1]) - 1) > len(roms)):
+                    romToUse = roms[len(roms) - 1]

+                else:
+                    romToUse = roms[int(sys.argv[1]) - 1]
+            except:
+                romToUse = roms[0]

-        BuildOTR()
+        # No commandline args, select rom using user input
+        else:
+
+            print(str(len(roms))+" roms found, please select one by pressing 1-"+str(len(roms)))
+
+            count = 1
+            for list in range(len(roms)):
+                print(str(count)+". "+roms[list])
+                count += 1
+
+            while(1):
+                try:
+                    selection = int(input())
+                except:
+                    print("Bad input. Try again with the number keys.")
+                    continue
+
+                if (selection < 1 or selection > len(roms)):
+                    print("Bad input. Try again.")
+                    continue
+
+                else: break
+
+            romToUse = roms[selection - 1]
+
+    else:
+        romToUse = roms[0]
+
+    match checkChecksum(romToUse):
+        case Checksums.OOT_PAL_GC:
+            xmlVer = "GC_NMQ_PAL_F"
+        case Checksums.OOT_PAL_GC_DBG1:
+            xmlVer = "GC_NMQ_D"
+        case _: # default case
+            xmlVer = "GC_MQ_D"
+
+    if (os.path.exists("Extract")):
        shutil.rmtree("Extract")

+    BuildOTR("../soh/assets/xml/" + xmlVer + "/", romToUse)
+
 if __name__ == "__main__":
    main()
--- a/OTRExporter/extract_assets_old.py
+++ b/OTRExporter/extract_assets_old.py
@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+
+import argparse, json, os, signal, time, sys, shutil
+from multiprocessing import Pool, cpu_count, Event, Manager, ProcessError
+import shutil
+
+def SignalHandler(sig, frame):
+    print(f'Signal {sig} received. Aborting...')
+    mainAbort.set()
+    # Don't exit immediately to update the extracted assets file.
+
+def BuildOTR():
+    shutil.copyfile("baserom/Audiobank", "Extract/Audiobank")
+    shutil.copyfile("baserom/Audioseq", "Extract/Audioseq")
+    shutil.copyfile("baserom/Audiotable", "Extract/Audiotable")
+
+    shutil.copytree("assets", "Extract/assets")
+
+    execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPD/ZAPD.out"
+
+    execStr += " botr -se OTR"
+
+    print(execStr)
+    exitValue = os.system(execStr)
+    if exitValue != 0:
+        print("\n")
+        print("Error when building the OTR file...", file=os.sys.stderr)
+        print("Aborting...", file=os.sys.stderr)
+        print("\n")
+
+def ExtractFile(xmlPath, outputPath, outputSourcePath):
+    execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPD/ZAPD.out"
+    execStr += " e -eh -i %s -b baserom/ -o %s -osf %s -gsf 1 -rconf CFG/Config.xml -se OTR" % (xmlPath, outputPath, outputSourcePath)
+
+    if "overlays" in xmlPath:
+        execStr += " --static"
+
+    print(execStr)
+    exitValue = os.system(execStr)
+    #exitValue = 0
+    if exitValue != 0:
+        print("\n")
+        print("Error when extracting from file " + xmlPath, file=os.sys.stderr)
+        print("Aborting...", file=os.sys.stderr)
+        print("\n")
+
+def ExtractFunc(fullPath):
+    *pathList, xmlName = fullPath.split(os.sep)
+    objectName = os.path.splitext(xmlName)[0]
+
+    outPath = os.path.join("..\\soh\\assets\\", *pathList[5:], objectName)
+    os.makedirs(outPath, exist_ok=True)
+    outSourcePath = outPath
+
+    ExtractFile(fullPath, outPath, outSourcePath)
+
+def initializeWorker(abort, test):
+    global globalAbort
+    globalAbort = abort
+
+
+def main():
+    parser = argparse.ArgumentParser(description="baserom asset extractor")
+    parser.add_argument("-s", "--single", help="asset path relative to assets/, e.g. objects/gameplay_keep")
+    parser.add_argument("-f", "--force", help="Force the extraction of every xml instead of checking the touched ones.", action="store_true")
+    parser.add_argument("-u", "--unaccounted", help="Enables ZAPD unaccounted detector warning system.", action="store_true")
+    parser.add_argument("-v", "--version", help="Sets game version.")
+    args = parser.parse_args()
+
+    global mainAbort
+    mainAbort = Event()
+    manager = Manager()
+    signal.signal(signal.SIGINT, SignalHandler)
+
+    extractedAssetsTracker = manager.dict()
+
+    xmlVer = "GC_NMQ_D"
+
+    if (args.version == "gc_pal_nmpq"):
+        xmlVer = "GC_NMQ_PAL_F"
+    elif (args.version == "dbg_mq"):
+        xmlVer = "GC_MQ_D"
+
+    asset_path = args.single
+    if asset_path is not None:
+        fullPath = os.path.join("..\\soh\\assets", "xml", asset_path + ".xml")
+        if not os.path.exists(fullPath):
+            print(f"Error. File {fullPath} doesn't exists.", file=os.sys.stderr)
+            exit(1)
+
+        ExtractFunc(fullPath)
+    else:
+        extract_text_path = "assets/text/message_data.h"
+        if os.path.isfile(extract_text_path):
+            extract_text_path = None
+        extract_staff_text_path = "assets/text/message_data_staff.h"
+        if os.path.isfile(extract_staff_text_path):
+            extract_staff_text_path = None
+
+        xmlFiles = []
+        for currentPath, _, files in os.walk(os.path.join("..\\soh\\assets\\xml\\", xmlVer)):
+            for file in files:
+                fullPath = os.path.join(currentPath, file)
+                if file.endswith(".xml"):
+                    xmlFiles.append(fullPath)
+
+        try:
+            numCores = 2
+            print("Extracting assets with " + str(numCores) + " CPU cores.")
+            with Pool(numCores, initializer=initializeWorker, initargs=(mainAbort, 0)) as p:
+                p.map(ExtractFunc, xmlFiles)
+        except Exception as e:
+            print("Warning: Multiprocessing exception ocurred.", file=os.sys.stderr)
+            print("Disabling mutliprocessing.", file=os.sys.stderr)
+
+            initializeWorker(mainAbort, 0)
+            for singlePath in xmlFiles:
+                ExtractFunc(singlePath)
+
+
+        BuildOTR()
+        shutil.rmtree("Extract")
+
+if __name__ == "__main__":
+    main()
--- a/OTRExporter/extract_baserom_debug.py
+++ b/OTRExporter/extract_baserom_debug.py
--- a/OTRExporter/extract_baserom_gc.py
+++ b/OTRExporter/extract_baserom_gc.py
--- a/OTRGui/assets/extractor/Config_GC_MQ_D.xml
+++ b/OTRGui/assets/extractor/Config_GC_MQ_D.xml
@ -2,7 +2,7 @@
    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/"/>
+    <ExternalXMLFolder Path="assets/extractor/xmls/GC_MQ_D/"/>
 	<TexturePool File="TexturePool.xml"/>
    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
 </Root>
--- a/OTRGui/assets/extractor/Config_GC_NMQ_D.xml
+++ b/OTRGui/assets/extractor/Config_GC_NMQ_D.xml
@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/extractor/xmls/GC_NMQ_D/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
--- a/OTRGui/assets/extractor/Config_GC_NMQ_PAL_F.xml
+++ b/OTRGui/assets/extractor/Config_GC_NMQ_PAL_F.xml
@ -0,0 +1,8 @@
+<Root>
+    <SymbolMap File="symbols/SymbolMap_OoTMqDbg.txt"/>
+    <ActorList File="symbols/ActorList_OoTMqDbg.txt"/>
+    <ObjectList File="symbols/ObjectList_OoTMqDbg.txt"/>
+    <ExternalXMLFolder Path="assets/extractor/xmls/GC_NMQ_PAL_F/"/>
+	<TexturePool File="TexturePool.xml"/>
+    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
+</Root>
--- a/OTRGui/assets/extractor/filelists/gamecube_pal.txt
+++ b/OTRGui/assets/extractor/filelists/gamecube_pal.txt
--- a/OTRGui/src/game/game.cpp
+++ b/OTRGui/src/game/game.cpp
@ -18,6 +18,7 @@ Shader shader = { 0 };
 Light light = { 0 };
 Vector3 lightPos = { -5.0f, 10.0f, 10.0f };
 Vector2 dragOffset;
+bool isDragging = false;
 std::string sohFolder = NULLSTR;
 bool extracting = false;
 bool rom_ready = false;
@ -25,6 +26,7 @@ bool single_thread = false;
 bool hide_second_btn = false;
 RomVersion version;
 const char* patched_rom = "tmp/rom.z64";
+extern bool oldExtractMode;

 static std::string currentStep = "None";

@ -71,11 +73,29 @@ void OTRGame::init(){
 	}
 }

-void ExtractRom() {
-	const WriteResult result = ExtractBaserom(patched_rom);
+void ExtractRom() 
+{
+	WriteResult result;
+
+	if (oldExtractMode)
+		ExtractBaserom(patched_rom);
+	else
+		result.error = NULLSTR;
+
 	if (result.error == NULLSTR) {
 		if (MoonUtils::exists("oot.otr")) MoonUtils::rm("oot.otr");
-		startWorker();
+		if (MoonUtils::exists("Extract")) MoonUtils::rm("Extract");
+
+		MoonUtils::mkdir("Extract");
+		//MoonUtils::copy("tmp/baserom/Audiobank", "Extract/Audiobank");
+		//MoonUtils::copy("tmp/baserom/Audioseq", "Extract/Audioseq");
+		//MoonUtils::copy("tmp/baserom/Audiotable", "Extract/Audiotable");
+		//MoonUtils::copy("tmp/baserom/version", "Extract/version");
+		MoonUtils::write("Extract/version", (char*)&version.crc, sizeof(version.crc));
+
+		MoonUtils::copy("assets/game/", "Extract/assets/");
+
+		startWorker(version);
 		extracting = true;
 	}
 }
@ -95,20 +115,52 @@ void OTRGame::update(){
 }

 void OTRGame::draw() {
+	Vector2 windowSize(GetScreenWidth(), GetScreenHeight());
+	Rectangle titlebar = Rectangle(0, 0, windowSize.x - 50, 35);
+	Vector2 mousePos = GetMousePosition();
+	Vector2 mouseDelta = GetMouseDelta();
+
+	if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT) && !isDragging &&
+		mousePos.x >= titlebar.x && mousePos.y >= titlebar.y && mousePos.x <= titlebar.x + titlebar.width && mousePos.y <= titlebar.y + titlebar.height) {
+		isDragging = true;
+		dragOffset = mousePos;
+	}
+	else if (IsMouseButtonReleased(MOUSE_BUTTON_LEFT) && isDragging) {
+		isDragging = false;
+		dragOffset = Vector2(0, 0);
+	}
+
+	if (isDragging && (mouseDelta.x != 0.0f || mouseDelta.y != 0.0f)) {
+		Vector2 wndPos = GetWindowPosition();
+		wndPos = Vector2(wndPos.x + (mousePos.x - dragOffset.x), wndPos.y + (mousePos.y - dragOffset.y));
+
+		// Calculate virtual screen total size in case there are multiple monitors
+
+		int vsX1 = 0, vsY1 = 0, vsX2 = 0, vsY2 = 0;
+		int monitorCount = GetMonitorCount();
+
+		for (int m = 0; m < monitorCount; m++) {
+			Vector2 monitorPos = GetMonitorPosition(m);
+			Vector2 monitorSize = Vector2(GetMonitorWidth(m), GetMonitorHeight(m));
+
+			if (monitorPos.x < vsX1) vsX1 = monitorPos.x;
+			if (monitorPos.y < vsY1) vsY1 = monitorPos.y;
+			if (monitorPos.x + monitorSize.x > vsX2) vsX2 = monitorPos.x + monitorSize.x;
+			if (monitorPos.y + monitorSize.y > vsY2) vsY2 = monitorPos.y + monitorSize.y;
+		}
+
+		// Clamp the window to the borders of the monitors
+		if (wndPos.x < vsX1) wndPos.x = vsX1;
+		if (wndPos.x < vsX1) wndPos.x = vsX1;
+		if (wndPos.y < vsY1) wndPos.y = vsY1;
+		if (wndPos.x + windowSize.x > vsX2) wndPos.x = vsX2 - windowSize.x;
+		if (wndPos.y + windowSize.y > vsY2) wndPos.y = vsY2 - windowSize.y;
+
+		SetWindowPosition(wndPos.x, wndPos.y);
+	}
+
 	BeginDrawing();
 	ClearBackground(Color(40, 40, 40, 255));
-		Vector3 windowSize(GetScreenWidth(), GetScreenHeight());
-		Rectangle titlebar = Rectangle(0, 0, windowSize.x - 50, 35);
-		Vector2 mousePos = Vector2(GetMouseX(), GetMouseY());
-		bool hoveredTitlebar = mousePos.x >= titlebar.x && mousePos.y >= titlebar.y && mousePos.x <= titlebar.x + titlebar.width && mousePos.y <= titlebar.y + titlebar.height;
-
-		if (hoveredTitlebar && IsMouseButtonDown(MOUSE_BUTTON_LEFT)) {
-			if (dragOffset.x == 0 && dragOffset.y == 0) dragOffset = mousePos;
-			Vector2 wndPos = GetWindowPosition();
-
-			SetWindowPosition(wndPos.x + (mousePos.x - dragOffset.x), wndPos.y + (mousePos.y - dragOffset.y));
-		}
-		else dragOffset = Vector2(0, 0);

 	DrawTexture(Textures["Frame"], 0, 0, WHITE);

@ -116,7 +168,7 @@ void OTRGame::draw() {
 	DrawTexture(titleTex, windowSize.x / 2 - titleTex.width / 2, titlebar.height / 2 - titleTex.height / 2, WHITE);

 	if (UIUtils::GuiIcon("Exit", windowSize.x - 36, titlebar.height / 2 - 10) && (extracting && currentStep.find("Done") != std::string::npos || !extracting)) {
-			CloseWindow();
+		closeRequested = true;
 	}

 	BeginMode3D(camera);
@ -127,6 +179,8 @@ void OTRGame::draw() {
 	UIUtils::GuiShadowText(("Rom Type: " + version.version).c_str(), 32, text_y, 10, WHITE, BLACK);
 	UIUtils::GuiShadowText("Tool Version: 1.0", 32, text_y + 15, 10, WHITE, BLACK);
 	UIUtils::GuiShadowText("OTR Version: 1.0", 32, text_y + 30, 10, WHITE, BLACK);
+
+	if (oldExtractMode)
 		UIUtils::GuiToggle(&single_thread, "Single Thread", 32, text_y + 40, currentStep != NULLSTR);

 	if (!hide_second_btn && UIUtils::GuiIconButton("Folder", "Open\nShip Folder", 109, 50, currentStep != NULLSTR, "Select your Ship of Harkinian Folder\n\nYou could use another folder\nfor development purposes")) {
--- a/OTRGui/src/game/game.h
+++ b/OTRGui/src/game/game.h
@ -19,6 +19,8 @@ public:
    void update();
    void draw();
    void exit();
+
+    inline bool CloseRequested() { return closeRequested; }
 protected:
    void LoadTexture(const std::string& name, const std::string& path) {
        const Image tmp = LoadImage(path.c_str());
@ -32,6 +34,9 @@ protected:
        SetTextureFilter(font.texture, TEXTURE_FILTER_POINT);
        Fonts[name] = font;
    }
+
+private:
+    bool closeRequested = false;
 };

 extern OTRGame* Game;
--- a/OTRGui/src/impl/baserom_extractor/baserom_extractor.cpp
+++ b/OTRGui/src/impl/baserom_extractor/baserom_extractor.cpp
@ -83,37 +83,37 @@ RomVersion GetVersion(FILE* rom) {
        break;
    case OOT_NTSC_JP_GC:
        version.version = "JP GameCube (MQ Disk)";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
        version.offset = OOT_OFF_JP_GC;
        break;
    case OOT_NTSC_JP_GC_CE:
        version.version = "GameCube (Collectors Edition Disk)";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
        version.offset = OOT_OFF_JP_GC_CE;
        break;
    case OOT_NTSC_JP_MQ:
        version.version = "JP Master Quest";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
        version.offset = OOT_OFF_JP_MQ;
        break;
    case OOT_NTSC_US_MQ:
        version.version = "NTSC Master Quest";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
        version.offset = OOT_OFF_JP_MQ;
        break;
    case OOT_NTSC_US_GC:
        version.version = "NTSC GameCube";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube.txt";
        version.offset = OOT_OFF_US_MQ;
        break;
    case OOT_PAL_GC:
        version.version = "PAL GameCube";
-        version.listPath = "gamecube_mq.txt";
+        version.listPath = "gamecube_pal.txt";
        version.offset = OOT_OFF_PAL_GC;
        break;
    case OOT_PAL_MQ:
        version.version = "PAL Master Quest";
-        version.listPath = "pal_mq.txt";
+        version.listPath = "gamecube_pal.txt";
        version.offset = OOT_OFF_PAL_MQ;
        break;
    case OOT_PAL_GC_DBG1:
@ -179,6 +179,8 @@ WriteResult ExtractBaserom(const char* romPath) {

    const std::vector<std::string> lines = MoonUtils::split(read(MoonUtils::join("assets/extractor/filelists", version.listPath)), '\n');

+    std::vector<uint8_t> decompressedData(1);
+
    for (int i = 0; i < lines.size(); i++) {
        FILE* outFile = fopen(MoonUtils::join("tmp/baserom", lines[i]).c_str(), "wb");
        const int romOffset = version.offset + (DMA_ENTRY_SIZE * i);
@ -196,10 +198,13 @@ WriteResult ExtractBaserom(const char* romPath) {
        auto outData = new uint8_t[size];
        memcpy(outData, romData + physStart, size);

+
        if (compressed) {
-            std::vector<uint8_t> compressedData = yaz0_encode(outData, size);
-            outData = compressedData.data();
-            size = compressedData.size();
+            int decSize = virtEnd - virtStart;
+            decompressedData = std::vector<uint8_t>(decSize);
+            yaz0_decode(outData, decompressedData.data(), decSize);
+            outData = decompressedData.data();
+            size = decSize;
        }

        fwrite(outData, sizeof(char), size, outFile);
--- a/OTRGui/src/impl/baserom_extractor/baserom_extractor.h
+++ b/OTRGui/src/impl/baserom_extractor/baserom_extractor.h
@ -1,23 +1,7 @@
 #ifndef EXTRACT_BASEROM_H_
 #define EXTRACT_BASEROM_H_

-#define OOT_NTSC_10 0xEC7011B7
-#define OOT_NTSC_11 0xD43DA81F
-#define OOT_NTSC_12 0x693BA2AE
-#define OOT_PAL_10 0xB044B569
-#define OOT_PAL_11 0xB2055FBD
-#define OOT_NTSC_JP_GC_CE 0xF7F52DB8
-#define OOT_NTSC_JP_GC 0xF611F4BA
-#define OOT_NTSC_US_GC 0xF3DD35BA
-#define OOT_PAL_GC 0x09465AC3
-#define OOT_NTSC_JP_MQ 0xF43B45BA
-#define OOT_NTSC_US_MQ 0xF034001A
-#define OOT_PAL_MQ 0x1D4136F3
-#define OOT_PAL_GC_DBG1 0x871E1C92 // 03-21-2002 build
-#define OOT_PAL_GC_DBG2 0x87121EFE // 03-13-2002 build
-#define OOT_PAL_GC_MQ_DBG 0x917D18F6
-#define OOT_IQUE_TW 0x3D81FB3E
-#define OOT_IQUE_CN 0xB1E1E07B
+#include "../../libultraship/libultraship/GameVersions.h"
 #include <cstdio>
 #include <string>

--- a/OTRGui/src/impl/extractor/extractor.cpp
+++ b/OTRGui/src/impl/extractor/extractor.cpp
@ -5,6 +5,7 @@
 #include "utils/mutils.h"
 #include "ctpl/ctpl_stl.h"
 #include <thread>
+#include <impl/baserom_extractor/baserom_extractor.h>

 #ifdef _WIN32
 #define PLATFORM Platforms::WINDOWS
@ -13,6 +14,7 @@
 #endif
 namespace Util = MoonUtils;

+bool oldExtractMode = false;
 static int maxResources = 0;
 static int extractedResources = 0;
 bool buildingOtr = false;
@ -22,19 +24,29 @@ bool isWindows() {
 	return (PLATFORM == Platforms::WINDOWS);
 }

+std::string GetXMLVersion(RomVersion version)
+{
+	switch (version.crc)
+	{
+	case OOT_PAL_GC_DBG1: return "GC_NMQ_D";
+	case OOT_PAL_GC_DBG2: return "GC_MQ_D";
+	case OOT_PAL_GC:	  return "GC_NMQ_PAL_F";
+	}
+
+	return "ERROR";
+}
+
 void BuildOTR(const std::string output) {
-	Util::copy("tmp/baserom/Audiobank", "Extract/Audiobank");
-	Util::copy("tmp/baserom/Audioseq", "Extract/Audioseq");
-	Util::copy("tmp/baserom/Audiotable", "Extract/Audiotable");
-
-	Util::copy("assets/game/", "Extract/assets/");
-
+	if (oldExtractMode)
+	{
 		std::string execStr = Util::format("assets/extractor/%s", isWindows() ? "ZAPD.exe" : "ZAPD.out") + " botr -se OTR";
 		ProcessResult result = NativeFS->LaunchProcess(execStr);
 		if (result.exitCode != 0) {
 			std::cout << "\nError when building the OTR file with error code: " << result.exitCode << " !" << std::endl;
 			std::cout << "Aborting...\n" << std::endl;
 		}
+	}
+
 	setCurrentStep("Done!");

 	if (output == ".") return;
@ -44,9 +56,9 @@ void BuildOTR(const std::string output) {
 	MoonUtils::copy("oot.otr", outputPath);
 }

-void ExtractFile(std::string xmlPath, std::string outPath, std::string outSrcPath) {
+void ExtractFile(std::string xmlPath, std::string outPath, std::string outSrcPath, RomVersion version) {
 	std::string execStr = Util::format("assets/extractor/%s", isWindows() ? "ZAPD.exe" : "ZAPD.out");
-	std::string args = Util::format(" e -eh -i %s -b tmp/baserom/ -o %s -osf %s -gsf 1 -rconf assets/extractor/Config.xml -se OTR %s", xmlPath.c_str(), outPath.c_str(), outSrcPath.c_str(), xmlPath.find("overlays") != std::string::npos ? "--static" : "");
+	std::string args = Util::format(" e -eh -i %s -b tmp/baserom/ -o %s -osf %s -gsf 1 -rconf assets/extractor/Config_%s.xml -se OTR %s", xmlPath.c_str(), outPath.c_str(), outSrcPath.c_str(), GetXMLVersion(version).c_str(), xmlPath.find("overlays") != std::string::npos ? "--static" : "");
 	ProcessResult result = NativeFS->LaunchProcess(execStr + args);

 	if (result.exitCode != 0) {
@ -55,17 +67,24 @@ void ExtractFile(std::string xmlPath, std::string outPath, std::string outSrcPat
 	}
 }

-void ExtractFunc(std::string fullPath) {
+void ExtractFunc(std::string fullPath, RomVersion version) {
 	std::vector<std::string> path = Util::split(fullPath, Util::pathSeparator());
 	std::string outPath = Util::join(Util::join("assets/extractor/xmls/output", path[4]), Util::basename(fullPath));
 	Util::mkdir(outPath);
-	ExtractFile(fullPath, outPath, outPath);
+	ExtractFile(fullPath, outPath, outPath, version);
 	setCurrentStep("Extracting: " + Util::basename(fullPath));
 	extractedResources++;
 }

-void startWorker() {
-	std::string path = "assets/extractor/xmls";
+void startWorker(RomVersion version) {
+	std::string path = "assets/extractor/xmls/";
+
+	path += GetXMLVersion(version);
+
+	Util::write("tmp/baserom/version", (char*)&version.crc, sizeof(version.crc));
+
+	if (oldExtractMode)
+	{
 		std::vector<std::string> files;
 		Util::dirscan(path, files);
 		std::vector<std::string> xmlFiles;
@ -78,26 +97,47 @@ void startWorker() {

 		for (auto& file : xmlFiles) {
 			if (single_thread) {
-			ExtractFunc(file);
-		} else {
-			pool.push([file](int) {
-				ExtractFunc(file);
+				ExtractFunc(file, version);
+			}
+			else {
+				pool.push([file, version](int) {
+					ExtractFunc(file, version);
 					});
 			}
 		}

 		maxResources = xmlFiles.size();
 	}
+	else
+	{
+		std::string execStr = Util::format("assets/extractor/%s", isWindows() ? "ZAPD.exe" : "ZAPD.out");
+		std::string args = Util::format(" ed -eh -i %s -b tmp/rom.z64 -fl assets/extractor/filelists -o %s -osf %s -gsf 1 -rconf assets/extractor/Config_%s.xml -se OTR %s", path.c_str(), path + "../", path + "../", GetXMLVersion(version).c_str(), "");
+		ProcessResult result = NativeFS->LaunchProcess(execStr + args);
+
+		if (result.exitCode != 0) {
+			std::cout << "\nError when extracting the ROM with error code: " << result.exitCode << " !" << std::endl;
+			std::cout << "Aborting...\n" << std::endl;
+		}
+		else
+		{
+			printf("All done?\n");
+		}
+
+		maxResources = 1;
+	}
+}

 void updateWorker(const std::string& output) {
-	if (maxResources > 0 && !buildingOtr && extractedResources >= maxResources) {
+	if (maxResources > 0 && !buildingOtr && (extractedResources >= maxResources || !oldExtractMode)) 
+	{
 		setCurrentStep("Building OTR...");
 		if (skipFrames < 3) {
 			skipFrames++;
 			return;
 		}
 		buildingOtr = true;
-		if (single_thread){
+		
+		if (single_thread || !oldExtractMode){
 			BuildOTR(output);
 			return;
 		}
--- a/OTRGui/src/impl/extractor/extractor.h
+++ b/OTRGui/src/impl/extractor/extractor.h
@ -5,5 +5,7 @@ enum Platforms {
 	WINDOWS, LINUX
 };

-void startWorker();
+struct RomVersion;
+
+void startWorker(RomVersion version);
 void updateWorker(const std::string& output);
--- a/OTRGui/src/main.cpp
+++ b/OTRGui/src/main.cpp
@ -18,7 +18,7 @@ void UpdateDrawFrame(void) {

 int main() {
    constexpr Vector2 windowSize = Vector2(400, 200);
-    SetTargetFPS(144);
+    SetConfigFlags(FLAG_VSYNC_HINT);
    SetConfigFlags(FLAG_WINDOW_HIGHDPI);
    SetConfigFlags(FLAG_WINDOW_UNDECORATED);
    SetConfigFlags(FLAG_MSAA_4X_HINT);
@ -32,7 +32,7 @@ int main() {
    Game = new OTRGame();
    Game->preload();
    Game->init();
-    while(!WindowShouldClose()) {
+    while(!WindowShouldClose() && !Game->CloseRequested()) {
        UpdateDrawFrame();
    }
    CloseWindow();
--- a/OTRGui/src/utils/mutils.cpp
+++ b/OTRGui/src/utils/mutils.cpp
@ -72,7 +72,11 @@ namespace MoonUtils {
        vector<string> result;
        stringstream ss (s);
        string item;
-        while (getline(ss, item, delim)) {
+        while (getline(ss, item, delim)) 
+        {
+            if (item.at(item.size() - 1) == '\r')
+                item = item.substr(0, item.size() - 1);
+
            result.push_back (item);
        }
        return result;
--- a/README.md
+++ b/README.md
@ -7,9 +7,10 @@ The Ship does not include assets and as such requires a prior copy of the game t
 ## Quick Start

 1) Download The Ship of Harkinian from Discord.
-2) Get a ZRET OoT Debug ROM
+2) Requires an `oot debug` rom (not Master Quest).
 ```
-Build date: `zelda@srd022j 03-02-21 00:49:18`
+Build team: `zelda@srd022j`
+Build date: `03-02-21 00:49:18` (year-month-day)
 sha1: cee6bc3c2a634b41728f2af8da54d9bf8cc14099
 ```
 3) Use the OTRGui to generate an `oot.otr` archive file.
@ -50,54 +51,7 @@ Official Discord: https://discord.com/invite/BtBmd55HVH

 ## Building The Ship of Harkinian

-### Windows
-
- 1. Install [Python](https://www.python.org/ftp/python/3.10.2/python-3.10.2-amd64.exe)
- 2. Install [Visual Studio 2022 Community Edition](https://visualstudio.microsoft.com/vs/community/)
- 2b. In the Visual Studio Installer, install `MSVC v142 - VS 2019 C++`.
- 4. Clone the Ship of Harkinian repository.
- 5. Put your 2020 OoT debug rom in the `soh` folder.
- 6. Launch `soh/fixbaserom.py`.
- 7. Launch `soh/extract_baserom.py`.
- 8. Copy the `baserom` folder from the `soh` folder into the `OTRExporter` folder.
- 9. Run `OTRExporter/OTRExporter.sln`.
- 10. Switch the solution to `Release x64`.
- 11. Build the solution.
- 12. Launching `OTRExporter/extract_assets.py` will generate an `oot.otr` archive file in `OTRExporter/oot.otr`.
- 13. Run `soh/soh.sln`
- 14. Switch the solution to `Release x86`.
- 15. Build the solution.
- 16. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
- 17. Launch `soh.exe`.
-
-### Linux
-
-```bash
-# Clone the repo
-git clone git@github.com:HarbourMasters/ShipWright.git
-cd ShipWright
-# Copy the baserom to the soh folder
-cp .../baserom_non_mq.z64 soh
-# Build the docker image
-sudo docker build . -t soh
-# Run the docker image with the working directory mounted to /soh
-sudo docker run --rm -it -v $(pwd):/soh soh /bin/bash
-```
-Inside the Docker container:
-```bash
-# Clone and build StormLib
-git clone https://github.com/ladislav-zezula/StormLib external/StormLib
-cmake -B external/StormLib/build -S external/StormLib
-cmake --build external/StormLib/build
-cp external/StormLib/build/libstorm.a external
-cp /usr/local/lib/libGLEW.a external
-
-cd soh
-# Extract the assets/Compile the exporter/Run the exporter
-make setup -j$(nproc)
-# Compile the code
-make -j $(nproc)
-```
+Refer to the [building instructions](https://github.com/HarbourMasters/Shipwright/blob/develop/BUILDING.md) to compile SoH.

 ## Troubleshooting The Exporter
 - Affirm that you have an `/assets` folder filled with XMLs in the same directory as OTRGui.exe
@ -125,6 +79,7 @@ make -j $(nproc)
    Rrrrry123 		| Speedbunner, encouragement, and community moderation
    Fierce deity 		| Encouragement and community moderation
    mzxrules		| For his contributions to decomp
+    zel.		        | For his contributions to decomp
    Aloxado 		| Developer - General Programmer
    MegaMech 		| Developer - General Programmer
 	Revo 			| Tester - GCC support and General Testing
--- a/ZAPDTR/ZAPD/CRC32.h
+++ b/ZAPDTR/ZAPD/CRC32.h
@ -1,6 +1,6 @@
 #pragma once

-static uint32_t CRC32B(unsigned char* message, int32_t size)
+static uint32_t CRC32B(const unsigned char* message, int32_t size)
 {
 	int32_t byte, crc;
 	int32_t mask;
--- a/ZAPDTR/ZAPD/Declaration.cpp
+++ b/ZAPDTR/ZAPD/Declaration.cpp
@ -1,6 +1,7 @@
 #include "Declaration.h"

 #include "Globals.h"
+#include "ZVtx.h"
 #include "Utils/StringHelper.h"

 Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize,
@ -61,6 +62,12 @@ Declaration::Declaration(offset_t nAddress, const std::string& nIncludePath, siz
 	varName = nVarName;
 }

+Declaration::~Declaration()
+{
+	//for (auto item : vertexHack)
+		//delete item;
+}
+
 bool Declaration::IsStatic() const
 {
 	switch (staticConf)
--- a/ZAPDTR/ZAPD/Declaration.h
+++ b/ZAPDTR/ZAPD/Declaration.h
@ -22,6 +22,8 @@ enum class StaticConfig
 	On
 };

+class ZVtx;
+
 class Declaration
 {
 public:
@ -38,6 +40,8 @@ public:
 	std::string varName;
 	std::string includePath;

+	std::vector<ZVtx*> vertexHack;
+
 	bool isExternal = false;
 	bool isArray = false;
 	bool forceArrayCnt = false;
@ -65,6 +69,8 @@ public:
 	Declaration(offset_t nAddress, const std::string& nIncludePath, size_t nSize,
 	            const std::string& nVarType, const std::string& nVarName);

+	~Declaration();
+
 	bool IsStatic() const;

 	std::string GetNormalDeclarationStr() const;
--- a/ZAPDTR/ZAPD/FileWorker.cpp
+++ b/ZAPDTR/ZAPD/FileWorker.cpp
--- a/ZAPDTR/ZAPD/FileWorker.h
+++ b/ZAPDTR/ZAPD/FileWorker.h
@ -0,0 +1,15 @@
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+#include "ZFile.h"
+
+class FileWorker
+{
+public:
+	std::vector<ZFile*> files;
+	std::vector<ZFile*> externalFiles;
+	std::vector<int32_t> segments;
+	std::map<int32_t, std::vector<ZFile*>> segmentRefFiles;
+};
--- a/ZAPDTR/ZAPD/Globals.cpp
+++ b/ZAPDTR/ZAPD/Globals.cpp
@ -20,6 +20,7 @@ Globals::Globals()
 	profile = false;
 	useLegacyZDList = false;
 	useExternalResources = true;
+	singleThreaded = true;
 	verbosity = VerbosityLevel::VERBOSITY_SILENT;
 	outputPath = Directory::GetCurrentDirectory();
 }
@ -34,7 +35,21 @@ Globals::~Globals()
 	}
 }

-void Globals::AddSegment(int32_t segment, ZFile* file)
+void Globals::AddSegment(int32_t segment, ZFile* file, int workerID)
+{
+	if (!Globals::Instance->singleThreaded)
+	{
+		auto worker = workerData[workerID];
+
+		if (std::find(worker->segments.begin(), worker->segments.end(), segment) ==
+		    worker->segments.end())
+			worker->segments.push_back(segment);
+		if (worker->segmentRefFiles.find(segment) == worker->segmentRefFiles.end())
+			worker->segmentRefFiles[segment] = std::vector<ZFile*>();
+
+		worker->segmentRefFiles[segment].push_back(file);
+	}
+	else
 	{
 		if (std::find(segments.begin(), segments.end(), segment) == segments.end())
 			segments.push_back(segment);
@ -43,15 +58,34 @@ void Globals::AddSegment(int32_t segment, ZFile* file)

 		cfg.segmentRefFiles[segment].push_back(file);
 	}
+}

-bool Globals::HasSegment(int32_t segment)
+bool Globals::HasSegment(int32_t segment, int workerID)
 {
+	if (!Globals::Instance->singleThreaded)
+		return std::find(workerData[workerID]->segments.begin(),
+		                 workerData[workerID]->segments.end(), segment) != workerData[workerID]->segments.end();
+	else
 		return std::find(segments.begin(), segments.end(), segment) != segments.end();
 }

-ZFile* Globals::GetSegment(int32_t segment)
+ZFile* Globals::GetSegment(int32_t segment, int workerID)
 {
-	if (HasSegment(segment))
+	if (!Globals::Instance->singleThreaded)
+	{
+		if (HasSegment(segment, workerID))
+		{
+			int idx = std::find(workerData[workerID]->segments.begin(),
+			                    workerData[workerID]->segments.end(), segment) -
+			          workerData[workerID]->segments.begin();
+			return workerData[workerID]->files[idx];
+		}
+		else
+			return nullptr;
+	}
+	else
+	{
+		if (HasSegment(segment, workerID))
 		{
 			int idx = std::find(segments.begin(), segments.end(), segment) - segments.begin();
 			return files[idx];
@ -59,6 +93,31 @@ ZFile* Globals::GetSegment(int32_t segment)
 		else
 			return nullptr;
 	}
+}
+
+std::map<int32_t, std::vector<ZFile*>> Globals::GetSegmentRefFiles(int workerID)
+{
+	if (!Globals::Instance->singleThreaded)
+		return workerData[workerID]->segmentRefFiles;
+	else
+		return cfg.segmentRefFiles;
+}
+
+void Globals::AddFile(ZFile* file, int workerID)
+{
+	if (singleThreaded)
+		files.push_back(file);
+	else
+		workerData[workerID]->files.push_back(file);
+}
+
+void Globals::AddExternalFile(ZFile* file, int workerID)
+{
+	if (singleThreaded)
+		externalFiles.push_back(file);
+	else
+		workerData[workerID]->externalFiles.push_back(file);
+}

 std::map<std::string, ExporterSet*>& Globals::GetExporterMap()
 {
@ -93,8 +152,22 @@ ExporterSet* Globals::GetExporterSet()
 		return nullptr;
 }

+std::vector<uint8_t> Globals::GetBaseromFile(std::string fileName)
+{
+	if (fileMode == ZFileMode::ExtractDirectory)
+	{
+		if (StringHelper::Contains(fileName, "baserom/"))
+			fileName = StringHelper::Split(fileName, "baserom/")[1];
+
+		return rom->GetFile(fileName);
+
+	}
+	else
+		return File::ReadAllBytes(fileName);
+}
+
 bool Globals::GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile,
-                                  const std::string& expectedType, std::string& declName)
+                                  const std::string& expectedType, std::string& declName, int workerID)
 {
 	if (segAddress == 0)
 	{
@ -130,9 +203,11 @@ bool Globals::GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile,
 		if (currentFile->GetDeclarationPtrName(segAddress, expectedType, declName))
 			return true;
 	}
-	else if (HasSegment(segment))
+	else if (HasSegment(segment, workerID))
 	{
-		for (auto file : cfg.segmentRefFiles[segment])
+		// OTRTODO: Multithreading
+		auto segs = GetSegmentRefFiles(workerID);
+		for (auto file : segs[segment])
 		{
 			offset = Seg2Filespace(segAddress, file->baseAddress);

@ -176,7 +251,7 @@ bool Globals::GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile,

 bool Globals::GetSegmentedArrayIndexedName(segptr_t segAddress, size_t elementSize,
                                           ZFile* currentFile, const std::string& expectedType,
-                                           std::string& declName)
+                                           std::string& declName, int workerID)
 {
 	if (segAddress == 0)
 	{
@ -193,9 +268,11 @@ bool Globals::GetSegmentedArrayIndexedName(segptr_t segAddress, size_t elementSi
 		if (addressFound)
 			return true;
 	}
-	else if (HasSegment(segment))
+	else if (HasSegment(segment, workerID))
 	{
-		for (auto file : cfg.segmentRefFiles[segment])
+		// OTRTODO: Multithreading
+		auto segs = GetSegmentRefFiles(workerID);
+		for (auto file : segs[segment])
 		{
 			if (file->IsSegmentedInFilespaceRange(segAddress))
 			{
--- a/ZAPDTR/ZAPD/Globals.h
+++ b/ZAPDTR/ZAPD/Globals.h
@ -5,6 +5,8 @@
 #include <vector>
 #include "GameConfig.h"
 #include "ZFile.h"
+#include <ZRom.h>
+#include <FileWorker.h>

 class ZRoom;

@ -36,6 +38,7 @@ public:
 	ExporterSetFuncVoid3 beginXMLFunc = nullptr;
 	ExporterSetFuncVoid3 endXMLFunc = nullptr;
 	ExporterSetResSave resSaveFunc = nullptr;
+	ExporterSetFuncVoid3 endProgramFunc = nullptr;
 };

 class Globals
@ -49,9 +52,10 @@ public:
 	bool outputCrc = false;
 	bool profile;  // Measure performance of certain operations
 	bool useLegacyZDList;
+	bool singleThreaded;
 	VerbosityLevel verbosity;  // ZAPD outputs additional information
 	ZFileMode fileMode;
-	fs::path baseRomPath, inputPath, outputPath, sourceOutputPath, cfgPath;
+	fs::path baseRomPath, inputPath, outputPath, sourceOutputPath, cfgPath, fileListPath;
 	TextureType texType;
 	ZGame game;
 	GameConfig cfg;
@ -61,10 +65,13 @@ public:
 	bool forceUnaccountedStatic = false;
 	bool otrMode = true;

+	ZRom* rom;
 	std::vector<ZFile*> files;
 	std::vector<ZFile*> externalFiles;
 	std::vector<int32_t> segments;

+	std::map<int, FileWorker*> workerData;
+
 	std::string currentExporter;
 	static std::map<std::string, ExporterSet*>& GetExporterMap();
 	static void AddExporter(std::string exporterName, ExporterSet* exporterSet);
@ -72,13 +79,18 @@ public:
 	Globals();
 	~Globals();

-	void AddSegment(int32_t segment, ZFile* file);
-	bool HasSegment(int32_t segment);
-	ZFile* GetSegment(int32_t segment);
+	void AddSegment(int32_t segment, ZFile* file, int workerID);
+	bool HasSegment(int32_t segment, int workerID);
+	ZFile* GetSegment(int32_t segment, int workerID);
+	std::map<int32_t, std::vector<ZFile*>> GetSegmentRefFiles(int workerID);
+	void AddFile(ZFile* file, int workerID);
+	void AddExternalFile(ZFile* file, int workerID);

 	ZResourceExporter* GetExporter(ZResourceType resType);
 	ExporterSet* GetExporterSet();

+	std::vector<uint8_t> GetBaseromFile(std::string fileName);
+
 	/**
 	 * Search in every file (and the symbol map) for the `segAddress` passed as parameter.
 	 * If the segment of `currentFile` is the same segment of `segAddress`, then that file will be
@ -88,8 +100,8 @@ public:
 	 * in which case `declName` will be set to the address formatted as a pointer.
 	 */
 	bool GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile,
-	                         const std::string& expectedType, std::string& declName);
+	                         const std::string& expectedType, std::string& declName, int workerID);

 	bool GetSegmentedArrayIndexedName(segptr_t segAddress, size_t elementSize, ZFile* currentFile,
-	                                  const std::string& expectedType, std::string& declName);
+	                                  const std::string& expectedType, std::string& declName, int workerID);
 };
--- a/ZAPDTR/ZAPD/Main.cpp
+++ b/ZAPDTR/ZAPD/Main.cpp
@ -23,6 +23,7 @@
 #include <string>
 #include <string_view>
 #include "tinyxml2.h"
+#include <ctpl_stl.h>

 //extern const char gBuildHash[];
 const char gBuildHash[] = "";
@ -43,11 +44,14 @@ extern "C" int ResourceMgr_OTRSigCheck(char* imgData)


 bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path& outPath,
-           ZFileMode fileMode);
+           ZFileMode fileMode, int workerID);

 void BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath);
 void BuildAssetBackground(const fs::path& imageFilePath, const fs::path& outPath);
 void BuildAssetBlob(const fs::path& blobFilePath, const fs::path& outPath);
+int ExtractFunc(int workerID, int fileListSize, std::string fileListItem, ZFileMode fileMode);
+
+volatile int numWorkersLeft = 0;

 #if !defined(_MSC_VER) && !defined(__CYGWIN__)
 #define ARRAY_COUNT(arr) (sizeof(arr) / sizeof(arr[0]))
@ -197,6 +201,10 @@ int main(int argc, char* argv[])
 		{
 			Globals::Instance->cfgPath = argv[++i];
 		}
+		else if (arg == "-fl")  // Set baserom filelist path
+		{
+			Globals::Instance->fileListPath = argv[++i];
+		}
 		else if (arg == "-rconf")  // Read Config File
 		{
 			Globals::Instance->cfg.ReadConfigFile(argv[++i]);
@ -207,10 +215,12 @@ int main(int argc, char* argv[])
 			signal(SIGSEGV, ErrorHandler);
 			signal(SIGABRT, ErrorHandler);
 #else
-			HANDLE_WARNING(WarningType::Always,
-			               "tried to set error handler, but this ZAPD build lacks support for one",
-			               "");
+			// HANDLE_WARNING(WarningType::Always,
+			//                "tried to set error handler, but this ZAPD build lacks support for one",
+			//                "");
 #endif
+
+
 		}
 		else if (arg == "-v")  // Verbose
 		{
@ -255,6 +265,8 @@ int main(int argc, char* argv[])
 		fileMode = ZFileMode::BuildBlob;
 	else if (buildMode == "e")
 		fileMode = ZFileMode::Extract;
+	else if (buildMode == "ed")
+		fileMode = ZFileMode::ExtractDirectory;
 	else if (exporterSet != nullptr && exporterSet->parseFileModeFunc != nullptr)
 		exporterSet->parseFileModeFunc(buildMode, fileMode);

@ -264,6 +276,11 @@ int main(int argc, char* argv[])
 		return 1;
 	}

+	Globals::Instance->fileMode = fileMode;
+
+	if (fileMode == ZFileMode::ExtractDirectory)
+		Globals::Instance->rom = new ZRom(Globals::Instance->baseRomPath.string());
+
 	// We've parsed through our commands once. If an exporter exists, it's been set by now.
 	// Now we'll parse through them again but pass them on to our exporter if one is available.

@ -282,7 +299,7 @@ int main(int argc, char* argv[])
 	}

 	// TODO: switch
-	if (fileMode == ZFileMode::Extract || fileMode == ZFileMode::BuildSourceFile)
+	if (fileMode == ZFileMode::Extract || fileMode == ZFileMode::BuildSourceFile || fileMode == ZFileMode::ExtractDirectory)
 	{
 		bool procFileModeSuccess = false;

@ -290,6 +307,59 @@ int main(int argc, char* argv[])
 			procFileModeSuccess = exporterSet->processFileModeFunc(fileMode);

 		if (!procFileModeSuccess)
+		{
+			if (fileMode == ZFileMode::ExtractDirectory)
+			{
+				std::vector<std::string> fileList =
+					Directory::ListFiles(Globals::Instance->inputPath.string());
+
+				const int num_threads = std::thread::hardware_concurrency();
+				ctpl::thread_pool pool(num_threads / 2);
+
+				bool parseSuccessful;
+
+				auto start = std::chrono::steady_clock::now();
+				int fileListSize = fileList.size();
+				Globals::Instance->singleThreaded = false;
+
+				for (int i = 0; i < fileListSize; i++)
+					Globals::Instance->workerData[i] = new FileWorker();
+
+				numWorkersLeft = fileListSize;
+
+				for (int i = 0; i < fileListSize; i++)
+				{
+					if (Globals::Instance->singleThreaded)
+					{
+						ExtractFunc(i, fileList.size(), fileList[i], fileMode);
+					}
+					else
+					{
+						std::string fileListItem = fileList[i];
+						pool.push([i, fileListSize, fileListItem, fileMode](int) {
+							ExtractFunc(i, fileListSize, fileListItem, fileMode);
+						});
+					}
+				}
+
+				if (!Globals::Instance->singleThreaded)
+				{
+					while (true)
+					{
+						if (numWorkersLeft <= 0)
+							break;
+
+						std::this_thread::sleep_for(std::chrono::milliseconds(250));
+					}
+				}
+
+				auto end = std::chrono::steady_clock::now();
+				auto diff =
+					std::chrono::duration_cast<std::chrono::seconds>(end - start).count();
+
+				printf("Generated OTR File Data in %i seconds\n", diff);
+ 			}
+			else
 			{
 				bool parseSuccessful;

@ -305,18 +375,20 @@ int main(int argc, char* argv[])
 					}

 					parseSuccessful = Parse(externalXmlFilePath, Globals::Instance->baseRomPath,
-				                        extFile.outPath, ZFileMode::ExternalFile);
+					                        extFile.outPath, ZFileMode::ExternalFile, 0);

 					if (!parseSuccessful)
 						return 1;
 				}

-			parseSuccessful = Parse(Globals::Instance->inputPath, Globals::Instance->baseRomPath,
-			                        Globals::Instance->outputPath, fileMode);
+				parseSuccessful =
+					Parse(Globals::Instance->inputPath, Globals::Instance->baseRomPath,
+				          Globals::Instance->outputPath, fileMode, 0);
 				if (!parseSuccessful)
 					return 1;
 			}
 		}
+	}
 	else if (fileMode == ZFileMode::BuildTexture)
 	{
 		TextureType texType = Globals::Instance->texType;
@ -330,23 +402,77 @@ int main(int argc, char* argv[])
 	{
 		BuildAssetBlob(Globals::Instance->inputPath, Globals::Instance->outputPath);
 	}
-	else if (fileMode == ZFileMode::BuildOverlay)
-	{
-		ZOverlay* overlay =
-			ZOverlay::FromBuild(Path::GetDirectoryName(Globals::Instance->inputPath),
-		                        Path::GetDirectoryName(Globals::Instance->cfgPath));

-		if (overlay != nullptr)
-			File::WriteAllText(Globals::Instance->outputPath.string(),
-			                   overlay->GetSourceOutputCode(""));
-	}
+	if (exporterSet != nullptr && exporterSet->endProgramFunc != nullptr)
+		exporterSet->endProgramFunc();

 	delete g;
 	return 0;
 }

+int ExtractFunc(int workerID, int fileListSize, std::string fileListItem, ZFileMode fileMode)
+{
+	bool parseSuccessful;
+
+	printf("(%i / %i): %s\n", (workerID + 1), fileListSize, fileListItem.c_str());
+
+	for (auto& extFile : Globals::Instance->cfg.externalFiles)
+	{
+		fs::path externalXmlFilePath = Globals::Instance->cfg.externalXmlFolder / extFile.xmlPath;
+
+		if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO)
+		{
+			printf("Parsing external file from config: '%s'\n", externalXmlFilePath.c_str());
+		}
+
+		parseSuccessful = Parse(externalXmlFilePath, Globals::Instance->baseRomPath,
+		                        extFile.outPath, ZFileMode::ExternalFile, workerID);
+
+		if (!parseSuccessful)
+			return 1;
+	}
+
+	parseSuccessful = Parse(fileListItem, Globals::Instance->baseRomPath,
+	                        Globals::Instance->outputPath, fileMode, workerID);
+
+	if (!parseSuccessful)
+		return 1;
+
+	if (Globals::Instance->singleThreaded)
+	{
+		for (int i = 0; i < Globals::Instance->files.size(); i++)
+		{
+			delete Globals::Instance->files[i];
+			Globals::Instance->files.erase(Globals::Instance->files.begin() + i);
+			i--;
+		}
+
+		Globals::Instance->externalFiles.clear();
+		Globals::Instance->segments.clear();
+		Globals::Instance->cfg.segmentRefFiles.clear();
+	}
+	else
+	{
+		for (int i = 0; i < Globals::Instance->workerData[workerID]->files.size(); i++)
+		{
+			delete Globals::Instance->workerData[workerID]->files[i];
+			Globals::Instance->workerData[workerID]->files.erase(
+				Globals::Instance->workerData[workerID]->files.begin() +
+			                               i);
+			i--;
+		}
+
+		Globals::Instance->workerData[workerID]->externalFiles.clear();
+		Globals::Instance->workerData[workerID]->segments.clear();
+		Globals::Instance->workerData[workerID]->segmentRefFiles.clear();
+
+		numWorkersLeft--;
+	}
+	return 0;
+}
+
 bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path& outPath,
-           ZFileMode fileMode)
+           ZFileMode fileMode, int workerID)
 {
 	tinyxml2::XMLDocument doc;
 	tinyxml2::XMLError eResult = doc.LoadFile(xmlFilePath.string().c_str());
@ -374,11 +500,11 @@ bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path
 	{
 		if (std::string_view(child->Name()) == "File")
 		{
-			ZFile* file = new ZFile(fileMode, child, basePath, outPath, "", xmlFilePath);
-			Globals::Instance->files.push_back(file);
+			ZFile* file = new ZFile(fileMode, child, basePath, outPath, "", xmlFilePath, workerID);
+			Globals::Instance->AddFile(file, workerID);
 			if (fileMode == ZFileMode::ExternalFile)
 			{
-				Globals::Instance->externalFiles.push_back(file);
+				Globals::Instance->AddExternalFile(file, workerID);
 				file->isExternalFile = true;
 			}
 		}
@ -411,7 +537,7 @@ bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path
 			}

 			// Recursion. What can go wrong?
-			Parse(externalXmlFilePath, basePath, externalOutFilePath, ZFileMode::ExternalFile);
+			Parse(externalXmlFilePath, basePath, externalOutFilePath, ZFileMode::ExternalFile, workerID);
 		}
 		else
 		{
@ -430,7 +556,14 @@ bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path
 		if (exporterSet != nullptr && exporterSet->beginXMLFunc != nullptr)
 			exporterSet->beginXMLFunc();

-		for (ZFile* file : Globals::Instance->files)
+		std::vector<ZFile*> files;
+
+		if (Globals::Instance->singleThreaded)
+			files = Globals::Instance->files;
+		else
+			files = Globals::Instance->workerData[workerID]->files;
+
+		for (ZFile* file : files)
 		{
 			if (fileMode == ZFileMode::BuildSourceFile)
 				file->BuildSourceFile();
--- a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp
+++ b/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp
@ -199,8 +199,10 @@ std::string Struct_800A598C::GetBodySourceCode() const
 {
 	std::string unk_8_Str;
 	std::string unk_C_Str;
-	Globals::Instance->GetSegmentedPtrName(unk_8, parent, "Struct_800A57C0", unk_8_Str);
-	Globals::Instance->GetSegmentedPtrName(unk_C, parent, "Struct_800A598C_2", unk_C_Str);
+	Globals::Instance->GetSegmentedPtrName(unk_8, parent, "Struct_800A57C0", unk_8_Str,
+	                                       parent->workerID);
+	Globals::Instance->GetSegmentedPtrName(unk_C, parent, "Struct_800A598C_2", unk_C_Str,
+	                                       parent->workerID);

 	std::string entryStr = StringHelper::Sprintf("\n\t\tARRAY_COUNTU(%s), ARRAY_COUNTU(%s),\n",
 	                                             unk_8_Str.c_str(), unk_C_Str.c_str());
@ -316,8 +318,9 @@ std::string Struct_800A5E28::GetBodySourceCode() const
 {
 	std::string unk_4_Str;
 	std::string unk_8_Str;
-	Globals::Instance->GetSegmentedPtrName(unk_4, parent, "Struct_800A598C", unk_4_Str);
-	Globals::Instance->GetSegmentedPtrName(unk_8, parent, "Gfx", unk_8_Str);
+	Globals::Instance->GetSegmentedPtrName(unk_4, parent, "Struct_800A598C", unk_4_Str,
+	                                       parent->workerID);
+	Globals::Instance->GetSegmentedPtrName(unk_8, parent, "Gfx", unk_8_Str, parent->workerID);

 	std::string entryStr = "\n";
 	entryStr += StringHelper::Sprintf("\t%i, ARRAY_COUNTU(%s),\n", unk_0, unk_4_Str.c_str());
--- a/ZAPDTR/ZAPD/OutputFormatter.cpp
+++ b/ZAPDTR/ZAPD/OutputFormatter.cpp
@ -3,7 +3,7 @@

 void OutputFormatter::Flush()
 {
-	//if (!Globals::Instance->otrMode)
+	//if (!Globals::Instance->otrMode) // OTRTODO: MULTITHREADING
 	{
 		if (col > lineLimit && !Globals::Instance->otrMode)
 		{
@ -31,6 +31,10 @@ void OutputFormatter::Flush()

 int OutputFormatter::Write(const char* buf, int count)
 {
+	// OTRTODO
+	//if (!Globals::Instance->singleThreaded)
+		//return 0;
+
 	for (int i = 0; i < count; i++)
 	{
 		char c = buf[i];
@ -92,7 +96,7 @@ int OutputFormatter::Write(const std::string& buf)
 	return Write(buf.data(), buf.size());
 }

-OutputFormatter* OutputFormatter::Instance;
+__thread OutputFormatter* OutputFormatter::Instance;

 int OutputFormatter::WriteStatic(const char* buf, int count)
 {
--- a/ZAPDTR/ZAPD/OutputFormatter.h
+++ b/ZAPDTR/ZAPD/OutputFormatter.h
@ -25,7 +25,7 @@ private:

 	void Flush();

-	static OutputFormatter* Instance;
+	static __thread OutputFormatter* Instance;
 	static int WriteStatic(const char* buf, int count);

 public:
--- a/ZAPDTR/ZAPD/Overlays/ZOverlay.cpp
+++ b/ZAPDTR/ZAPD/Overlays/ZOverlay.cpp
@ -1,3 +1,4 @@
+#if 0
 #include "ZOverlay.h"

 #include <cassert>
@ -350,3 +351,4 @@ ELFIO::Elf_Half ZOverlay::FindSymbolInSection(const std::string& curSymName,
 	}
 	return SHN_UNDEF;
 }
+#endif
--- a/ZAPDTR/ZAPD/Overlays/ZOverlay.h
+++ b/ZAPDTR/ZAPD/Overlays/ZOverlay.h
@ -1,5 +1,7 @@
 #pragma once

+#if 0
+
 #include "Utils/Directory.h"
 #include "ZResource.h"
 #include "elfio/elfio.hpp"
@ -73,3 +75,4 @@ private:
 	ELFIO::Elf_Half FindSymbolInSection(const std::string& curSymName, ELFIO::section* sectionData,
 	                                    ELFIO::elfio& reader, size_t readerId);
 };
+#endif
--- a/ZAPDTR/ZAPD/ZAPD.vcxproj
+++ b/ZAPDTR/ZAPD/ZAPD.vcxproj
@ -74,15 +74,29 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LibraryPath>$(OutDir);$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\..\OTRExporter\packages\libpng-v142.1.6.37.2\build\native\lib\x64\v142\Debug\;$(ProjectDir)..\..\libultraship\libultraship\;$(LibraryPath)</LibraryPath>
    <IncludePath>$(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(IncludePath)</IncludePath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <IncludePath>$(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(IncludePath)</IncludePath>
    <LibraryPath>$(OutDir);$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\..\OTRExporter\packages\libpng-v142.1.6.37.2\build\native\lib\x64\v142\Debug\;$(ProjectDir)..\..\libultraship\libultraship\;$(LibraryPath)</LibraryPath>
    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <IncludePath>$(SolutionDir)ZAPD\lib\tinyxml2;$(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)ZAPD\lib\elfio;$(SolutionDir)ZAPD\lib\stb;$(ProjectDir);$(IncludePath)</IncludePath>
    <LibraryPath>$(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)x64\Debug;$(SolutionDir)packages\libpng.1.6.28.1\build\native\lib\x64\v140\dynamic\Debug;$(LibraryPath)</LibraryPath>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@ -170,6 +184,7 @@
    <ClCompile Include="..\lib\libgfxd\uc_f3dex2.c" />
    <ClCompile Include="..\lib\libgfxd\uc_f3dexb.c" />
    <ClCompile Include="Declaration.cpp" />
+    <ClCompile Include="FileWorker.cpp" />
    <ClCompile Include="GameConfig.cpp" />
    <ClCompile Include="Globals.cpp" />
    <ClCompile Include="ImageBackend.cpp" />
@ -178,6 +193,7 @@
    <ClCompile Include="OutputFormatter.cpp" />
    <ClCompile Include="Overlays\ZOverlay.cpp" />
    <ClCompile Include="WarningHandler.cpp" />
+    <ClCompile Include="yaz0\yaz0.cpp" />
    <ClCompile Include="ZArray.cpp" />
    <ClCompile Include="ZBackground.cpp" />
    <ClCompile Include="ZCutsceneMM.cpp" />
@ -185,6 +201,7 @@
    <ClCompile Include="ZMtx.cpp" />
    <ClCompile Include="ZPath.cpp" />
    <ClCompile Include="ZPlayerAnimationData.cpp" />
+    <ClCompile Include="ZRom.cpp" />
    <ClCompile Include="ZRoom\Commands\SetActorCutsceneList.cpp" />
    <ClCompile Include="ZRoom\Commands\SetAnimatedMaterialList.cpp" />
    <ClCompile Include="ZRoom\Commands\SetCsCamera.cpp" />
@ -257,7 +274,9 @@
    <ClInclude Include="..\lib\stb\stb_image_write.h" />
    <ClInclude Include="..\lib\stb\tinyxml2.h" />
    <ClInclude Include="CRC32.h" />
+    <ClInclude Include="ctpl_stl.h" />
    <ClInclude Include="Declaration.h" />
+    <ClInclude Include="FileWorker.h" />
    <ClInclude Include="GameConfig.h" />
    <ClInclude Include="Globals.h" />
    <ClInclude Include="ImageBackend.h" />
@ -265,6 +284,8 @@
    <ClInclude Include="OutputFormatter.h" />
    <ClInclude Include="Overlays\ZOverlay.h" />
    <ClInclude Include="WarningHandler.h" />
+    <ClInclude Include="yaz0\readwrite.h" />
+    <ClInclude Include="yaz0\yaz0.h" />
    <ClInclude Include="ZAnimation.h" />
    <ClInclude Include="ZArray.h" />
    <ClInclude Include="ZBackground.h" />
@ -278,6 +299,7 @@
    <ClInclude Include="ZMtx.h" />
    <ClInclude Include="ZPath.h" />
    <ClInclude Include="ZPlayerAnimationData.h" />
+    <ClInclude Include="ZRom.h" />
    <ClInclude Include="ZRoom\Commands\SetActorCutsceneList.h" />
    <ClInclude Include="ZRoom\Commands\SetAnimatedMaterialList.h" />
    <ClInclude Include="ZRoom\Commands\SetCsCamera.h" />
@ -334,6 +356,12 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\OTRGui\build\ZERO_CHECK.vcxproj">
+      <Project>{02d10590-9542-3f55-aaf8-6055677e2a2a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
    <Import Project="..\..\OTRExporter\packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\..\OTRExporter\packages\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" />
--- a/ZAPDTR/ZAPD/ZAPD.vcxproj.filters
+++ b/ZAPDTR/ZAPD/ZAPD.vcxproj.filters
@ -58,6 +58,12 @@
    <Filter Include="NuGet">
      <UniqueIdentifier>{730beb67-6d59-4849-9d9b-702c4a565fc0}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Source Files\Yaz0">
+      <UniqueIdentifier>{b26457d2-cdb8-4c92-9ed7-a55bf6d3619e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Yaz0">
+      <UniqueIdentifier>{9651a041-1019-4486-9e90-1dccfa9471e9}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="Main.cpp">
@ -282,6 +288,15 @@
    <ClCompile Include="ZText.cpp">
      <Filter>Source Files\Z64</Filter>
    </ClCompile>
+    <ClCompile Include="ZRom.cpp">
+      <Filter>Source Files\Z64</Filter>
+    </ClCompile>
+    <ClCompile Include="yaz0\yaz0.cpp">
+      <Filter>Source Files\Yaz0</Filter>
+    </ClCompile>
+    <ClCompile Include="FileWorker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="ZRoom\ZRoom.h">
@ -539,6 +554,21 @@
    <ClInclude Include="ZText.h">
      <Filter>Header Files\Z64</Filter>
    </ClInclude>
+    <ClInclude Include="ZRom.h">
+      <Filter>Header Files\Z64</Filter>
+    </ClInclude>
+    <ClInclude Include="yaz0\readwrite.h">
+      <Filter>Header Files\Yaz0</Filter>
+    </ClInclude>
+    <ClInclude Include="yaz0\yaz0.h">
+      <Filter>Header Files\Yaz0</Filter>
+    </ClInclude>
+    <ClInclude Include="FileWorker.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ctpl_stl.h">
+      <Filter>Header Files\Libraries</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Text Include="..\SymbolMap_OoTMqDbg.txt">
--- a/ZAPDTR/ZAPD/ZAnimation.cpp
+++ b/ZAPDTR/ZAPD/ZAnimation.cpp
@ -112,6 +112,8 @@ void ZNormalAnimation::DeclareReferences(const std::string& prefix)
 	const uint8_t lineLength = 14;
 	const uint8_t offset = 0;

+	if (!Globals::Instance->otrMode)
+	{
 		for (size_t i = 0; i < rotationValues.size(); i++)
 		{
 			valuesStr += StringHelper::Sprintf("0x%04X, ", rotationValues[i]);
@ -119,20 +121,25 @@ void ZNormalAnimation::DeclareReferences(const std::string& prefix)
 			if ((i - offset + 1) % lineLength == 0)
 				valuesStr += "\n    ";
 		}
+	}

 	parent->AddDeclarationArray(rotationValuesOffset, DeclarationAlignment::Align4,
 	                            rotationValues.size() * 2, "s16",
 	                            StringHelper::Sprintf("%sFrameData", defaultPrefix.c_str()),
 	                            rotationValues.size(), valuesStr);

+	if (!Globals::Instance->otrMode)
+	{
 		for (size_t i = 0; i < rotationIndices.size(); i++)
 		{
-		indicesStr += StringHelper::Sprintf("    { 0x%04X, 0x%04X, 0x%04X },", rotationIndices[i].x,
+			indicesStr +=
+				StringHelper::Sprintf("    { 0x%04X, 0x%04X, 0x%04X },", rotationIndices[i].x,
 			                          rotationIndices[i].y, rotationIndices[i].z);

 			if (i != (rotationIndices.size() - 1))
 				indicesStr += "\n";
 		}
+	}

 	parent->AddDeclarationArray(rotationIndicesOffset, DeclarationAlignment::Align4,
 	                            rotationIndices.size() * 6, "JointIndex",
@ -143,10 +150,11 @@ void ZNormalAnimation::DeclareReferences(const std::string& prefix)
 std::string ZNormalAnimation::GetBodySourceCode() const
 {
 	std::string frameDataName;
-	Globals::Instance->GetSegmentedPtrName(rotationValuesSeg, parent, "s16", frameDataName);
+	Globals::Instance->GetSegmentedPtrName(rotationValuesSeg, parent, "s16", frameDataName,
+	                                       parent->workerID);
 	std::string jointIndicesName;
 	Globals::Instance->GetSegmentedPtrName(rotationIndicesSeg, parent, "JointIndex",
-	                                       jointIndicesName);
+	                                       jointIndicesName, parent->workerID);

 	std::string headerStr =
 		StringHelper::Sprintf("\n\t{ %i }, %s,\n", frameCount, frameDataName.c_str());
@ -183,7 +191,7 @@ void ZLinkAnimation::ParseRawData()
 std::string ZLinkAnimation::GetBodySourceCode() const
 {
 	std::string segSymbol;
-	Globals::Instance->GetSegmentedPtrName(segmentAddress, parent, "", segSymbol);
+	Globals::Instance->GetSegmentedPtrName(segmentAddress, parent, "", segSymbol, parent->workerID);

 	return StringHelper::Sprintf("\n\t{ %i }, %s\n", frameCount, segSymbol.c_str());
 }
@ -383,12 +391,13 @@ void ZCurveAnimation::DeclareReferences(const std::string& prefix)
 std::string ZCurveAnimation::GetBodySourceCode() const
 {
 	std::string refIndexStr;
-	Globals::Instance->GetSegmentedPtrName(refIndex, parent, "u8", refIndexStr);
+	Globals::Instance->GetSegmentedPtrName(refIndex, parent, "u8", refIndexStr, parent->workerID);
 	std::string transformDataStr;
 	Globals::Instance->GetSegmentedPtrName(transformData, parent, "TransformData",
-	                                       transformDataStr);
+	                                       transformDataStr, parent->workerID);
 	std::string copyValuesStr;
-	Globals::Instance->GetSegmentedPtrName(copyValues, parent, "s16", copyValuesStr);
+	Globals::Instance->GetSegmentedPtrName(copyValues, parent, "s16", copyValuesStr,
+	                                       parent->workerID);

 	return StringHelper::Sprintf("\n\t%s,\n\t%s,\n\t%s,\n\t%i, %i\n", refIndexStr.c_str(),
 	                             transformDataStr.c_str(), copyValuesStr.c_str(), unk_0C, unk_10);
@ -510,8 +519,10 @@ std::string ZLegacyAnimation::GetBodySourceCode() const

 	std::string frameDataName;
 	std::string jointKeyName;
-	Globals::Instance->GetSegmentedPtrName(frameData, parent, "s16", frameDataName);
-	Globals::Instance->GetSegmentedPtrName(jointKey, parent, "JointKey", jointKeyName);
+	Globals::Instance->GetSegmentedPtrName(frameData, parent, "s16", frameDataName,
+	                                       parent->workerID);
+	Globals::Instance->GetSegmentedPtrName(jointKey, parent, "JointKey", jointKeyName,
+	                                       parent->workerID);

 	body += StringHelper::Sprintf("\t%i, %i,\n", frameCount, limbCount);
 	body += StringHelper::Sprintf("\t%s,\n", frameDataName.c_str());
--- a/ZAPDTR/ZAPD/ZArray.cpp
+++ b/ZAPDTR/ZAPD/ZArray.cpp
@ -102,8 +102,7 @@ std::string ZArray::GetBodySourceCode() const
 		const auto& res = resList[i];
 		output += "\t";

-		if (res->GetResourceType() == ZResourceType::Scalar ||
-		    res->GetResourceType() == ZResourceType::Vertex)
+		if (res->GetResourceType() == ZResourceType::Scalar || res->GetResourceType() == ZResourceType::Vertex)
 			output += resList.at(i)->GetBodySourceCode();
 		else
 			output += StringHelper::Sprintf("{ %s }", resList.at(i)->GetBodySourceCode().c_str());
--- a/ZAPDTR/ZAPD/ZBackground.cpp
+++ b/ZAPDTR/ZAPD/ZBackground.cpp
@ -149,10 +149,13 @@ std::string ZBackground::GetExternalExtension() const
 }

 void ZBackground::Save(const fs::path& outFolder)
+{
+	if (!Globals::Instance->otrMode)
 	{
 		fs::path filepath = outFolder / (outName + "." + GetExternalExtension());
 		File::WriteAllBytes(filepath.string(), data);
 	}
+}

 std::string ZBackground::GetBodySourceCode() const
 {
--- a/ZAPDTR/ZAPD/ZCollision.cpp
+++ b/ZAPDTR/ZAPD/ZCollision.cpp
@ -96,6 +96,8 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix)
 		auxName = GetDefaultName(prefix);

 	if (waterBoxes.size() > 0)
+	{
+		if (!Globals::Instance->otrMode)
 		{
 			for (size_t i = 0; i < waterBoxes.size(); i++)
 			{
@ -104,6 +106,7 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix)
 				if (i + 1 < waterBoxes.size())
 					declaration += "\n";
 			}
+		}

 		parent->AddDeclarationArray(
 			waterBoxSegmentOffset, DeclarationAlignment::Align4, 16 * waterBoxes.size(), "WaterBox",
@ -115,6 +118,8 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix)
 	{
 		declaration.clear();

+		if (!Globals::Instance->otrMode)
+		{
 			for (size_t i = 0; i < polygons.size(); i++)
 			{
 				declaration += StringHelper::Sprintf(
@ -124,6 +129,7 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix)
 				if (i + 1 < polygons.size())
 					declaration += "\n";
 			}
+		}

 		parent->AddDeclarationArray(
 			polySegmentOffset, DeclarationAlignment::Align4, polygons.size() * 16, "CollisionPoly",
@ -132,6 +138,8 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix)
 	}

 	declaration.clear();
+	if (!Globals::Instance->otrMode)
+	{
 		for (size_t i = 0; i < polygonTypes.size(); i++)
 		{
 			declaration += StringHelper::Sprintf("\t{ 0x%08lX, 0x%08lX },", polygonTypes[i] >> 32,
@ -140,6 +148,7 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix)
 			if (i < polygonTypes.size() - 1)
 				declaration += "\n";
 		}
+	}

 	if (polyTypeDefAddress != 0)
 		parent->AddDeclarationArray(
@ -154,6 +163,8 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix)
 	{
 		declaration.clear();

+		if (!Globals::Instance->otrMode)
+		{
 			for (size_t i = 0; i < vertices.size(); i++)
 			{
 				declaration +=
@ -162,6 +173,7 @@ void ZCollisionHeader::DeclareReferences(const std::string& prefix)
 				if (i < vertices.size() - 1)
 					declaration += "\n";
 			}
+		}

 		const auto& first = vertices.front();
 		if (vtxAddress != 0)
@ -177,29 +189,36 @@ std::string ZCollisionHeader::GetBodySourceCode() const
 {
 	std::string declaration = "";

+	if (Globals::Instance->otrMode)
+		return declaration;
+
 	declaration += "\n";

 	declaration += StringHelper::Sprintf("\t{ %i, %i, %i },\n", absMinX, absMinY, absMinZ);
 	declaration += StringHelper::Sprintf("\t{ %i, %i, %i },\n", absMaxX, absMaxY, absMaxZ);

 	std::string vtxName;
-	Globals::Instance->GetSegmentedPtrName(vtxAddress, parent, "Vec3s", vtxName);
+	Globals::Instance->GetSegmentedPtrName(vtxAddress, parent, "Vec3s", vtxName, parent->workerID);
 	declaration += StringHelper::Sprintf("\t%i,\n\t%s,\n", numVerts, vtxName.c_str());

 	std::string polyName;
-	Globals::Instance->GetSegmentedPtrName(polyAddress, parent, "CollisionPoly", polyName);
+	Globals::Instance->GetSegmentedPtrName(polyAddress, parent, "CollisionPoly", polyName,
+	                                       parent->workerID);
 	declaration += StringHelper::Sprintf("\t%i,\n\t%s,\n", numPolygons, polyName.c_str());

 	std::string surfaceName;
-	Globals::Instance->GetSegmentedPtrName(polyTypeDefAddress, parent, "SurfaceType", surfaceName);
+	Globals::Instance->GetSegmentedPtrName(polyTypeDefAddress, parent, "SurfaceType", surfaceName,
+	                                       parent->workerID);
 	declaration += StringHelper::Sprintf("\t%s,\n", surfaceName.c_str());

 	std::string camName;
-	Globals::Instance->GetSegmentedPtrName(camDataAddress, parent, "CamData", camName);
+	Globals::Instance->GetSegmentedPtrName(camDataAddress, parent, "CamData", camName,
+	                                       parent->workerID);
 	declaration += StringHelper::Sprintf("\t%s,\n", camName.c_str());

 	std::string waterBoxName;
-	Globals::Instance->GetSegmentedPtrName(waterBoxAddress, parent, "WaterBox", waterBoxName);
+	Globals::Instance->GetSegmentedPtrName(waterBoxAddress, parent, "WaterBox", waterBoxName,
+	                                       parent->workerID);
 	declaration += StringHelper::Sprintf("\t%i,\n\t%s\n", numWaterBoxes, waterBoxName.c_str());

 	return declaration;
--- a/ZAPDTR/ZAPD/ZDisplayList.cpp
+++ b/ZAPDTR/ZAPD/ZDisplayList.cpp
@ -671,7 +671,8 @@ int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, std

 			lastTexSeg = segmentNumber;

-			Globals::Instance->GetSegmentedPtrName(data & 0xFFFFFFFF, parent, "", texStr);
+			Globals::Instance->GetSegmentedPtrName(data & 0xFFFFFFFF, parent, "", texStr,
+			                                       parent->workerID);
 		}

 		// gsDPSetTile
@ -823,7 +824,7 @@ void ZDisplayList::Opcode_G_DL(uint64_t data, const std::string& prefix, char* l

 	if (pp != 0)
 	{
-		if (!Globals::Instance->HasSegment(segNum))
+		if (!Globals::Instance->HasSegment(segNum, parent->workerID))
 			sprintf(line, "gsSPBranchList(0x%08" PRIX64 "),", data & 0xFFFFFFFF);
 		else if (dListDecl != nullptr)
 			sprintf(line, "gsSPBranchList(%s),", dListDecl->varName.c_str());
@ -833,7 +834,7 @@ void ZDisplayList::Opcode_G_DL(uint64_t data, const std::string& prefix, char* l
 	}
 	else
 	{
-		if (!Globals::Instance->HasSegment(segNum))
+		if (!Globals::Instance->HasSegment(segNum, parent->workerID))
 			sprintf(line, "gsSPDisplayList(0x%08" PRIX64 "),", data & 0xFFFFFFFF);
 		else if (dListDecl != nullptr)
 			sprintf(line, "gsSPDisplayList(%s),", dListDecl->varName.c_str());
@ -844,7 +845,7 @@ void ZDisplayList::Opcode_G_DL(uint64_t data, const std::string& prefix, char* l

 	// if (segNum == 8 || segNum == 9 || segNum == 10 || segNum == 11 || segNum == 12 || segNum ==
 	// 13) // Used for runtime-generated display lists
-	if (!Globals::Instance->HasSegment(segNum))
+	if (!Globals::Instance->HasSegment(segNum, parent->workerID))
 	{
 		if (pp != 0)
 			sprintf(line, "gsSPBranchList(0x%08" PRIX64 "),", data & 0xFFFFFFFF);
@ -965,7 +966,7 @@ void ZDisplayList::Opcode_G_VTX(uint64_t data, char* line)
 	}

 	// Hack: Don't extract vertices from a unknown segment.
-	if (!Globals::Instance->HasSegment(GETSEGNUM(data)))
+	if (!Globals::Instance->HasSegment(GETSEGNUM(data), parent->workerID))
 	{
 		segptr_t segmented = data & 0xFFFFFFFF;
 		references.push_back(segmented);
@ -1069,7 +1070,7 @@ void ZDisplayList::Opcode_G_SETTIMG(uint64_t data, const std::string& prefix, ch

 		if (parent != nullptr)
 		{
-			if (Globals::Instance->HasSegment(segmentNumber))
+			if (Globals::Instance->HasSegment(segmentNumber, parent->workerID))
 				texDecl = parent->GetDeclaration(texAddress);
 			else
 				texDecl = parent->GetDeclaration(data);
@ -1077,7 +1078,7 @@ void ZDisplayList::Opcode_G_SETTIMG(uint64_t data, const std::string& prefix, ch

 		if (texDecl != nullptr)
 			sprintf(texStr, "%s", texDecl->varName.c_str());
-		else if (data != 0 && Globals::Instance->HasSegment(segmentNumber))
+		else if (data != 0 && Globals::Instance->HasSegment(segmentNumber, parent->workerID))
 			sprintf(texStr, "%sTex_%06X", prefix.c_str(), texAddress);
 		else
 		{
@ -1090,7 +1091,7 @@ void ZDisplayList::Opcode_G_SETTIMG(uint64_t data, const std::string& prefix, ch
 	else
 	{
 		std::string texName;
-		Globals::Instance->GetSegmentedPtrName(data, parent, "", texName);
+		Globals::Instance->GetSegmentedPtrName(data, parent, "", texName, parent->workerID);
 		sprintf(line, "gsDPSetTextureImage(%s, %s, %i, %s),", fmtTbl[fmt], sizTbl[siz], www + 1,
 		        texName.c_str());
 	}
@ -1765,6 +1766,8 @@ static int32_t GfxdCallback_Vtx(uint32_t seg, int32_t count)
 	}

 	self->references.push_back(seg);
+	
+	if (!Globals::Instance->otrMode)
 		gfxd_puts("@r");

 	return 1;
@ -1788,7 +1791,7 @@ static int32_t GfxdCallback_Texture(segptr_t seg, int32_t fmt, int32_t siz, int3
 	self->TextureGenCheck();

 	std::string texName;
-	Globals::Instance->GetSegmentedPtrName(seg, self->parent, "", texName);
+	Globals::Instance->GetSegmentedPtrName(seg, self->parent, "", texName, self->parent->workerID);

 	gfxd_puts(texName.c_str());

@ -1812,7 +1815,7 @@ static int32_t GfxdCallback_Palette(uint32_t seg, [[maybe_unused]] int32_t idx,
 	self->TextureGenCheck();

 	std::string palName;
-	Globals::Instance->GetSegmentedPtrName(seg, self->parent, "", palName);
+	Globals::Instance->GetSegmentedPtrName(seg, self->parent, "", palName, self->parent->workerID);

 	gfxd_puts(palName.c_str());

@ -1826,7 +1829,8 @@ static int32_t GfxdCallback_DisplayList(uint32_t seg)
 	uint32_t dListSegNum = GETSEGNUM(seg);

 	std::string dListName = "";
-	bool addressFound = Globals::Instance->GetSegmentedPtrName(seg, self->parent, "Gfx", dListName);
+	bool addressFound = Globals::Instance->GetSegmentedPtrName(seg, self->parent, "Gfx", dListName,
+	                                                           self->parent->workerID);

 	if (!addressFound && self->parent->segment == dListSegNum)
 	{
@ -1849,7 +1853,8 @@ static int32_t GfxdCallback_Matrix(uint32_t seg)
 	std::string mtxName;
 	ZDisplayList* self = static_cast<ZDisplayList*>(gfxd_udata_get());

-	bool addressFound = Globals::Instance->GetSegmentedPtrName(seg, self->parent, "Mtx", mtxName);
+	bool addressFound = Globals::Instance->GetSegmentedPtrName(seg, self->parent, "Mtx", mtxName,
+	                                                           self->parent->workerID);
 	if (!addressFound && GETSEGNUM(seg) == self->parent->segment)
 	{
 		Declaration* decl =
@ -1923,6 +1928,23 @@ void ZDisplayList::DeclareReferences(const std::string& prefix)
 				curAddr, firstVtx.GetDeclarationAlignment(),
 				item.second.size() * firstVtx.GetRawDataSize(), firstVtx.GetSourceTypeName(),
 				firstVtx.GetDefaultName(name), item.second.size(), declaration);
+
+			/*for (auto vtx : item.second)
+			{
+				ZVtx* nVtx = new ZVtx(vtx.parent);
+				nVtx->x = vtx.x;
+				nVtx->y = vtx.y;
+				nVtx->z = vtx.z;
+				nVtx->flag = vtx.flag;
+				nVtx->s = vtx.s;
+				nVtx->t = vtx.t;
+				nVtx->r = vtx.r;
+				nVtx->g = vtx.g;
+				nVtx->b = vtx.b;
+				nVtx->a = vtx.a;
+				decl->vertexHack.push_back(nVtx);
+			}*/
+
 			decl->isExternal = true;
 		}
 	}
@ -1968,15 +1990,15 @@ void ZDisplayList::DeclareReferences(const std::string& prefix)
 		{
 			auto& item = vertices[vtxKeys[i]];

-			std::string declaration;
+			//std::string declaration;

-			for (auto& vtx : item)
-				declaration += StringHelper::Sprintf("\t%s,\n", vtx.GetBodySourceCode().c_str());
+			//for (auto& vtx : item)
+				//declaration += StringHelper::Sprintf("\t%s,\n", vtx.GetBodySourceCode().c_str());

 			// Ensure there's always a trailing line feed to prevent dumb warnings.
 			// Please don't remove this line, unless you somehow made a way to prevent
 			// that warning when building the OoT repo.
-			declaration += "\n";
+			//declaration += "\n";

 			if (parent != nullptr)
 			{
@ -1988,12 +2010,6 @@ void ZDisplayList::DeclareReferences(const std::string& prefix)
 				else
 					vtxName = StringHelper::Sprintf("%sVtx_%06X", prefix.c_str(), vtxKeys[i]);

-
-				if (StringHelper::Contains(vtxName, "4B18"))
-				{
-					int bp = 0;
-				}
-
 				auto filepath = Globals::Instance->outputPath / vtxName;
 				std::string incStr = StringHelper::Sprintf("%s.%s.inc", filepath.string().c_str(), "vtx");

@ -2109,7 +2125,7 @@ bool ZDisplayList::TextureGenCheck(int32_t texWidth, int32_t texHeight, uint32_t
 		       texWidth, texHeight, texIsPalette, texAddr);

 	if ((texSeg != 0 || texAddr != 0) && texWidth > 0 && texHeight > 0 && texLoaded &&
-	    Globals::Instance->HasSegment(segmentNumber))
+	    Globals::Instance->HasSegment(segmentNumber, self->parent->workerID))
 	{
 		ZFile* auxParent = nullptr;
 		if (segmentNumber == self->parent->segment)
@ -2120,7 +2136,8 @@ bool ZDisplayList::TextureGenCheck(int32_t texWidth, int32_t texHeight, uint32_t
 		{
 			// Try to find a non-external file (i.e., one we are actually extracting)
 			// which has the same segment number we are looking for.
-			for (auto& otherFile : Globals::Instance->cfg.segmentRefFiles[segmentNumber])
+			auto segs = Globals::Instance->GetSegmentRefFiles(self->parent->workerID);
+			for (auto& otherFile : segs[segmentNumber])
 			{
 				if (!otherFile->isExternalFile)
 				{
--- a/ZAPDTR/ZAPD/ZFile.cpp
+++ b/ZAPDTR/ZAPD/ZFile.cpp
@ -41,6 +41,7 @@ ZFile::ZFile()
 	baseAddress = 0;
 	rangeStart = 0x000000000;
 	rangeEnd = 0xFFFFFFFF;
+	workerID = 0;
 }

 ZFile::ZFile(const fs::path& nOutPath, const std::string& nName) : ZFile()
@ -51,7 +52,7 @@ ZFile::ZFile(const fs::path& nOutPath, const std::string& nName) : ZFile()
 }

 ZFile::ZFile(ZFileMode nMode, tinyxml2::XMLElement* reader, const fs::path& nBasePath,
-             const fs::path& nOutPath, const std::string& filename, const fs::path& nXmlFilePath)
+             const fs::path& nOutPath, const std::string& filename, const fs::path& nXmlFilePath, int nWorkerID)
 	: ZFile()
 {
 	xmlFilePath = nXmlFilePath;
@ -66,6 +67,7 @@ ZFile::ZFile(ZFileMode nMode, tinyxml2::XMLElement* reader, const fs::path& nBas
 		outputPath = nOutPath;

 	mode = nMode;
+	workerID = nWorkerID;

 	ParseXML(reader, filename);
 	if (mode != ZFileMode::ExternalFile)
@ -167,7 +169,7 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename)
 			}
 		}
 	}
-	Globals::Instance->AddSegment(segment, this);
+	Globals::Instance->AddSegment(segment, this, workerID);

 	if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO)
 	{
@ -181,7 +183,9 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename)
 		}
 	}

-	if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile)
+	if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile || mode == ZFileMode::ExtractDirectory)
+	{
+		if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 		{
 			if (!File::Exists((basePath / name).string()))
 			{
@ -189,8 +193,12 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename)
 				                                                (basePath / name).c_str());
 				HANDLE_ERROR_PROCESS(WarningType::Always, errorHeader, "");
 			}
+		}

-		rawData = File::ReadAllBytes((basePath / name).string());
+		if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory)
+			rawData = Globals::Instance->GetBaseromFile(name);
+		else
+			rawData = Globals::Instance->GetBaseromFile((basePath / name).string());

 		if (reader->Attribute("RangeEnd") == nullptr)
 			rangeEnd = rawData.size();
@ -260,7 +268,7 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename)
 		{
 			ZResource* nRes = nodeMap[nodeName](this);

-			if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile)
+			if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile || mode == ZFileMode::ExtractDirectory)
 				nRes->ExtractFromXML(child, rawDataIndex);

 			switch (nRes->GetResourceType())
@ -813,7 +821,34 @@ void ZFile::GenerateSourceHeaderFiles()
 	if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO)
 		printf("Writing H file: %s\n", headerFilename.c_str());

+	if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 		File::WriteAllText(headerFilename, formatter.GetOutput());
+	else if (Globals::Instance->sourceOutputPath != "")
+	{
+		std::string xmlPath = xmlFilePath.string();
+		xmlPath = StringHelper::Replace(xmlPath, "\\", "/");
+		auto pathList = StringHelper::Split(xmlPath, "/");
+		std::string outPath = "";
+		
+		for (int i = 0; i < 3; i++)
+			outPath += pathList[i] + "/";
+
+		for (int i = 5; i < pathList.size(); i++)
+		{
+			if (i == pathList.size() - 1)
+			{
+				outPath += Path::GetFileNameWithoutExtension(pathList[i]) + "/";
+				outPath += outName.string() + ".h";
+			}
+			else
+				outPath += pathList[i];
+
+			if (i < pathList.size() - 1)
+				outPath += "/";
+		}
+
+		File::WriteAllText(outPath, formatter.GetOutput());
+	}
 }

 std::string ZFile::GetHeaderInclude() const
@ -999,6 +1034,10 @@ std::string ZFile::ProcessDeclarations()
 							lastItem.second->size += curItem.second->size;
 							lastItem.second->arrayItemCnt += curItem.second->arrayItemCnt;
 							lastItem.second->text += "\n" + curItem.second->text;
+
+							for (auto vtx : curItem.second->vertexHack)
+								lastItem.second->vertexHack.push_back(vtx);
+
 							declarations.erase(curItem.first);
 							declarationKeys.erase(declarationKeys.begin() + i);
 							delete curItem.second;
@ -1087,7 +1126,7 @@ void ZFile::ProcessDeclarationText(Declaration* decl)
 		{
 			std::string vtxName;
 			Globals::Instance->GetSegmentedArrayIndexedName(decl->references[refIndex], 0x10, this,
-			                                                "Vtx", vtxName);
+			                                                "Vtx", vtxName, workerID);
 			decl->text.replace(i, 2, vtxName);

 			refIndex++;
@ -1190,6 +1229,9 @@ void ZFile::HandleUnaccountedData()
 	uint32_t lastSize = 0;
 	std::vector<offset_t> declsAddresses;

+	if (Globals::Instance->otrMode)
+		return;
+
 	for (const auto& item : declarations)
 	{
 		declsAddresses.push_back(item.first);
--- a/ZAPDTR/ZAPD/ZFile.h
+++ b/ZAPDTR/ZAPD/ZFile.h
@ -16,6 +16,7 @@ enum class ZFileMode
 	BuildBackground,
 	Extract,
 	ExternalFile,
+	ExtractDirectory,
 	Invalid,
 	Custom = 1000,  // Used for exporter file modes
 };
@ -34,6 +35,8 @@ public:
 	std::string defines;
 	std::vector<ZResource*> resources;

+	int workerID;
+
 	// Default to using virtual addresses
 	uint32_t segment = 0x80;
 	uint32_t baseAddress, rangeStart, rangeEnd;
@ -41,7 +44,7 @@ public:

 	ZFile(const fs::path& nOutPath, const std::string& nName);
 	ZFile(ZFileMode nMode, tinyxml2::XMLElement* reader, const fs::path& nBasePath,
-	      const fs::path& nOutPath, const std::string& filename, const fs::path& nXmlFilePath);
+	      const fs::path& nOutPath, const std::string& filename, const fs::path& nXmlFilePath, int nWorkerID);
 	~ZFile();

 	std::string GetName() const;
@ -107,12 +110,12 @@ public:
 	static void RegisterNode(std::string nodeName, ZResourceFactoryFunc* nodeFunc);

 protected:
-	std::vector<uint8_t> rawData;
 	std::string name;
 	fs::path outName = "";
 	fs::path basePath;
 	fs::path outputPath;
 	fs::path xmlFilePath;
+	std::vector<uint8_t> rawData;

 	// Keep track of every texture of this ZFile.
 	// The pointers declared here are "borrowed" (somebody else is the owner),
--- a/ZAPDTR/ZAPD/ZLimb.cpp
+++ b/ZAPDTR/ZAPD/ZLimb.cpp
@ -218,18 +218,25 @@ size_t ZLimb::GetRawDataSize() const

 std::string ZLimb::GetBodySourceCode() const
 {
+	if (Globals::Instance->otrMode)
+		return "";
+
 	std::string dListStr;
 	std::string dListStr2;
-	Globals::Instance->GetSegmentedArrayIndexedName(dListPtr, 8, parent, "Gfx", dListStr);
-	Globals::Instance->GetSegmentedArrayIndexedName(dList2Ptr, 8, parent, "Gfx", dListStr2);
+	Globals::Instance->GetSegmentedArrayIndexedName(dListPtr, 8, parent, "Gfx", dListStr,
+	                                                parent->workerID);
+	Globals::Instance->GetSegmentedArrayIndexedName(dList2Ptr, 8, parent, "Gfx", dListStr2,
+	                                                parent->workerID);

 	std::string entryStr = "\n\t";
 	if (type == ZLimbType::Legacy)
 	{
 		std::string childName;
 		std::string siblingName;
-		Globals::Instance->GetSegmentedPtrName(childPtr, parent, "LegacyLimb", childName);
-		Globals::Instance->GetSegmentedPtrName(siblingPtr, parent, "LegacyLimb", siblingName);
+		Globals::Instance->GetSegmentedPtrName(childPtr, parent, "LegacyLimb", childName,
+		                                       parent->workerID);
+		Globals::Instance->GetSegmentedPtrName(siblingPtr, parent, "LegacyLimb", siblingName,
+		                                       parent->workerID);

 		entryStr += StringHelper::Sprintf("%s,\n", dListStr.c_str());
 		entryStr +=
@ -261,7 +268,8 @@ std::string ZLimb::GetBodySourceCode() const
 		case ZLimbType::Skin:
 		{
 			std::string skinSegmentStr;
-			Globals::Instance->GetSegmentedPtrName(skinSegment, parent, "", skinSegmentStr);
+			Globals::Instance->GetSegmentedPtrName(skinSegment, parent, "", skinSegmentStr,
+			                                       parent->workerID);
 			entryStr +=
 				StringHelper::Sprintf("\t0x%02X, %s\n", skinSegmentType, skinSegmentStr.c_str());
 		}
@ -367,7 +375,7 @@ void ZLimb::DeclareDList(segptr_t dListSegmentedPtr, const std::string& prefix,

 	std::string dlistName;
 	bool declFound = Globals::Instance->GetSegmentedArrayIndexedName(dListSegmentedPtr, 8, parent,
-	                                                                 "Gfx", dlistName);
+	                                                                 "Gfx", dlistName, parent->workerID);
 	if (declFound)
 		return;

--- a/ZAPDTR/ZAPD/ZPath.cpp
+++ b/ZAPDTR/ZAPD/ZPath.cpp
@ -142,8 +142,8 @@ void PathwayEntry::DeclareReferences(const std::string& prefix)
 		return;

 	std::string pointsName;
-	bool addressFound =
-		Globals::Instance->GetSegmentedPtrName(listSegmentAddress, parent, "Vec3s", pointsName);
+	bool addressFound = Globals::Instance->GetSegmentedPtrName(listSegmentAddress, parent, "Vec3s",
+	                                                           pointsName, parent->workerID);
 	if (addressFound)
 		return;

@ -177,7 +177,8 @@ std::string PathwayEntry::GetBodySourceCode() const
 {
 	std::string declaration;
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(listSegmentAddress, parent, "Vec3s", listName);
+	Globals::Instance->GetSegmentedPtrName(listSegmentAddress, parent, "Vec3s", listName,
+	                                       parent->workerID);

 	if (Globals::Instance->game == ZGame::MM_RETAIL)
 		declaration +=
--- a/ZAPDTR/ZAPD/ZPlayerAnimationData.cpp
+++ b/ZAPDTR/ZAPD/ZPlayerAnimationData.cpp
@ -3,6 +3,7 @@
 #include "Utils/BitConverter.h"
 #include "Utils/StringHelper.h"
 #include "ZFile.h"
+#include <Globals.h>

 REGISTER_ZFILENODE(PlayerAnimationData, ZPlayerAnimationData);

@ -54,6 +55,9 @@ std::string ZPlayerAnimationData::GetBodySourceCode() const
 {
 	std::string declaration = "";

+	if (Globals::Instance->otrMode)
+		return "";
+
 	size_t index = 0;
 	for (const auto& entry : limbRotData)
 	{
--- a/ZAPDTR/ZAPD/ZResource.cpp
+++ b/ZAPDTR/ZAPD/ZResource.cpp
@ -8,6 +8,7 @@
 #include "ZFile.h"
 #include <Globals.h>
 #include <ZDisplayList.h>
+#include <ZArray.h>

 ZResource::ZResource(ZFile* nParent)
 {
@ -18,6 +19,7 @@ ZResource::ZResource(ZFile* nParent)
 	sourceOutput = "";
 	rawDataIndex = 0;
 	outputDeclaration = true;
+	hash = 0;

 	RegisterRequiredAttribute("Name");
 	RegisterOptionalAttribute("OutName");
@ -119,14 +121,21 @@ void ZResource::ParseXML(tinyxml2::XMLElement* reader)

 		name = registeredAttributes.at("Name").value;

-		static std::regex r("[a-zA-Z_]+[a-zA-Z0-9_]*", std::regex::icase | std::regex::optimize);
+
+		// Disable this check for OTR file generation for now since it takes up a considerable amount of CPU time
+		if (!Globals::Instance->otrMode)
+		{
+			static std::regex r("[a-zA-Z_]+[a-zA-Z0-9_]*",
+			                    std::regex::icase | std::regex::optimize);

 			if (!isInner || (isInner && name != ""))
 			{
 				if (!std::regex_match(name, r))
 				{
 					HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this,
-				                      rawDataIndex, "invalid value found for 'Name' attribute", "");
+					                      rawDataIndex, "invalid value found for 'Name' attribute",
+					                      "");
+				}
 			}
 		}

@ -273,6 +282,21 @@ void ZResource::GetSourceOutputCode([[maybe_unused]] const std::string& prefix)
 		else
 			decl->text = bodyStr;

+		// OTRTODO: This is a hack and we need something more elegant in the future...
+		if (GetResourceType() == ZResourceType::Array)
+		{
+			ZArray* arr = (ZArray*)this;
+			if (arr->resList[0]->GetResourceType() == ZResourceType::Vertex)
+			{
+				for (int i = 0; i < arr->resList.size(); i++)
+				{
+					ZVtx* vtx = (ZVtx*)arr->resList[i];
+					decl->vertexHack.push_back(vtx);
+
+				}
+			}
+		}
+
 		if (decl != nullptr)
 			decl->staticConf = staticConf;
 	}
--- a/ZAPDTR/ZAPD/ZRom.cpp
+++ b/ZAPDTR/ZAPD/ZRom.cpp
@ -0,0 +1,202 @@
+#include "ZRom.h"
+#include "Utils/BitConverter.h"
+#include "Utils/File.h"
+#include "Utils/Directory.h"
+#include "yaz0/yaz0.h"
+
+#ifndef _MSC_VER
+#include <byteswap.h>
+#endif
+#include <Globals.h>
+
+namespace fs = std::filesystem;
+
+#define DMA_ENTRY_SIZE 16
+
+#if defined(_MSC_VER)
+#define __bswap_32 _byteswap_ulong
+#define bswap_32 _byteswap_ulong
+#endif
+
+// ROM DMA Table Start
+#define OOT_OFF_NTSC_10_RC 0x7430
+#define OOT_OFF_NTSC_10 0x7430
+#define OOT_OFF_NTSC_11 0x7430
+#define OOT_OFF_PAL_10 0x7950
+#define OOT_OFF_NTSC_12 0x7960
+#define OOT_OFF_PAL_11 0x7950
+#define OOT_OFF_JP_GC 0x7170
+#define OOT_OFF_JP_MQ 0x7170
+#define OOT_OFF_US_GC 0x7170
+#define OOT_OFF_US_MQ 0x7170
+#define OOT_OFF_PAL_GC_DBG1 0x12F70
+#define OOT_OFF_PAL_MQ_DBG 0x12F70
+#define OOT_OFF_PAL_GC_DBG2 0x12F70
+#define OOT_OFF_PAL_GC 0x7170
+#define OOT_OFF_PAL_MQ 0x7170
+#define OOT_OFF_JP_GC_CE 007170
+#define OOT_OFF_CN_IQUE 0xB7A0
+#define OOT_OFF_TW_IQUE 0xB240
+
+#define MM_OFF_US_10 0x1A500
+#define MM_OFF_JP_10 0x1C110
+#define MM_OFF_JP_11 0x1C050
+#define MM_OFF_DBG 0x24F60
+
+#define OOT_NTSC_10 0xEC7011B7
+#define OOT_NTSC_11 0xD43DA81F
+#define OOT_NTSC_12 0x693BA2AE
+#define OOT_PAL_10 0xB044B569
+#define OOT_PAL_11 0xB2055FBD
+#define OOT_NTSC_JP_GC_CE 0xF7F52DB8
+#define OOT_NTSC_JP_GC 0xF611F4BA
+#define OOT_NTSC_US_GC 0xF3DD35BA
+#define OOT_PAL_GC 0x09465AC3
+#define OOT_NTSC_JP_MQ 0xF43B45BA
+#define OOT_NTSC_US_MQ 0xF034001A
+#define OOT_PAL_MQ 0x1D4136F3
+#define OOT_PAL_GC_DBG1 0x871E1C92  // 03-21-2002 build
+#define OOT_PAL_GC_DBG2 0x87121EFE  // 03-13-2002 build
+#define OOT_PAL_GC_MQ_DBG 0x917D18F6
+#define OOT_IQUE_TW 0x3D81FB3E
+#define OOT_IQUE_CN 0xB1E1E07B
+#define OOT_UNKNOWN 0xFFFFFFFF
+
+ZRom::ZRom(std::string romPath)
+{
+	RomVersion version;
+	romData = File::ReadAllBytes(romPath);
+
+	version.crc = BitConverter::ToInt32BE(romData, 0x10);
+	
+	switch (version.crc)
+	{
+	case OOT_NTSC_10:
+		version.version = "N64 NTSC 1.0";
+		version.listPath = "ntsc_oot.txt";
+		version.offset = OOT_OFF_NTSC_10;
+		break;
+	case OOT_NTSC_11:
+		version.version = "N64 NTSC 1.1";
+		version.listPath = "ntsc_oot.txt";
+		version.offset = OOT_OFF_NTSC_11;
+		break;
+	case OOT_NTSC_12:
+		version.version = "N64 NTSC 1.2";
+		version.listPath = "ntsc_oot.txt";
+		version.offset = OOT_OFF_NTSC_12;
+		break;
+	case OOT_PAL_10:
+		version.version = "N64 PAL 1.0";
+		version.listPath = "pal_oot.txt";
+		version.offset = OOT_OFF_PAL_10;
+		break;
+	case OOT_PAL_11:
+		version.version = "N64 PAL 1.1";
+		version.listPath = "pal_oot.txt";
+		version.offset = OOT_OFF_PAL_11;
+		break;
+	case OOT_NTSC_JP_GC:
+		version.version = "JP GameCube (MQ Disk)";
+		version.listPath = "gamecube.txt";
+		version.offset = OOT_OFF_JP_GC;
+		break;
+	case OOT_NTSC_JP_GC_CE:
+		version.version = "GameCube (Collectors Edition Disk)";
+		version.listPath = "gamecube.txt";
+		version.offset = OOT_OFF_JP_GC_CE;
+		break;
+	case OOT_NTSC_JP_MQ:
+		version.version = "JP Master Quest";
+		version.listPath = "gamecube.txt";
+		version.offset = OOT_OFF_JP_MQ;
+		break;
+	case OOT_NTSC_US_MQ:
+		version.version = "NTSC Master Quest";
+		version.listPath = "gamecube.txt";
+		version.offset = OOT_OFF_JP_MQ;
+		break;
+	case OOT_NTSC_US_GC:
+		version.version = "NTSC GameCube";
+		version.listPath = "gamecube.txt";
+		version.offset = OOT_OFF_US_MQ;
+		break;
+	case OOT_PAL_GC:
+		version.version = "PAL GameCube";
+		version.listPath = "gamecube_pal.txt";
+		version.offset = OOT_OFF_PAL_GC;
+		break;
+	case OOT_PAL_MQ:
+		version.version = "PAL Master Quest";
+		version.listPath = "gamecube_pal.txt";
+		version.offset = OOT_OFF_PAL_MQ;
+		break;
+	case OOT_PAL_GC_DBG1:
+		version.version = "GameCube Debug 1.0";
+		version.listPath = "dbg.txt";
+		version.offset = OOT_OFF_PAL_GC_DBG1;
+		break;
+	case OOT_PAL_GC_DBG2:
+		version.version = "GameCube Debug 2.0";
+		version.listPath = "dbg.txt";
+		version.offset = OOT_OFF_PAL_GC_DBG2;
+		break;
+	case OOT_PAL_GC_MQ_DBG:
+		version.version = "GameCube MQ-Debug";
+		version.listPath = "dbg.txt";
+		version.offset = OOT_OFF_PAL_MQ_DBG;
+		break;
+	case OOT_IQUE_CN:
+		version.version = "OoT IQue";
+		version.listPath = "ique.txt";
+		version.offset = OOT_OFF_CN_IQUE;
+		break;
+	case OOT_IQUE_TW:
+		version.version = "TW IQue";
+		version.listPath = "ique.txt";
+		version.offset = OOT_OFF_TW_IQUE;
+		break;
+	}
+
+	auto path = StringHelper::Sprintf("%s/%s", Globals::Instance->fileListPath.string().c_str(), version.listPath.c_str());
+	auto txt = File::ReadAllText(path);
+	std::vector<std::string> lines = StringHelper::Split(txt, "\n");
+
+    std::vector<uint8_t> decompressedData(1);
+
+	for (int i = 0; i < lines.size(); i++)
+	{
+		lines[i] = StringHelper::Strip(lines[i], "\r");
+		const int romOffset = version.offset + (DMA_ENTRY_SIZE * i);
+
+		const int virtStart = BitConverter::ToInt32BE(romData, romOffset + 0);
+		const int virtEnd = BitConverter::ToInt32BE(romData, romOffset + 4);
+		const int physStart = BitConverter::ToInt32BE(romData, romOffset + 8);
+		const int physEnd = BitConverter::ToInt32BE(romData, romOffset + 12);
+
+		const bool compressed = physEnd != 0;
+		int size = compressed ? physEnd - physStart : virtEnd - virtStart;
+
+		auto outData = std::vector<uint8_t>();
+		outData.resize(size);
+		memcpy(outData.data(), romData.data() + physStart, size);
+
+		if (compressed)
+		{
+			int decSize = virtEnd - virtStart;
+			decompressedData = std::vector<uint8_t>();
+			decompressedData.resize(decSize);
+			yaz0_decode(outData.data(), decompressedData.data(), decSize);
+			files[lines[i]] = decompressedData;
+		}
+		else
+			files[lines[i]] = outData;
+	}
+
+	int bp = 0;
+}
+
+std::vector<uint8_t> ZRom::GetFile(std::string fileName)
+{
+	return files[fileName];
+}
--- a/ZAPDTR/ZAPD/ZRom.h
+++ b/ZAPDTR/ZAPD/ZRom.h
@ -0,0 +1,27 @@
+#pragma once
+
+#include <stdint.h>
+#include <vector>
+#include <map>
+#include <string>
+
+class ZRom
+{
+public:
+	ZRom(std::string romPath);
+
+	std::vector<uint8_t> GetFile(std::string fileName);
+
+protected:
+	std::vector<uint8_t> romData;
+	std::map<std::string, std::vector<uint8_t>> files;
+};
+
+struct RomVersion
+{
+	std::string version = "None";
+	std::string error = "None";
+	std::string listPath = "None";
+	int offset;
+	uint32_t crc;
+};
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp
@ -54,7 +54,8 @@ void SetActorCutsceneList::DeclareReferences(const std::string& prefix)
 std::string SetActorCutsceneList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorCutscene", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorCutscene", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_ACTOR_CUTSCENE_LIST(%i, %s)", cutscenes.size(),
 	                             listName.c_str());
 }
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp
@ -81,7 +81,8 @@ void SetActorList::DeclareReferencesLate(const std::string& prefix)
 std::string SetActorList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorEntry", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorEntry", listName,
+	                                       parent->workerID);
 	if (numActors != actors.size())
 	{
 		printf("%s: numActors(%i) ~ actors(%li)\n", parent->GetName().c_str(), numActors,
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
@ -48,7 +48,8 @@ void SetAlternateHeaders::DeclareReferencesLate(const std::string& prefix)
 		for (size_t i = 0; i < headers.size(); i++)
 		{
 			std::string altHeaderName;
-			Globals::Instance->GetSegmentedPtrName(headers.at(i), parent, "", altHeaderName);
+			Globals::Instance->GetSegmentedPtrName(headers.at(i), parent, "", altHeaderName,
+			                                       parent->workerID);

 			declaration += StringHelper::Sprintf("\t%s,", altHeaderName.c_str());

@ -66,7 +67,8 @@ void SetAlternateHeaders::DeclareReferencesLate(const std::string& prefix)
 std::string SetAlternateHeaders::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "SceneCmd*", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "SceneCmd*", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_ALTERNATE_HEADER_LIST(%s)", listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
@ -33,7 +33,8 @@ void SetAnimatedMaterialList::DeclareReferences(const std::string& prefix)
 std::string SetAnimatedMaterialList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "AnimatedMaterial", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "AnimatedMaterial", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_ANIMATED_MATERIAL_LIST(%s)", listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
@ -29,7 +29,8 @@ void SetCollisionHeader::DeclareReferences(const std::string& prefix)
 std::string SetCollisionHeader::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CollisionHeader", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CollisionHeader", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_COL_HEADER(%s)", listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp
@ -71,7 +71,7 @@ void SetCsCamera::DeclareReferences(const std::string& prefix)
 	{
 		std::string camPointsName;
 		Globals::Instance->GetSegmentedPtrName(cameras.at(0).GetCamAddress(), parent, "Vec3s",
-		                                       camPointsName);
+		                                       camPointsName, parent->workerID);
 		std::string declaration;

 		size_t index = 0;
@ -103,7 +103,8 @@ void SetCsCamera::DeclareReferences(const std::string& prefix)
 std::string SetCsCamera::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CsCameraEntry", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CsCameraEntry", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_ACTOR_CUTSCENE_CAM_LIST(%i, %s)", cameras.size(),
 	                             listName.c_str());
 }
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp
@ -86,7 +86,8 @@ void SetCutscenes::ParseRawData()
 std::string SetCutscenes::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CutsceneData", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CutsceneData", listName,
+	                                       parent->workerID);

 	if (Globals::Instance->game == ZGame::MM_RETAIL)
 		return StringHelper::Sprintf("SCENE_CMD_CUTSCENE_LIST(%i, %s)", numCutscenes,
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp
@ -63,7 +63,8 @@ void SetEntranceList::DeclareReferencesLate([[maybe_unused]] const std::string&
 std::string SetEntranceList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "EntranceEntry", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "EntranceEntry", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_ENTRANCE_LIST(%s)", listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp
@ -58,7 +58,7 @@ void SetExitList::DeclareReferencesLate([[maybe_unused]] const std::string& pref
 std::string SetExitList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "u16", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "u16", listName, parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_EXIT_LIST(%s)", listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp
@ -52,7 +52,8 @@ void SetLightList::DeclareReferences(const std::string& prefix)
 std::string SetLightList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightInfo", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightInfo", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_LIGHT_LIST(%i, %s)", numLights, listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp
@ -44,7 +44,8 @@ void SetLightingSettings::DeclareReferences(const std::string& prefix)
 std::string SetLightingSettings::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightSettings", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightSettings", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_ENV_LIGHT_SETTINGS(%i, %s)", settings.size(),
 	                             listName.c_str());
 }
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp
@ -78,7 +78,7 @@ std::string SetMesh::GenDListExterns(ZDisplayList* dList)
 std::string SetMesh::GetBodySourceCode() const
 {
 	std::string list;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "", list);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "", list, parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_MESH(%s)", list.c_str());
 }

@ -129,8 +129,8 @@ std::string PolygonDlist::GetBodySourceCode() const
 	std::string bodyStr;
 	std::string opaStr;
 	std::string xluStr;
-	Globals::Instance->GetSegmentedPtrName(opa, parent, "Gfx", opaStr);
-	Globals::Instance->GetSegmentedPtrName(xlu, parent, "Gfx", xluStr);
+	Globals::Instance->GetSegmentedPtrName(opa, parent, "Gfx", opaStr, parent->workerID);
+	Globals::Instance->GetSegmentedPtrName(xlu, parent, "Gfx", xluStr, parent->workerID);

 	if (polyType == 2)
 	{
@ -294,7 +294,7 @@ std::string BgImage::GetBodySourceCode() const
 	}

 	std::string backgroundName;
-	Globals::Instance->GetSegmentedPtrName(source, parent, "", backgroundName);
+	Globals::Instance->GetSegmentedPtrName(source, parent, "", backgroundName, parent->workerID);
 	bodyStr += StringHelper::Sprintf("%s, ", backgroundName.c_str());
 	bodyStr += "\n    ";
 	if (!isSubStruct)
@ -493,7 +493,7 @@ std::string PolygonType1::GetBodySourceCode() const
 	bodyStr += StringHelper::Sprintf("%i, %i, ", type, format);

 	std::string dlistStr;
-	Globals::Instance->GetSegmentedPtrName(dlist, parent, "", dlistStr);
+	Globals::Instance->GetSegmentedPtrName(dlist, parent, "", dlistStr, parent->workerID);

 	bodyStr += StringHelper::Sprintf("%s, ", dlistStr.c_str());
 	bodyStr += "}, \n";
@ -505,7 +505,7 @@ std::string PolygonType1::GetBodySourceCode() const
 		bodyStr += single.GetBodySourceCode();
 		break;
 	case 2:
-		Globals::Instance->GetSegmentedPtrName(list, parent, "BgImage", listStr);
+		Globals::Instance->GetSegmentedPtrName(list, parent, "BgImage", listStr, parent->workerID);
 		bodyStr += StringHelper::Sprintf("    %i, %s, \n", count, listStr.c_str());
 		break;

@ -592,7 +592,7 @@ void PolygonType2::DeclareReferences(const std::string& prefix)
 std::string PolygonType2::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(start, parent, "", listName);
+	Globals::Instance->GetSegmentedPtrName(start, parent, "", listName, parent->workerID);

 	std::string body = StringHelper::Sprintf("\n    %i, %i,\n", type, polyDLists.size());
 	body += StringHelper::Sprintf("    %s,\n", listName.c_str());
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp
@ -50,7 +50,8 @@ void SetMinimapChests::DeclareReferences(const std::string& prefix)
 std::string SetMinimapChests::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapChest", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapChest", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_MINIMAP_COMPASS_ICON_INFO(0x%02X, %s)", chests.size(),
 	                             listName.c_str());
 }
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp
@ -52,7 +52,8 @@ void SetMinimapList::DeclareReferences(const std::string& prefix)

 	{
 		std::string listName;
-		Globals::Instance->GetSegmentedPtrName(listSegmentAddr, parent, "MinimapEntry", listName);
+		Globals::Instance->GetSegmentedPtrName(listSegmentAddr, parent, "MinimapEntry", listName,
+		                                       parent->workerID);
 		std::string declaration = StringHelper::Sprintf("\n\t%s, 0x%08X\n", listName.c_str(), unk4);

 		parent->AddDeclaration(
@ -65,7 +66,8 @@ void SetMinimapList::DeclareReferences(const std::string& prefix)
 std::string SetMinimapList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapList", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapList", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_MINIMAP_INFO(%s)", listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp
@ -51,7 +51,7 @@ void SetObjectList::DeclareReferences(const std::string& prefix)
 std::string SetObjectList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "s16", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "s16", listName, parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_OBJECT_LIST(%i, %s)", objects.size(), listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp
@ -50,7 +50,7 @@ void SetPathways::DeclareReferencesLate(const std::string& prefix)
 std::string SetPathways::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "Path", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "Path", listName, parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_PATH_LIST(%s)", listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp
@ -34,7 +34,7 @@ void SetRoomList::DeclareReferences(const std::string& prefix)
 std::string SetRoomList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "RomFile", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "RomFile", listName, parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_ROOM_LIST(%i, %s)", romfile->rooms.size(),
 	                             listName.c_str());
 }
--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
@ -51,7 +51,8 @@ void SetStartPositionList::DeclareReferences(const std::string& prefix)
 std::string SetStartPositionList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorEntry", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorEntry", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_SPAWN_LIST(%i, %s)", actors.size(), listName.c_str());
 }

--- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
+++ b/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
@ -52,7 +52,8 @@ void SetTransitionActorList::DeclareReferences(const std::string& prefix)
 std::string SetTransitionActorList::GetBodySourceCode() const
 {
 	std::string listName;
-	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "TransitionActorEntry", listName);
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "TransitionActorEntry", listName,
+	                                       parent->workerID);
 	return StringHelper::Sprintf("SCENE_CMD_TRANSITION_ACTOR_LIST(%i, %s)", transitionActors.size(),
 	                             listName.c_str());
 }
--- a/ZAPDTR/ZAPD/ZSkeleton.cpp
+++ b/ZAPDTR/ZAPD/ZSkeleton.cpp
@ -89,7 +89,8 @@ void ZSkeleton::DeclareReferences(const std::string& prefix)
 std::string ZSkeleton::GetBodySourceCode() const
 {
 	std::string limbArrayName;
-	Globals::Instance->GetSegmentedPtrName(limbsArrayAddress, parent, "", limbArrayName);
+	Globals::Instance->GetSegmentedPtrName(limbsArrayAddress, parent, "", limbArrayName,
+	                                       parent->workerID);

 	switch (type)
 	{
@ -245,7 +246,8 @@ std::string ZLimbTable::GetBodySourceCode() const
 	for (size_t i = 0; i < count; i++)
 	{
 		std::string limbName;
-		Globals::Instance->GetSegmentedPtrName(limbsAddresses[i], parent, "", limbName);
+		Globals::Instance->GetSegmentedPtrName(limbsAddresses[i], parent, "", limbName,
+		                                       parent->workerID);
 		body += StringHelper::Sprintf("\t%s,", limbName.c_str());

 		if (i + 1 < count)
--- a/ZAPDTR/ZAPD/ZText.cpp
+++ b/ZAPDTR/ZAPD/ZText.cpp
@ -21,11 +21,12 @@ void ZText::ParseRawData()
 	const auto& rawData = parent->GetRawData();
 	uint32_t currentPtr = StringHelper::StrToL(registeredAttributes.at("CodeOffset").value, 16);

-	std::vector<uint8_t> codeData = File::ReadAllBytes((Globals::Instance->baseRomPath / "code").string());
+	std::vector<uint8_t> codeData;

-	// In some cases with the multi-process extractor it seems that it fails to read the code file if something else is reading from it at the same time.
-	while (codeData.size() == 0)
-		codeData = File::ReadAllBytes(Globals::Instance->baseRomPath.string() + "\\code");
+	if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory)
+		codeData = Globals::Instance->GetBaseromFile("code");
+	else
+		codeData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "code");

 	while (true)
 	{
--- a/ZAPDTR/ZAPD/ZTexture.cpp
+++ b/ZAPDTR/ZAPD/ZTexture.cpp
@ -807,25 +807,30 @@ Declaration* ZTexture::DeclareVar(const std::string& prefix,
 std::string ZTexture::GetBodySourceCode() const
 {
 	std::string sourceOutput;
+
+	if (!Globals::Instance->otrMode)
+	{
 		size_t texSizeInc = (dWordAligned) ? 8 : 4;
 		for (size_t i = 0; i < textureDataRaw.size(); i += texSizeInc)
 		{
 			if (i % 32 == 0)
 				sourceOutput += "    ";
 			if (dWordAligned)
-			sourceOutput +=
-				StringHelper::Sprintf("0x%016llX, ", BitConverter::ToUInt64BE(textureDataRaw, i));
+				sourceOutput += StringHelper::Sprintf("0x%016llX, ",
+				                                      BitConverter::ToUInt64BE(textureDataRaw, i));
 			else
-			sourceOutput +=
-				StringHelper::Sprintf("0x%08llX, ", BitConverter::ToUInt32BE(textureDataRaw, i));
+				sourceOutput += StringHelper::Sprintf("0x%08llX, ",
+				                                      BitConverter::ToUInt32BE(textureDataRaw, i));
 			if (i % 32 == 24)
-			sourceOutput += StringHelper::Sprintf(" // 0x%06X \n", rawDataIndex + ((i / 32) * 32));
+				sourceOutput +=
+					StringHelper::Sprintf(" // 0x%06X \n", rawDataIndex + ((i / 32) * 32));
 		}

 		// Ensure there's always a trailing line feed to prevent dumb warnings.
 		// Please don't remove this line, unless you somehow made a way to prevent
 		// that warning when building the OoT repo.
 		sourceOutput += "\n";
+	}

 	return sourceOutput;
 }
@ -847,9 +852,12 @@ std::string ZTexture::GetSourceTypeName() const

 void ZTexture::CalcHash()
 {
-	auto parentRawData = parent->GetRawData();
+	//if (hash == 0)
+	{
+		const auto& parentRawData = parent->GetRawData();
 		hash = CRC32B(parentRawData.data() + rawDataIndex, GetRawDataSize());
 	}
+}

 std::string ZTexture::GetExternalExtension() const
 {
--- a/ZAPDTR/ZAPD/ZTextureAnimation.cpp
+++ b/ZAPDTR/ZAPD/ZTextureAnimation.cpp
@ -349,9 +349,12 @@ std::string TextureColorChangingParams::GetBodySourceCode() const
 	std::string envColorListName;
 	std::string frameDataListName;

-	Globals::Instance->GetSegmentedPtrName(primColorListAddress, parent, "", primColorListName);
-	Globals::Instance->GetSegmentedPtrName(envColorListAddress, parent, "", envColorListName);
-	Globals::Instance->GetSegmentedPtrName(frameDataListAddress, parent, "", frameDataListName);
+	Globals::Instance->GetSegmentedPtrName(primColorListAddress, parent, "", primColorListName,
+	                                       parent->workerID);
+	Globals::Instance->GetSegmentedPtrName(envColorListAddress, parent, "", envColorListName,
+	                                       parent->workerID);
+	Globals::Instance->GetSegmentedPtrName(frameDataListAddress, parent, "", frameDataListName,
+	                                       parent->workerID);

 	std::string bodyStr = StringHelper::Sprintf(
 		"\n    %d, %d, %s, %s, %s,\n", animLength, colorListCount, primColorListName.c_str(),
@ -423,7 +426,8 @@ void TextureCyclingParams::DeclareReferences([[maybe_unused]] const std::string&

 		for (const auto& tex : textureList)
 		{
-			bool texFound = Globals::Instance->GetSegmentedPtrName(tex, parent, "", texName);
+			bool texFound =
+				Globals::Instance->GetSegmentedPtrName(tex, parent, "", texName, parent->workerID);

 			// texName is a raw segmented pointer. This occurs if the texture is not declared
 			// separately since we cannot read the format. In theory we could scan DLists for the
@ -477,9 +481,10 @@ std::string TextureCyclingParams::GetBodySourceCode() const
 	std::string textureListName;
 	std::string textureIndexListName;

-	Globals::Instance->GetSegmentedPtrName(textureListAddress, parent, "", textureListName);
+	Globals::Instance->GetSegmentedPtrName(textureListAddress, parent, "", textureListName,
+	                                       parent->workerID);
 	Globals::Instance->GetSegmentedPtrName(textureIndexListAddress, parent, "",
-	                                       textureIndexListName);
+	                                       textureIndexListName, parent->workerID);

 	std::string bodyStr = StringHelper::Sprintf(
 		"\n    %d, %s, %s,\n", cycleLength, textureListName.c_str(), textureIndexListName.c_str());
@ -652,7 +657,8 @@ std::string ZTextureAnimation::GetBodySourceCode() const
 	for (const auto& entry : entries)
 	{
 		std::string paramName;
-		Globals::Instance->GetSegmentedPtrName(entry.paramsPtr, parent, "", paramName);
+		Globals::Instance->GetSegmentedPtrName(entry.paramsPtr, parent, "", paramName,
+		                                       parent->workerID);

 		bodyStr += StringHelper::Sprintf("\t{ %d, %d, %s },\n", entry.segment, entry.type,
 		                                 paramName.c_str());
--- a/ZAPDTR/ZAPD/ctpl_stl.h
+++ b/ZAPDTR/ZAPD/ctpl_stl.h
@ -0,0 +1,251 @@
+/*********************************************************
+*
+*  Copyright (C) 2014 by Vitaliy Vitsentiy
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*
+*********************************************************/
+
+
+#ifndef __ctpl_stl_thread_pool_H__
+#define __ctpl_stl_thread_pool_H__
+
+#include <functional>
+#include <thread>
+#include <atomic>
+#include <vector>
+#include <memory>
+#include <exception>
+#include <future>
+#include <mutex>
+#include <queue>
+
+
+
+// thread pool to run user's functors with signature
+//      ret func(int id, other_params)
+// where id is the index of the thread that runs the functor
+// ret is some return type
+
+
+namespace ctpl {
+
+    namespace detail {
+        template <typename T>
+        class Queue {
+        public:
+            bool push(T const & value) {
+                std::unique_lock<std::mutex> lock(this->mutex);
+                this->q.push(value);
+                return true;
+            }
+            // deletes the retrieved element, do not use for non integral types
+            bool pop(T & v) {
+                std::unique_lock<std::mutex> lock(this->mutex);
+                if (this->q.empty())
+                    return false;
+                v = this->q.front();
+                this->q.pop();
+                return true;
+            }
+            bool empty() {
+                std::unique_lock<std::mutex> lock(this->mutex);
+                return this->q.empty();
+            }
+        private:
+            std::queue<T> q;
+            std::mutex mutex;
+        };
+    }
+
+    class thread_pool {
+
+    public:
+
+        thread_pool() { this->init(); }
+        thread_pool(int nThreads) { this->init(); this->resize(nThreads); }
+
+        // the destructor waits for all the functions in the queue to be finished
+        ~thread_pool() {
+            this->stop(true);
+        }
+
+        // get the number of running threads in the pool
+        int size() { return static_cast<int>(this->threads.size()); }
+
+        // number of idle threads
+        int n_idle() { return this->nWaiting; }
+        std::thread & get_thread(int i) { return *this->threads[i]; }
+
+        // change the number of threads in the pool
+        // should be called from one thread, otherwise be careful to not interleave, also with this->stop()
+        // nThreads must be >= 0
+        void resize(int nThreads) {
+            if (!this->isStop && !this->isDone) {
+                int oldNThreads = static_cast<int>(this->threads.size());
+                if (oldNThreads <= nThreads) {  // if the number of threads is increased
+                    this->threads.resize(nThreads);
+                    this->flags.resize(nThreads);
+
+                    for (int i = oldNThreads; i < nThreads; ++i) {
+                        this->flags[i] = std::make_shared<std::atomic<bool>>(false);
+                        this->set_thread(i);
+                    }
+                }
+                else {  // the number of threads is decreased
+                    for (int i = oldNThreads - 1; i >= nThreads; --i) {
+                        *this->flags[i] = true;  // this thread will finish
+                        this->threads[i]->detach();
+                    }
+                    {
+                        // stop the detached threads that were waiting
+                        std::unique_lock<std::mutex> lock(this->mutex);
+                        this->cv.notify_all();
+                    }
+                    this->threads.resize(nThreads);  // safe to delete because the threads are detached
+                    this->flags.resize(nThreads);  // safe to delete because the threads have copies of shared_ptr of the flags, not originals
+                }
+            }
+        }
+
+        // empty the queue
+        void clear_queue() {
+            std::function<void(int id)> * _f;
+            while (this->q.pop(_f))
+                delete _f; // empty the queue
+        }
+
+        // pops a functional wrapper to the original function
+        std::function<void(int)> pop() {
+            std::function<void(int id)> * _f = nullptr;
+            this->q.pop(_f);
+            std::unique_ptr<std::function<void(int id)>> func(_f); // at return, delete the function even if an exception occurred
+            std::function<void(int)> f;
+            if (_f)
+                f = *_f;
+            return f;
+        }
+
+        // wait for all computing threads to finish and stop all threads
+        // may be called asynchronously to not pause the calling thread while waiting
+        // if isWait == true, all the functions in the queue are run, otherwise the queue is cleared without running the functions
+        void stop(bool isWait = false) {
+            if (!isWait) {
+                if (this->isStop)
+                    return;
+                this->isStop = true;
+                for (int i = 0, n = this->size(); i < n; ++i) {
+                    *this->flags[i] = true;  // command the threads to stop
+                }
+                this->clear_queue();  // empty the queue
+            }
+            else {
+                if (this->isDone || this->isStop)
+                    return;
+                this->isDone = true;  // give the waiting threads a command to finish
+            }
+            {
+                std::unique_lock<std::mutex> lock(this->mutex);
+                this->cv.notify_all();  // stop all waiting threads
+            }
+            for (int i = 0; i < static_cast<int>(this->threads.size()); ++i) {  // wait for the computing threads to finish
+                    if (this->threads[i]->joinable())
+                        this->threads[i]->join();
+            }
+            // if there were no threads in the pool but some functors in the queue, the functors are not deleted by the threads
+            // therefore delete them here
+            this->clear_queue();
+            this->threads.clear();
+            this->flags.clear();
+        }
+
+        template<typename F, typename... Rest>
+        auto push(F && f, Rest&&... rest) ->std::future<decltype(f(0, rest...))> {
+            auto pck = std::make_shared<std::packaged_task<decltype(f(0, rest...))(int)>>(
+                std::bind(std::forward<F>(f), std::placeholders::_1, std::forward<Rest>(rest)...)
+                );
+            auto _f = new std::function<void(int id)>([pck](int id) {
+                (*pck)(id);
+            });
+            this->q.push(_f);
+            std::unique_lock<std::mutex> lock(this->mutex);
+            this->cv.notify_one();
+            return pck->get_future();
+        }
+
+        // run the user's function that excepts argument int - id of the running thread. returned value is templatized
+        // operator returns std::future, where the user can get the result and rethrow the catched exceptins
+        template<typename F>
+        auto push(F && f) ->std::future<decltype(f(0))> {
+            auto pck = std::make_shared<std::packaged_task<decltype(f(0))(int)>>(std::forward<F>(f));
+            auto _f = new std::function<void(int id)>([pck](int id) {
+                (*pck)(id);
+            });
+            this->q.push(_f);
+            std::unique_lock<std::mutex> lock(this->mutex);
+            this->cv.notify_one();
+            return pck->get_future();
+        }
+
+
+    private:
+
+        // deleted
+        thread_pool(const thread_pool &);// = delete;
+        thread_pool(thread_pool &&);// = delete;
+        thread_pool & operator=(const thread_pool &);// = delete;
+        thread_pool & operator=(thread_pool &&);// = delete;
+
+        void set_thread(int i) {
+            std::shared_ptr<std::atomic<bool>> flag(this->flags[i]); // a copy of the shared ptr to the flag
+            auto f = [this, i, flag/* a copy of the shared ptr to the flag */]() {
+                std::atomic<bool> & _flag = *flag;
+                std::function<void(int id)> * _f;
+                bool isPop = this->q.pop(_f);
+                while (true) {
+                    while (isPop) {  // if there is anything in the queue
+                        std::unique_ptr<std::function<void(int id)>> func(_f); // at return, delete the function even if an exception occurred
+                        (*_f)(i);
+                        if (_flag)
+                            return;  // the thread is wanted to stop, return even if the queue is not empty yet
+                        else
+                            isPop = this->q.pop(_f);
+                    }
+                    // the queue is empty here, wait for the next command
+                    std::unique_lock<std::mutex> lock(this->mutex);
+                    ++this->nWaiting;
+                    this->cv.wait(lock, [this, &_f, &isPop, &_flag](){ isPop = this->q.pop(_f); return isPop || this->isDone || _flag; });
+                    --this->nWaiting;
+                    if (!isPop)
+                        return;  // if the queue is empty and this->isDone == true or *flag then return
+                }
+            };
+            this->threads[i].reset(new std::thread(f)); // compiler may not support std::make_unique()
+        }
+
+        void init() { this->nWaiting = 0; this->isStop = false; this->isDone = false; }
+
+        std::vector<std::unique_ptr<std::thread>> threads;
+        std::vector<std::shared_ptr<std::atomic<bool>>> flags;
+        detail::Queue<std::function<void(int id)> *> q;
+        std::atomic<bool> isDone;
+        std::atomic<bool> isStop;
+        std::atomic<int> nWaiting;  // how many threads are waiting
+
+        std::mutex mutex;
+        std::condition_variable cv;
+    };
+
+}
+
+#endif // __ctpl_stl_thread_pool_H__
--- a/ZAPDTR/ZAPD/yaz0/readwrite.h
+++ b/ZAPDTR/ZAPD/yaz0/readwrite.h
@ -0,0 +1,29 @@
+#ifndef __READWRITE_H__
+#define __READWRITE_H__
+
+#include <stdint.h>
+
+/* variables */
+union {
+  uint32_t u;
+  float f;
+} __u32_f32_union__;
+
+#define U32(x)                                                          \
+  ((uint32_t)((((uint8_t*)(x))[0] << 24) | (((uint8_t*)(x))[1] << 16) | \
+              (((uint8_t*)(x))[2] << 8) | ((uint8_t*)(x))[3]))
+#define U16(x) ((uint16_t)(((*((uint8_t*)(x))) << 8) | ((uint8_t*)(x))[1]))
+#define U8(x) ((uint8_t)((uint8_t*)(x))[0])
+#define S32(x) ((int32_t)(U32(x)))
+#define S16(x) ((int16_t)(U16(x)))
+#define F32(x) (((__u32_f32_union__.u = U32(x)) & 0) + __u32_f32_union__.f)
+
+#define W32(x, v)                              \
+  {                                            \
+    *((uint8_t*)x + 3) = ((v)&0xFF);           \
+    *((uint8_t*)x + 2) = (((v) >> 8) & 0xFF);  \
+    *((uint8_t*)x + 1) = (((v) >> 16) & 0xFF); \
+    *((uint8_t*)x + 0) = (((v) >> 24) & 0xFF); \
+  }
+
+#endif
--- a/ZAPDTR/ZAPD/yaz0/yaz0.cpp
+++ b/ZAPDTR/ZAPD/yaz0/yaz0.cpp
@ -0,0 +1,227 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <list>
+#include "readwrite.h"
+
+#include "yaz0.h"
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+
+/* internal declarations */
+int yaz0_encode_internal(const u8* src, int srcSize, u8* Data);
+
+int yaz0_get_size(u8* src) { return U32(src + 0x4); }
+
+u32 toDWORD(u32 d) {
+  u8 w1 = d & 0xFF;
+  u8 w2 = (d >> 8) & 0xFF;
+  u8 w3 = (d >> 16) & 0xFF;
+  u8 w4 = d >> 24;
+  return (w1 << 24) | (w2 << 16) | (w3 << 8) | w4;
+}
+
+// simple and straight encoding scheme for Yaz0
+u32 longest_match_brute(const u8* src, int size, int pos, u32* pMatchPos) {
+  int startPos = pos - 0x1000;
+  int max_match_size = size - pos;
+  u32 best_match_size = 0;
+  u32 best_match_pos = 0;
+
+  if (max_match_size < 3) return 0;
+
+  if (startPos < 0) startPos = 0;
+
+  if (max_match_size > 0x111) max_match_size = 0x111;
+
+  for (int i = startPos; i < pos; i++) {
+    int current_size;
+    for (current_size = 0; current_size < max_match_size; current_size++) {
+      if (src[i + current_size] != src[pos + current_size]) {
+	break;
+      }
+    }
+    if (current_size > best_match_size) {
+      best_match_size = current_size;
+      best_match_pos = i;
+      if (best_match_size == 0x111) break;
+    }
+  }
+  *pMatchPos = best_match_pos;
+  return best_match_size;
+}
+
+u32 longest_match_rabinkarp(const u8* src, int size, int pos, u32* match_pos) {
+  int startPos = pos - 0x1000;
+  int max_match_size = size - pos;
+  u32 best_match_size = 0;
+  u32 best_match_pos = 0;
+
+  if (max_match_size < 3) return 0;
+
+  if (startPos < 0) startPos = 0;
+
+  if (max_match_size > 0x111) max_match_size = 0x111;
+
+  int find_hash = src[pos] << 16 | src[pos + 1] << 8 | src[pos + 2];
+  int current_hash = src[startPos] << 16 | src[startPos + 1] << 8 | src[startPos + 2];
+
+  for (int i = startPos; i < pos; i++) {
+    if(current_hash == find_hash) {
+      int current_size;
+      for (current_size = 3; current_size < max_match_size; current_size++) {
+        if (src[i + current_size] != src[pos + current_size]) {
+          break;
+        }
+      }
+      if (current_size > best_match_size) {
+        best_match_size = current_size;
+        best_match_pos = i;
+        if (best_match_size == 0x111) break;
+      }
+    }
+    current_hash = (current_hash << 8 | src[i + 3]) & 0xFFFFFF;
+  }
+  *match_pos = best_match_pos;
+
+  return best_match_size;
+}
+
+int yaz0_encode_internal(const u8* src, int srcSize, u8* Data) {
+  int srcPos = 0;
+
+  int bitmask = 0x80;
+  u8 currCodeByte = 0;
+  int currCodeBytePos = 0;
+  int pos = currCodeBytePos + 1;
+
+  while (srcPos < srcSize) {
+    u32 numBytes;
+    u32 matchPos;
+
+    numBytes = longest_match_rabinkarp(src, srcSize, srcPos, &matchPos);
+    //fprintf(stderr, "pos %x len %x pos %x\n", srcPos, (int)numBytes, (int)matchPos);
+    if (numBytes < 3) {
+      //fprintf(stderr, "single byte %02x\n", src[srcPos]);
+      Data[pos++] = src[srcPos++];
+      currCodeByte |= bitmask;
+    } else {
+      // RLE part
+      u32 dist = srcPos - matchPos - 1;
+
+      if (numBytes >= 0x12)  // 3 byte encoding
+      {
+        Data[pos++] = dist >> 8;    // 0R
+        Data[pos++] = dist & 0xFF;  // FF
+        if (numBytes > 0xFF + 0x12) numBytes = 0xFF + 0x12;
+        Data[pos++] = numBytes - 0x12;
+      } else  // 2 byte encoding
+      {
+        Data[pos++] = ((numBytes - 2) << 4) | (dist >> 8);
+        Data[pos++] = dist & 0xFF;
+      }
+      srcPos += numBytes;
+    }
+    bitmask >>= 1;
+    // write eight codes
+    if (!bitmask) {
+      Data[currCodeBytePos] = currCodeByte;
+      currCodeBytePos = pos++;
+
+      currCodeByte = 0;
+      bitmask = 0x80;
+    }
+  }
+  if (bitmask) {
+    Data[currCodeBytePos] = currCodeByte;
+  }
+
+  return pos;
+}
+
+std::vector<uint8_t> yaz0_encode_fast(const u8* src, int src_size) {
+  std::vector<uint8_t> buffer;
+  std::vector<std::list<uint32_t>> lut;
+  lut.resize(0x1000000);
+
+  for (int i = 0; i < src_size - 3; ++i) {
+    lut[src[i + 0] << 16 | src[i + 1] << 8 | src[i + 2]].push_back(i);
+  }
+
+  return buffer;
+}
+
+std::vector<uint8_t> yaz0_encode(const u8* src, int src_size) {
+  std::vector<uint8_t> buffer(src_size * 10 / 8 + 16);
+  u8* dst = buffer.data();
+
+  // write 4 bytes yaz0 header
+  memcpy(dst, "Yaz0", 4);
+
+  // write 4 bytes uncompressed size
+  W32(dst + 4, src_size);
+
+  // encode
+  int dst_size = yaz0_encode_internal(src, src_size, dst + 16);
+  int aligned_size = (dst_size + 31) & -16;
+  buffer.resize(aligned_size);
+
+#if 0
+  std::vector<uint8_t> decompressed(src_size);
+  yaz0_decode(buffer.data(), decompressed.data(), src_size);
+  if(memcmp(src, decompressed.data(), src_size)) {
+    fprintf(stderr, "Decompressed buffer is different from original\n");
+  }
+#endif
+
+  return buffer;
+}
+
+void yaz0_decode(const uint8_t* source, uint8_t* decomp, int32_t decompSize) {
+  uint32_t srcPlace = 0, dstPlace = 0;
+  uint32_t i, dist, copyPlace, numBytes;
+  uint8_t codeByte, byte1, byte2;
+  uint8_t bitCount = 0;
+
+  source += 0x10;
+  while (dstPlace < decompSize) {
+    /* If there are no more bits to test, get a new byte */
+    if (!bitCount) {
+      codeByte = source[srcPlace++];
+      bitCount = 8;
+    }
+
+    /* If bit 7 is a 1, just copy 1 byte from source to destination */
+    /* Else do some decoding */
+    if (codeByte & 0x80) {
+      decomp[dstPlace++] = source[srcPlace++];
+    } else {
+      /* Get 2 bytes from source */
+      byte1 = source[srcPlace++];
+      byte2 = source[srcPlace++];
+
+      /* Calculate distance to move in destination */
+      /* And the number of bytes to copy */
+      dist = ((byte1 & 0xF) << 8) | byte2;
+      copyPlace = dstPlace - (dist + 1);
+      numBytes = byte1 >> 4;
+
+      /* Do more calculations on the number of bytes to copy */
+      if (!numBytes)
+        numBytes = source[srcPlace++] + 0x12;
+      else
+        numBytes += 2;
+
+      /* Copy data from a previous point in destination */
+      /* to current point in destination */
+      for (i = 0; i < numBytes; i++) decomp[dstPlace++] = decomp[copyPlace++];
+    }
+
+    /* Set up for the next read cycle */
+    codeByte = codeByte << 1;
+    bitCount--;
+  }
+}
--- a/ZAPDTR/ZAPD/yaz0/yaz0.h
+++ b/ZAPDTR/ZAPD/yaz0/yaz0.h
@ -0,0 +1,6 @@
+#pragma once
+
+#include <vector>
+
+void yaz0_decode(const uint8_t* src, uint8_t* dest, int32_t destsize);
+std::vector<uint8_t> yaz0_encode(const uint8_t* src, int src_size);
--- a/ZAPDTR/ZAPDUtils/Utils/BitConverter.h
+++ b/ZAPDTR/ZAPDUtils/Utils/BitConverter.h
@ -3,6 +3,7 @@
 #include <cstdint>
 #include <limits>
 #include <vector>
+#include <cstring>

 class BitConverter
 {
--- a/ZAPDTR/ZAPDUtils/ZAPDUtils.vcxproj
+++ b/ZAPDTR/ZAPDUtils/ZAPDUtils.vcxproj
@ -72,15 +72,27 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@ -174,6 +186,12 @@
    <ClCompile Include="Utils\MemoryStream.cpp" />
    <ClCompile Include="Utils\StringHelper.cpp" />
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\OTRGui\build\ZERO_CHECK.vcxproj">
+      <Project>{02d10590-9542-3f55-aaf8-6055677e2a2a}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/ZAPDTR/ZAPDUtils/ZAPDUtils.vcxproj.filters
+++ b/ZAPDTR/ZAPDUtils/ZAPDUtils.vcxproj.filters
@ -12,14 +12,14 @@
    <Filter Include="Header Files\Utils">
      <UniqueIdentifier>{d8c2c1e7-b065-4b0f-86a2-46ab46eedc0b}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Header Files\Source Files">
+    <Filter Include="Source Files">
      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
    </Filter>
-    <Filter Include="Header Files\Source Files\Utils">
+    <Filter Include="Source Files\Utils">
      <UniqueIdentifier>{e047919d-7186-49ca-b115-e48fbb5c8743}</UniqueIdentifier>
    </Filter>
-    <Filter Include="Header Files\Source Files\Libraries">
+    <Filter Include="Source Files\Libraries">
      <UniqueIdentifier>{3de9dd46-0dfd-4d48-9f20-9f24e5b80fe0}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
@ -69,19 +69,19 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="Utils\BinaryWriter.cpp">
-      <Filter>Header Files\Source Files\Utils</Filter>
+      <Filter>Source Files\Utils</Filter>
    </ClCompile>
    <ClCompile Include="Utils\MemoryStream.cpp">
-      <Filter>Header Files\Source Files\Utils</Filter>
+      <Filter>Source Files\Utils</Filter>
    </ClCompile>
    <ClCompile Include="Utils\BinaryReader.cpp">
-      <Filter>Header Files\Source Files\Utils</Filter>
+      <Filter>Source Files\Utils</Filter>
    </ClCompile>
    <ClCompile Include="..\lib\tinyxml2\tinyxml2.cpp">
-      <Filter>Header Files\Source Files\Libraries</Filter>
+      <Filter>Source Files\Libraries</Filter>
    </ClCompile>
    <ClCompile Include="Utils\StringHelper.cpp">
-      <Filter>Header Files\Source Files\Utils</Filter>
+      <Filter>Source Files\Utils</Filter>
    </ClCompile>
  </ItemGroup>
 </Project>
--- a/ZAPDTR/lib/libgfxd/priv.h
+++ b/ZAPDTR/lib/libgfxd/priv.h
@ -2,6 +2,8 @@
 #define GFXD_PRIV_H
 #include "gfxd.h"

+#define CONFIG_MT
+
 #ifdef CONFIG_MT
 # ifdef _MSC_VER
 #  define TLOCAL __declspec(thread)
--- a/libultraship/libultraship/ConfigFile.cpp
+++ b/libultraship/libultraship/ConfigFile.cpp
@ -2,6 +2,7 @@
 #include "spdlog/spdlog.h"
 #include "GlobalCtx2.h"
 #include "Window.h"
+#include "GameSettings.h"

 namespace Ship {
 	ConfigFile::ConfigFile(std::shared_ptr<GlobalCtx2> Context, const std::string& Path) : Context(Context), Path(Path), File(Path.c_str()) {
@ -149,6 +150,8 @@ namespace Ship {
 		(*this)["KEYBOARD CONTROLLER BINDING 4"][STR(BTN_STICKDOWN)] = std::to_string(0x01F);
 		(*this)["KEYBOARD CONTROLLER BINDING 4"][STR(BTN_STICKUP)] = std::to_string(0x011);

+		(*this)["ENHANCEMENT SETTINGS"]["TEXT_SPEED"] = "1";
+
 		(*this)["SDL CONTROLLER 1"]["GUID"] = "";
 		(*this)["SDL CONTROLLER 2"]["GUID"] = "";
 		(*this)["SDL CONTROLLER 3"]["GUID"] = "";
--- a/libultraship/libultraship/Controller.h
+++ b/libultraship/libultraship/Controller.h
@ -3,6 +3,7 @@
 #include <memory>
 #include <map>
 #include <string>
+#include <optional>
 #include "stdint.h"
 #include "UltraController.h"
 #include "ControllerAttachment.h"
@ -19,12 +20,17 @@ namespace Ship {
 			void Read(OSContPad* pad);
 			virtual void ReadFromSource() = 0;
 			virtual void WriteToSource(ControllerCallback* controller) = 0;
+			virtual bool Connected() const = 0;
+			virtual bool CanRumble() const = 0;
 			bool isRumbling;

 			void SetButtonMapping(const std::string& szButtonName, int32_t dwScancode);
 			std::shared_ptr<ControllerAttachment> GetAttachment() { return Attachment; }
 			int32_t GetControllerNumber() { return dwControllerNumber; }

+			virtual bool HasPadConf() const = 0;
+			virtual std::optional<std::string> GetPadConfSection() = 0;
+
 		protected:
 			int32_t dwPressedButtons;
 			std::map<int32_t, int32_t> ButtonMapping;
--- a/libultraship/libultraship/Cvar.cpp
+++ b/libultraship/libultraship/Cvar.cpp
@ -5,16 +5,16 @@

 std::map<std::string, CVar*> cvars;

-CVar* CVar_GetVar(char* name) {
+CVar* CVar_GetVar(const char* name) {
    std::string key(name);
    return cvars.contains(key) ? cvars[key] : nullptr;
 }

-extern "C" CVar* CVar_Get(char* name) {
+extern "C" CVar* CVar_Get(const char* name) {
    return CVar_GetVar(name);
 }

-extern "C" s32 CVar_GetS32(char* name, s32 defaultValue) {
+extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) {
    CVar* cvar = CVar_Get(name);

    if (cvar != nullptr) {
@ -25,7 +25,7 @@ extern "C" s32 CVar_GetS32(char* name, s32 defaultValue) {
    return defaultValue;
 }

-extern "C" float CVar_GetFloat(char* name, float defaultValue) {
+extern "C" float CVar_GetFloat(const char* name, float defaultValue) {
    CVar* cvar = CVar_Get(name);

    if (cvar != nullptr) {
@ -36,7 +36,7 @@ extern "C" float CVar_GetFloat(char* name, float defaultValue) {
    return defaultValue;
 }

-extern "C" char* CVar_GetString(char* name, char* defaultValue) {
+extern "C" char* CVar_GetString(const char* name, char* defaultValue) {
    CVar* cvar = CVar_Get(name);

    if (cvar != nullptr) {
@ -47,7 +47,7 @@ extern "C" char* CVar_GetString(char* name, char* defaultValue) {
    return defaultValue;
 }

-extern "C" void CVar_SetS32(char* name, s32 value) {
+extern "C" void CVar_SetS32(const char* name, s32 value) {
    CVar* cvar = CVar_Get(name);
    if (!cvar) {
        cvar = new CVar;
@ -57,7 +57,7 @@ extern "C" void CVar_SetS32(char* name, s32 value) {
    cvar->value.valueS32 = value;
 }

-void CVar_SetFloat(char* name, float value) {
+void CVar_SetFloat(const char* name, float value) {
    CVar* cvar = CVar_Get(name);
    if (!cvar) {
        cvar = new CVar;
@ -67,7 +67,7 @@ void CVar_SetFloat(char* name, float value) {
    cvar->value.valueFloat = value;
 }

-void CVar_SetString(char* name, char* value) {
+void CVar_SetString(const char* name, char* value) {
    CVar* cvar = CVar_Get(name);
    if (!cvar) {
        cvar = new CVar;
@ -78,21 +78,21 @@ void CVar_SetString(char* name, char* value) {
 }


-extern "C" void CVar_RegisterS32(char* name, s32 defaultValue) {
+extern "C" void CVar_RegisterS32(const char* name, s32 defaultValue) {
    CVar* cvar = CVar_Get(name);

    if (cvar == nullptr)
        CVar_SetS32(name, defaultValue);
 }

-extern "C" void CVar_RegisterFloat(char* name, float defaultValue) {
+extern "C" void CVar_RegisterFloat(const char* name, float defaultValue) {
    CVar* cvar = CVar_Get(name);

    if (cvar == nullptr)
        CVar_SetFloat(name, defaultValue);
 }

-extern "C" void CVar_RegisterString(char* name, char* defaultValue) {
+extern "C" void CVar_RegisterString(const char* name, char* defaultValue) {
    CVar* cvar = CVar_Get(name);

    if (cvar == nullptr)
--- a/libultraship/libultraship/Cvar.h
+++ b/libultraship/libultraship/Cvar.h
@ -23,15 +23,15 @@ extern "C"
 //#include <ultra64.h>


-CVar* CVar_Get(char* name);
-s32 CVar_GetS32(char* name, s32 defaultValue);
-float CVar_GetFloat(char* name, float defaultValue);
-char* CVar_GetString(char* name, char* defaultValue);
-void CVar_SetS32(char* name, s32 value);
+CVar* CVar_Get(const char* name);
+s32 CVar_GetS32(const char* name, s32 defaultValue);
+float CVar_GetFloat(const char* name, float defaultValue);
+char* CVar_GetString(const char* name, char* defaultValue);
+void CVar_SetS32(const char* name, s32 value);

-void CVar_RegisterS32(char* name, s32 defaultValue);
-void CVar_RegisterFloat(char* name, float defaultValue);
-void CVar_RegisterString(char* name, char* defaultValue);
+void CVar_RegisterS32(const char* name, s32 defaultValue);
+void CVar_RegisterFloat(const char* name, float defaultValue);
+void CVar_RegisterString(const char* name, char* defaultValue);

 #ifdef __cplusplus
 };
@ -42,8 +42,8 @@ void CVar_RegisterString(char* name, char* defaultValue);
 #include <string>

 extern std::map<std::string, CVar*> cvars;
-CVar* CVar_GetVar(char* name);
-void CVar_SetFloat(char* name, float value);
-void CVar_SetString(char* name, char* value);
+CVar* CVar_GetVar(const char* name);
+void CVar_SetFloat(const char* name, float value);
+void CVar_SetString(const char* name, char* value);
 #endif
 #endif
--- a/libultraship/libultraship/GameSettings.cpp
+++ b/libultraship/libultraship/GameSettings.cpp
@ -16,6 +16,8 @@
 #include <string>
 #include "SohHooks.h"

+#include "Window.h"
+
 #define ABS(var) var < 0 ? -(var) : var

 using namespace Ship;
@ -28,6 +30,9 @@ namespace Game {
    const std::string AudioSection = AUDIO_SECTION;
    const std::string ControllerSection = CONTROLLER_SECTION;
    const std::string EnhancementSection = ENHANCEMENTS_SECTION;
+    const std::string CosmeticsSection = COSMETICS_SECTION;
+    const std::string CheatSection = CHEATS_SECTION;
+

    void UpdateAudio() {
        Audio_SetGameVolume(SEQ_BGM_MAIN, Settings.audio.music_main);
@ -49,48 +54,212 @@ namespace Game {
    	Settings.debug.n64mode = stob(Conf[ConfSection]["n64_mode"]);

        // Enhancements
-        Settings.enhancements.fast_text = stob(Conf[EnhancementSection]["fast_text"]);
-        CVar_SetS32(const_cast<char*>("gFastText"), Settings.enhancements.fast_text);
+        Settings.enhancements.skip_text = stob(Conf[EnhancementSection]["skip_text"]);
+        CVar_SetS32("gSkipText", Settings.enhancements.skip_text);
+
+        Settings.enhancements.text_speed = Ship::stoi(Conf[EnhancementSection]["text_speed"]);
+        CVar_SetS32("gTextSpeed", Settings.enhancements.text_speed);

        Settings.enhancements.disable_lod = stob(Conf[EnhancementSection]["disable_lod"]);
-        CVar_SetS32(const_cast<char*>("gDisableLOD"), Settings.enhancements.disable_lod);
+        CVar_SetS32("gDisableLOD", Settings.enhancements.disable_lod);

        Settings.enhancements.animated_pause_menu = stob(Conf[EnhancementSection]["animated_pause_menu"]);
-        CVar_SetS32(const_cast<char*>("gPauseLiveLink"), Settings.enhancements.animated_pause_menu);
+        CVar_SetS32("gPauseLiveLink", Settings.enhancements.animated_pause_menu);

-        Settings.enhancements.debug_mode = stob(Conf[EnhancementSection]["debug_mode"]);
-        CVar_SetS32(const_cast<char*>("gDebugEnabled"), Settings.enhancements.debug_mode);
+        Settings.enhancements.dynamic_wallet_icon = stob(Conf[EnhancementSection]["dynamic_wallet_icon"]);
+        CVar_SetS32("gDynamicWalletIcon", Settings.enhancements.dynamic_wallet_icon);

+        Settings.enhancements.minimal_ui = stob(Conf[EnhancementSection]["minimal_ui"]);
+        CVar_SetS32("gMinimalUI", Settings.enhancements.minimal_ui);
+
+        Settings.enhancements.visualagony = stob(Conf[EnhancementSection]["visualagony"]);
+        CVar_SetS32("gVisualAgony", Settings.enhancements.visualagony);
+      
+        Settings.enhancements.mm_bunny_hood = stob(Conf[EnhancementSection]["mm_bunny_hood"]);
+        CVar_SetS32("gMMBunnyHood", Settings.enhancements.mm_bunny_hood);
+	    
+        Settings.enhancements.uniform_lr = stob(Conf[EnhancementSection]["uniform_lr"]);
+        //CVar_SetS32("gUniformLR", Settings.enhancements.uniform_lr);
+        CVar_SetS32("gUniformLR", 1);
+
+        Settings.enhancements.newdrops = stob(Conf[EnhancementSection]["newdrops"]);
+        CVar_SetS32("gNewDrops", Settings.enhancements.newdrops);
+        
+        // Audio
        Settings.audio.master = Ship::stof(Conf[AudioSection]["master"]);
-        CVar_SetFloat(const_cast<char*>("gGameMasterVolume"), Settings.audio.master);
+        CVar_SetFloat("gGameMasterVolume", Settings.audio.master);

        Settings.audio.music_main = Ship::stof(Conf[AudioSection]["music_main"]);
-        CVar_SetFloat(const_cast<char*>("gMainMusicVolume"), Settings.audio.music_main);
+        CVar_SetFloat("gMainMusicVolume", Settings.audio.music_main);

        Settings.audio.music_sub = Ship::stof(Conf[AudioSection]["music_sub"]);
-        CVar_SetFloat(const_cast<char*>("gSubMusicVolume"), Settings.audio.music_sub);
+        CVar_SetFloat("gSubMusicVolume", Settings.audio.music_sub);

        Settings.audio.sfx = Ship::stof(Conf[AudioSection]["sfx"]);
-        CVar_SetFloat(const_cast<char*>("gSFXMusicVolume"), Settings.audio.sfx);
+        CVar_SetFloat("gSFXMusicVolume", Settings.audio.sfx);

        Settings.audio.fanfare = Ship::stof(Conf[AudioSection]["fanfare"]);
-        CVar_SetFloat(const_cast<char*>("gFanfareVolume"), Settings.audio.fanfare);
+        CVar_SetFloat("gFanfareVolume", Settings.audio.fanfare);

-        Settings.controller.gyro_sensitivity = Ship::stof(Conf[ControllerSection]["gyro_sensitivity"]);
-        CVar_SetFloat(const_cast<char*>("gGyroSensitivity"), Settings.controller.gyro_sensitivity);
-
-        Settings.controller.rumble_strength = Ship::stof(Conf[ControllerSection]["rumble_strength"]);
-        CVar_SetFloat(const_cast<char*>("gRumbleStrength"), Settings.controller.rumble_strength);
+        // Controllers
+        Settings.controller.rumble_enabled = Ship::stof(Conf[ControllerSection]["rumble_enabled"]);
+        CVar_SetS32("gRumbleEnabled", Settings.controller.rumble_enabled);

        Settings.controller.input_scale = Ship::stof(Conf[ControllerSection]["input_scale"]);
-        CVar_SetFloat(const_cast<char*>("gInputScale"), Settings.controller.input_scale);
+        CVar_SetFloat("gInputScale", Settings.controller.input_scale);

        Settings.controller.input_enabled = stob(Conf[ControllerSection]["input_enabled"]);
-        CVar_SetS32(const_cast<char*>("gInputEnabled"), Settings.controller.input_enabled);
+
+        CVar_SetS32("gInputEnabled", Settings.controller.input_enabled);
+        //Tunics
+        Settings.cosmetic.tunic_kokiri_red = (Conf[CosmeticsSection]["tunic_kokiri_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_red"]) : Settings.cosmetic.tunic_kokiri_red;
+        CVar_SetS32("gTunic_Kokiri_Red", Settings.cosmetic.tunic_kokiri_red);
+        Settings.cosmetic.tunic_kokiri_green = (Conf[CosmeticsSection]["tunic_kokiri_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_green"]) : Settings.cosmetic.tunic_kokiri_green;
+        CVar_SetS32("gTunic_Kokiri_Green", Settings.cosmetic.tunic_kokiri_green);
+        Settings.cosmetic.tunic_kokiri_blue = (Conf[CosmeticsSection]["tunic_kokiri_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_blue"]) : Settings.cosmetic.tunic_kokiri_blue;
+        CVar_SetS32("gTunic_Kokiri_Blue", Settings.cosmetic.tunic_kokiri_blue);
+
+        Settings.cosmetic.tunic_goron_red = (Conf[CosmeticsSection]["tunic_goron_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_red"]) : Settings.cosmetic.tunic_goron_red;
+        CVar_SetS32("gTunic_Goron_Red", Settings.cosmetic.tunic_goron_red);
+        Settings.cosmetic.tunic_goron_green = (Conf[CosmeticsSection]["tunic_goron_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_green"]) : Settings.cosmetic.tunic_goron_green;
+        CVar_SetS32("gTunic_Goron_Green", Settings.cosmetic.tunic_goron_green);
+        Settings.cosmetic.tunic_goron_blue = (Conf[CosmeticsSection]["tunic_goron_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_blue"]) : Settings.cosmetic.tunic_goron_blue;
+        CVar_SetS32("gTunic_Goron_Blue", Settings.cosmetic.tunic_goron_blue);
+
+        Settings.cosmetic.tunic_zora_red = (Conf[CosmeticsSection]["tunic_zora_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_red"]) : Settings.cosmetic.tunic_zora_red;
+        CVar_SetS32("gTunic_Zora_Red", Settings.cosmetic.tunic_zora_red);
+        Settings.cosmetic.tunic_zora_green = (Conf[CosmeticsSection]["tunic_zora_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_green"]) : Settings.cosmetic.tunic_zora_green;
+        CVar_SetS32("gTunic_Zora_Green", Settings.cosmetic.tunic_zora_green);
+        Settings.cosmetic.tunic_zora_blue = (Conf[CosmeticsSection]["tunic_zora_blue"] != "" ) ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_blue"]) : Settings.cosmetic.tunic_zora_blue;
+        CVar_SetS32("gTunic_Zora_Blue", Settings.cosmetic.tunic_zora_blue);
+        //Navi
+        Settings.cosmetic.navi_idle_inner_red = (Conf[CosmeticsSection]["navi_idle_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_red"]) : Settings.cosmetic.navi_idle_inner_red;
+        CVar_SetS32("gNavi_Idle_Inner_Red", Settings.cosmetic.navi_idle_inner_red);
+        Settings.cosmetic.navi_idle_inner_green = (Conf[CosmeticsSection]["navi_idle_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_green"]) : Settings.cosmetic.navi_idle_inner_green;
+        CVar_SetS32("gNavi_Idle_Inner_Green", Settings.cosmetic.navi_idle_inner_green);
+        Settings.cosmetic.navi_idle_inner_blue = (Conf[CosmeticsSection]["navi_idle_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_blue"]) : Settings.cosmetic.navi_idle_inner_blue;
+        CVar_SetS32("gNavi_Idle_Inner_Blue", Settings.cosmetic.navi_idle_inner_blue);
+        Settings.cosmetic.navi_idle_outer_red = (Conf[CosmeticsSection]["navi_idle_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_red"]) : Settings.cosmetic.navi_idle_outer_red;
+        CVar_SetS32("gNavi_Idle_Outer_Red", Settings.cosmetic.navi_idle_outer_red);
+        Settings.cosmetic.navi_idle_outer_green = (Conf[CosmeticsSection]["navi_idle_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_green"]) : Settings.cosmetic.navi_idle_outer_green;
+        CVar_SetS32("gNavi_Idle_Outer_Green", Settings.cosmetic.navi_idle_outer_green);
+        Settings.cosmetic.navi_idle_outer_blue = (Conf[CosmeticsSection]["navi_idle_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_blue"]) : Settings.cosmetic.navi_idle_outer_blue;
+        CVar_SetS32("gNavi_Idle_Outer_Blue", Settings.cosmetic.navi_idle_outer_blue);
+
+        Settings.cosmetic.navi_npc_inner_red = (Conf[CosmeticsSection]["navi_npc_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_red"]) : Settings.cosmetic.navi_npc_inner_red;
+        CVar_SetS32("gNavi_NPC_Inner_Red", Settings.cosmetic.navi_npc_inner_red);
+        Settings.cosmetic.navi_npc_inner_green = (Conf[CosmeticsSection]["navi_npc_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_green"]) : Settings.cosmetic.navi_npc_inner_green;
+        CVar_SetS32("gNavi_NPC_Inner_Green", Settings.cosmetic.navi_npc_inner_green);
+        Settings.cosmetic.navi_npc_inner_blue = (Conf[CosmeticsSection]["navi_npc_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_blue"]) : Settings.cosmetic.navi_npc_inner_blue;
+        CVar_SetS32("gNavi_NPC_Inner_Blue", Settings.cosmetic.navi_npc_inner_blue);
+        Settings.cosmetic.navi_npc_outer_red = (Conf[CosmeticsSection]["navi_npc_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_red"]) : Settings.cosmetic.navi_npc_outer_red;
+        CVar_SetS32("gNavi_NPC_Outer_Red", Settings.cosmetic.navi_npc_outer_red);
+        Settings.cosmetic.navi_npc_outer_green = (Conf[CosmeticsSection]["navi_npc_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_green"]) : Settings.cosmetic.navi_npc_outer_green;
+        CVar_SetS32("gNavi_NPC_Outer_Green", Settings.cosmetic.navi_npc_outer_green);
+        Settings.cosmetic.navi_npc_outer_blue = (Conf[CosmeticsSection]["navi_npc_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_blue"]) : Settings.cosmetic.navi_npc_outer_blue;
+        CVar_SetS32("gNavi_NPC_Outer_Blue", Settings.cosmetic.navi_npc_outer_blue);
+
+        Settings.cosmetic.navi_enemy_inner_red = (Conf[CosmeticsSection]["navi_enemy_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_red"]) : Settings.cosmetic.navi_enemy_inner_red;
+        CVar_SetS32("gNavi_Enemy_Inner_Red", Settings.cosmetic.navi_enemy_inner_red);
+        Settings.cosmetic.navi_enemy_inner_green = (Conf[CosmeticsSection]["navi_enemy_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_green"]) : Settings.cosmetic.navi_enemy_inner_green;
+        CVar_SetS32("gNavi_Enemy_Inner_Green", Settings.cosmetic.navi_enemy_inner_green);
+        Settings.cosmetic.navi_enemy_inner_blue = (Conf[CosmeticsSection]["navi_enemy_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_blue"]) : Settings.cosmetic.navi_enemy_inner_blue;
+        CVar_SetS32("gNavi_Enemy_Inner_Blue", Settings.cosmetic.navi_enemy_inner_blue);
+        Settings.cosmetic.navi_enemy_outer_red = (Conf[CosmeticsSection]["navi_enemy_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_red"]) : Settings.cosmetic.navi_enemy_outer_red;
+        CVar_SetS32("gNavi_Enemy_Outer_Red", Settings.cosmetic.navi_enemy_outer_red);
+        Settings.cosmetic.navi_enemy_outer_green = (Conf[CosmeticsSection]["navi_enemy_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_green"]) : Settings.cosmetic.navi_enemy_outer_green;
+        CVar_SetS32("gNavi_Enemy_Outer_Green", Settings.cosmetic.navi_enemy_outer_green);
+        Settings.cosmetic.navi_enemy_outer_blue = (Conf[CosmeticsSection]["navi_enemy_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_blue"]) : Settings.cosmetic.navi_enemy_outer_blue;
+        CVar_SetS32("gNavi_Enemy_Outer_Blue", Settings.cosmetic.navi_enemy_outer_blue);
+
+        Settings.cosmetic.navi_prop_inner_red = (Conf[CosmeticsSection]["navi_prop_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_red"]) : Settings.cosmetic.navi_prop_inner_red;
+        CVar_SetS32("gNavi_Prop_Inner_Red", Settings.cosmetic.navi_prop_inner_red);
+        Settings.cosmetic.navi_prop_inner_green = (Conf[CosmeticsSection]["navi_prop_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_green"]) : Settings.cosmetic.navi_prop_inner_green;
+        CVar_SetS32("gNavi_Prop_Inner_Green", Settings.cosmetic.navi_prop_inner_green);
+        Settings.cosmetic.navi_prop_inner_blue = (Conf[CosmeticsSection]["navi_prop_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_blue"]) : Settings.cosmetic.navi_prop_inner_blue;
+        CVar_SetS32("gNavi_Prop_Inner_Blue", Settings.cosmetic.navi_prop_inner_blue);
+        Settings.cosmetic.navi_prop_outer_red = (Conf[CosmeticsSection]["navi_prop_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_red"]) : Settings.cosmetic.navi_prop_outer_red;
+        CVar_SetS32("gNavi_Prop_Outer_Red", Settings.cosmetic.navi_prop_outer_red);
+        Settings.cosmetic.navi_prop_outer_green = (Conf[CosmeticsSection]["navi_prop_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_green"]) : Settings.cosmetic.navi_prop_outer_green;
+        CVar_SetS32("gNavi_Prop_Outer_Green", Settings.cosmetic.navi_prop_outer_green);
+        Settings.cosmetic.navi_prop_outer_blue = (Conf[CosmeticsSection]["navi_prop_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_blue"]) : Settings.cosmetic.navi_prop_outer_blue;
+        CVar_SetS32("gNavi_Prop_Outer_Blue", Settings.cosmetic.navi_prop_outer_blue);
+
+
+
+        CVar_SetS32("gInputEnabled", Settings.controller.input_enabled);
+
+        Settings.controller.dpad_pause_name = stob(Conf[ControllerSection]["dpad_pause_name"]);
+        CVar_SetS32("gDpadPauseName", Settings.controller.dpad_pause_name);
+
+        Settings.controller.dpad_ocarina_text = stob(Conf[ControllerSection]["dpad_ocarina_text"]);
+        CVar_SetS32("gDpadOcarinaText", Settings.controller.dpad_ocarina_text);
+
+        Settings.controller.dpad_shop = stob(Conf[ControllerSection]["dpad_shop"]);
+        CVar_SetS32("gDpadShop", Settings.controller.dpad_shop);
+        
+        // Cheats
+        Settings.cheats.debug_mode = stob(Conf[CheatSection]["debug_mode"]);
+        CVar_SetS32("gDebugEnabled", Settings.cheats.debug_mode);
+
+        Settings.cheats.infinite_money = stob(Conf[CheatSection]["infinite_money"]);
+        CVar_SetS32("gInfiniteMoney", Settings.cheats.infinite_money);
+
+        Settings.cheats.infinite_health = stob(Conf[CheatSection]["infinite_health"]);
+        CVar_SetS32("gInfiniteHealth", Settings.cheats.infinite_health);
+
+        Settings.cheats.infinite_ammo = stob(Conf[CheatSection]["infinite_ammo"]);
+        CVar_SetS32("gInfiniteAmmo", Settings.cheats.infinite_ammo);
+
+        Settings.cheats.infinite_magic = stob(Conf[CheatSection]["infinite_magic"]);
+        CVar_SetS32("gInfiniteMagic", Settings.cheats.infinite_magic);
+
+        Settings.cheats.infinite_nayru = stob(Conf[CheatSection]["infinite_nayru"]);
+        CVar_SetS32("gInfiniteNayru", Settings.cheats.infinite_nayru);
+
+        Settings.cheats.no_clip = stob(Conf[CheatSection]["no_clip"]);
+        CVar_SetS32("gNoClip", Settings.cheats.no_clip);
+
+        Settings.cheats.climb_everything = stob(Conf[CheatSection]["climb_everything"]);
+        CVar_SetS32("gClimbEverything", Settings.cheats.climb_everything);
+
+        Settings.cheats.moon_jump_on_l = stob(Conf[CheatSection]["moon_jump_on_l"]);
+        CVar_SetS32("gMoonJumpOnL", Settings.cheats.moon_jump_on_l);
+
+        Settings.cheats.super_tunic = stob(Conf[CheatSection]["super_tunic"]);
+        CVar_SetS32("gSuperTunic", Settings.cheats.super_tunic);
+
+        Settings.cheats.ez_isg = stob(Conf[CheatSection]["ez_isg"]);
+        CVar_SetS32("gEzISG", Settings.cheats.ez_isg);
+
+        Settings.cheats.no_restrict_item = stob(Conf[CheatSection]["no_restrict_item"]);
+        CVar_SetS32("gNoRestrictItems", Settings.cheats.no_restrict_item);
+
+        Settings.cheats.freeze_time = stob(Conf[CheatSection]["freeze_time"]);
+        CVar_SetS32("gFreezeTime", Settings.cheats.freeze_time);
+
+        // Per-Controller
+        LoadPadSettings();

        UpdateAudio();
    }

+    void LoadPadSettings() {
+        const std::shared_ptr<ConfigFile> pConf = GlobalCtx2::GetInstance()->GetConfig();
+        ConfigFile& Conf = *pConf;
+
+        for (const auto& [i, controllers] : Ship::Window::Controllers) {
+            for (const auto& controller : controllers) {
+                if (auto padConfSection = controller->GetPadConfSection()) {
+                    Settings.controller.extra[i].gyro_sensitivity = Ship::stof(Conf[*padConfSection]["gyro_sensitivity"]);
+                    Settings.controller.extra[i].rumble_strength = Ship::stof(Conf[*padConfSection]["rumble_strength"]);
+                    Settings.controller.extra[i].gyro_drift_x = Ship::stof(Conf[*padConfSection]["gyro_drift_x"], 0.0f);
+                    Settings.controller.extra[i].gyro_drift_y = Ship::stof(Conf[*padConfSection]["gyro_drift_y"], 0.0f);
+                }
+            }
+        }
+    }
+
    void SaveSettings() {
 	    const std::shared_ptr<ConfigFile> pConf = GlobalCtx2::GetInstance()->GetConfig();
        ConfigFile& Conf = *pConf;
@ -109,15 +278,90 @@ namespace Game {
        Conf[AudioSection]["fanfare"] = std::to_string(Settings.audio.fanfare);

        // Enhancements
-        Conf[EnhancementSection]["fast_text"] = std::to_string(Settings.enhancements.fast_text);
+        Conf[EnhancementSection]["skip_text"] = std::to_string(Settings.enhancements.skip_text);
+        Conf[EnhancementSection]["text_speed"] = std::to_string(Settings.enhancements.text_speed);
        Conf[EnhancementSection]["disable_lod"] = std::to_string(Settings.enhancements.disable_lod);
        Conf[EnhancementSection]["animated_pause_menu"] = std::to_string(Settings.enhancements.animated_pause_menu);
-        Conf[EnhancementSection]["debug_mode"] = std::to_string(Settings.enhancements.debug_mode);
+        Conf[EnhancementSection]["dynamic_wallet_icon"] = std::to_string(Settings.enhancements.dynamic_wallet_icon);
+        Conf[EnhancementSection]["minimal_ui"] = std::to_string(Settings.enhancements.minimal_ui);
+        Conf[EnhancementSection]["newdrops"] = std::to_string(Settings.enhancements.newdrops);
+        Conf[EnhancementSection]["visualagony"] = std::to_string(Settings.enhancements.visualagony);
+        Conf[EnhancementSection]["mm_bunny_hood"] = std::to_string(Settings.enhancements.mm_bunny_hood);
+        Conf[EnhancementSection]["uniform_lr"] = std::to_string(Settings.enhancements.uniform_lr);

-        Conf[ControllerSection]["gyro_sensitivity"] = std::to_string(Settings.controller.gyro_sensitivity);
-        Conf[ControllerSection]["rumble_strength"]  = std::to_string(Settings.controller.rumble_strength);
+
+        // Controllers
+        Conf[ControllerSection]["rumble_enabled"]  = std::to_string(Settings.controller.rumble_enabled);
        Conf[ControllerSection]["input_scale"]   = std::to_string(Settings.controller.input_scale);
        Conf[ControllerSection]["input_enabled"] = std::to_string(Settings.controller.input_enabled);
+        Conf[ControllerSection]["dpad_pause_name"] = std::to_string(Settings.controller.dpad_pause_name);
+        Conf[ControllerSection]["dpad_ocarina_text"] = std::to_string(Settings.controller.dpad_ocarina_text);
+        Conf[ControllerSection]["dpad_shop"] = std::to_string(Settings.controller.dpad_shop);
+
+
+        // Cosmetics 
+        Conf[CosmeticsSection]["tunic_kokiri_red"] = std::to_string(Settings.cosmetic.tunic_kokiri_red);
+        Conf[CosmeticsSection]["tunic_kokiri_green"] = std::to_string(Settings.cosmetic.tunic_kokiri_green);
+        Conf[CosmeticsSection]["tunic_kokiri_blue"] = std::to_string(Settings.cosmetic.tunic_kokiri_blue);
+
+        Conf[CosmeticsSection]["tunic_goron_red"] = std::to_string(Settings.cosmetic.tunic_goron_red);
+        Conf[CosmeticsSection]["tunic_goron_green"] = std::to_string(Settings.cosmetic.tunic_goron_green);
+        Conf[CosmeticsSection]["tunic_goron_blue"] = std::to_string(Settings.cosmetic.tunic_goron_blue);
+
+        Conf[CosmeticsSection]["tunic_zora_red"] = std::to_string(Settings.cosmetic.tunic_zora_red);
+        Conf[CosmeticsSection]["tunic_zora_green"] = std::to_string(Settings.cosmetic.tunic_zora_green);
+        Conf[CosmeticsSection]["tunic_zora_blue"] = std::to_string(Settings.cosmetic.tunic_zora_blue);
+
+        Conf[CosmeticsSection]["navi_idle_inner_red"] = std::to_string(Settings.cosmetic.navi_idle_inner_red);
+        Conf[CosmeticsSection]["navi_idle_inner_green"] = std::to_string(Settings.cosmetic.navi_idle_inner_green);
+        Conf[CosmeticsSection]["navi_idle_inner_blue"] = std::to_string(Settings.cosmetic.navi_idle_inner_blue);
+        Conf[CosmeticsSection]["navi_idle_outer_red"] = std::to_string(Settings.cosmetic.navi_idle_outer_red);
+        Conf[CosmeticsSection]["navi_idle_outer_green"] = std::to_string(Settings.cosmetic.navi_idle_outer_green);
+        Conf[CosmeticsSection]["navi_idle_outer_blue"] = std::to_string(Settings.cosmetic.navi_idle_outer_blue);
+
+        Conf[CosmeticsSection]["navi_npc_inner_red"] = std::to_string(Settings.cosmetic.navi_npc_inner_red);
+        Conf[CosmeticsSection]["navi_npc_inner_green"] = std::to_string(Settings.cosmetic.navi_npc_inner_green);
+        Conf[CosmeticsSection]["navi_npc_inner_blue"] = std::to_string(Settings.cosmetic.navi_npc_inner_blue);
+        Conf[CosmeticsSection]["navi_npc_outer_red"] = std::to_string(Settings.cosmetic.navi_npc_outer_red);
+        Conf[CosmeticsSection]["navi_npc_outer_green"] = std::to_string(Settings.cosmetic.navi_npc_outer_green);
+        Conf[CosmeticsSection]["navi_npc_outer_blue"] = std::to_string(Settings.cosmetic.navi_npc_outer_blue);
+
+        Conf[CosmeticsSection]["navi_enemy_inner_red"] = std::to_string(Settings.cosmetic.navi_enemy_inner_red);
+        Conf[CosmeticsSection]["navi_enemy_inner_green"] = std::to_string(Settings.cosmetic.navi_enemy_inner_green);
+        Conf[CosmeticsSection]["navi_enemy_inner_blue"] = std::to_string(Settings.cosmetic.navi_enemy_inner_blue);
+        Conf[CosmeticsSection]["navi_enemy_outer_red"] = std::to_string(Settings.cosmetic.navi_enemy_outer_red);
+        Conf[CosmeticsSection]["navi_enemy_outer_green"] = std::to_string(Settings.cosmetic.navi_enemy_outer_green);
+        Conf[CosmeticsSection]["navi_enemy_outer_blue"] = std::to_string(Settings.cosmetic.navi_enemy_outer_blue);
+
+        Conf[CosmeticsSection]["navi_prop_inner_red"] = std::to_string(Settings.cosmetic.navi_prop_inner_red);
+        Conf[CosmeticsSection]["navi_prop_inner_green"] = std::to_string(Settings.cosmetic.navi_prop_inner_green);
+        Conf[CosmeticsSection]["navi_prop_inner_blue"] = std::to_string(Settings.cosmetic.navi_prop_inner_blue);
+        Conf[CosmeticsSection]["navi_prop_outer_red"] = std::to_string(Settings.cosmetic.navi_prop_outer_red);
+        Conf[CosmeticsSection]["navi_prop_outer_green"] = std::to_string(Settings.cosmetic.navi_prop_outer_green);
+        Conf[CosmeticsSection]["navi_prop_outer_blue"] = std::to_string(Settings.cosmetic.navi_prop_outer_blue);
+
+        // Cheats
+        Conf[CheatSection]["debug_mode"] = std::to_string(Settings.cheats.debug_mode);
+        Conf[CheatSection]["infinite_money"] = std::to_string(Settings.cheats.infinite_money);
+        Conf[CheatSection]["infinite_health"] = std::to_string(Settings.cheats.infinite_health);
+        Conf[CheatSection]["infinite_ammo"] = std::to_string(Settings.cheats.infinite_ammo);
+        Conf[CheatSection]["infinite_magic"] = std::to_string(Settings.cheats.infinite_magic);
+        Conf[CheatSection]["no_clip"] = std::to_string(Settings.cheats.no_clip);
+        Conf[CheatSection]["climb_everything"] = std::to_string(Settings.cheats.climb_everything);
+        Conf[CheatSection]["moon_jump_on_l"] = std::to_string(Settings.cheats.moon_jump_on_l);
+        Conf[CheatSection]["super_tunic"] = std::to_string(Settings.cheats.super_tunic);
+
+        // Per-Controller
+        for (const auto& [i, controllers] : Ship::Window::Controllers) {
+            for (const auto& controller : controllers) {
+                if (auto padConfSection = controller->GetPadConfSection()) {
+                    Conf[*padConfSection]["gyro_sensitivity"] = std::to_string(Settings.controller.extra[i].gyro_sensitivity);
+                    Conf[*padConfSection]["rumble_strength"]  = std::to_string(Settings.controller.extra[i].rumble_strength);
+                    Conf[*padConfSection]["gyro_drift_x"] = std::to_string(Settings.controller.extra[i].gyro_drift_x);
+                    Conf[*padConfSection]["gyro_drift_y"]  = std::to_string(Settings.controller.extra[i].gyro_drift_y);
+                }
+            }
+        }

        Conf.Save();
    }
--- a/libultraship/libultraship/GameSettings.h
+++ b/libultraship/libultraship/GameSettings.h
@ -20,18 +20,96 @@ struct SoHConfigType {

    // Enhancements
    struct {
-        bool fast_text = false;
+        int text_speed = 1;
+        bool skip_text = false;
        bool disable_lod = false;
        bool animated_pause_menu = false;
-        bool debug_mode = false;
+        bool dynamic_wallet_icon = false;
+        bool minimal_ui = false;
+        bool newdrops = false;
+        bool visualagony = false;
+        bool mm_bunny_hood = false;
+        bool uniform_lr = true;
    } enhancements;

+    // Controller
+    struct {
        struct {
            float gyro_sensitivity = 1.0f;
            float rumble_strength = 1.0f;
+            float gyro_drift_x = 0.0f;
+            float gyro_drift_y = 0.0f;
+        } extra[4];
+        bool rumble_enabled = true;
        float input_scale = 1.0f;
        bool input_enabled = false;
+        bool dpad_pause_name = false;
+        bool dpad_ocarina_text = false;
+        bool dpad_shop = false;
    } controller;
+
+    struct {
+        int tunic_kokiri_red = 30;
+        int tunic_kokiri_green = 105;
+        int tunic_kokiri_blue = 27;
+        int tunic_goron_red = 100;
+        int tunic_goron_green = 20;
+        int tunic_goron_blue = 0;
+        int tunic_zora_red = 0;
+        int tunic_zora_green = 60;
+        int tunic_zora_blue = 100;
+        
+        int navi_idle_inner_red = 255;
+        int navi_idle_inner_green = 255;
+        int navi_idle_inner_blue = 255;
+        int navi_idle_outer_red = 0;
+        int navi_idle_outer_green = 0;
+        int navi_idle_outer_blue = 255;
+
+        int navi_enemy_inner_red = 255;
+        int navi_enemy_inner_green = 255;
+        int navi_enemy_inner_blue = 0;
+        int navi_enemy_outer_red = 200;
+        int navi_enemy_outer_green = 155;
+        int navi_enemy_outer_blue = 0;
+
+        int navi_npc_inner_red = 150;
+        int navi_npc_inner_green = 150;
+        int navi_npc_inner_blue = 255;
+        int navi_npc_outer_red = 150;
+        int navi_npc_outer_green = 150;
+        int navi_npc_outer_blue = 255;
+
+        int navi_prop_inner_red = 0;
+        int navi_prop_inner_green = 250;
+        int navi_prop_inner_blue = 0;
+        int navi_prop_outer_red = 0;
+        int navi_prop_outer_green = 250;
+        int navi_prop_outer_blue = 0;
+
+    } cosmetic;
+
+    // Cheats
+    struct {
+        bool debug_mode = false;
+        bool infinite_money = false;
+        bool infinite_health = false;
+        bool infinite_ammo = false;
+        bool infinite_magic = false;
+        bool infinite_nayru = false;
+        bool no_clip = false;
+        bool climb_everything = false;
+        bool moon_jump_on_l = false;
+        bool super_tunic = false;
+        bool ez_isg = false;
+        bool no_restrict_item = false;
+        bool freeze_time = false;
+    } cheats;
+
+    // Graphics
+    struct {
+        bool show = false;
+    } graphics;
 };

 enum SeqPlayers {
@ -46,11 +124,14 @@ enum SeqPlayers {
 #define AUDIO_SECTION "AUDIO SETTINGS"
 #define CONTROLLER_SECTION "CONTROLLER SECTION"
 #define ENHANCEMENTS_SECTION "ENHANCEMENT SETTINGS"
+#define COSMETICS_SECTION "COSMETIC SETTINGS"
+#define CHEATS_SECTION "CHEATS SETTINGS"

 namespace Game {
    extern SoHConfigType Settings;
    void InitSettings();
    void LoadSettings();
+    void LoadPadSettings();
    void SaveSettings();
    void SetSeqPlayerVolume(SeqPlayers playerId, float volume);
 }
--- a/libultraship/libultraship/GameVersions.h
+++ b/libultraship/libultraship/GameVersions.h
@ -0,0 +1,20 @@
+#pragma once
+
+#define OOT_NTSC_10				0xEC7011B7
+#define OOT_NTSC_11				0xD43DA81F
+#define OOT_NTSC_12				0x693BA2AE
+#define OOT_PAL_10				0xB044B569
+#define OOT_PAL_11				0xB2055FBD
+#define OOT_NTSC_JP_GC_CE		0xF7F52DB8
+#define OOT_NTSC_JP_GC			0xF611F4BA
+#define OOT_NTSC_US_GC			0xF3DD35BA
+#define OOT_PAL_GC				0x09465AC3
+#define OOT_NTSC_JP_MQ			0xF43B45BA
+#define OOT_NTSC_US_MQ			0xF034001A
+#define OOT_PAL_MQ				0x1D4136F3
+#define OOT_PAL_GC_DBG1			0x871E1C92 // 03-21-2002 build
+#define OOT_PAL_GC_DBG2			0x87121EFE // 03-13-2002 build
+#define OOT_PAL_GC_MQ_DBG		0x917D18F6
+#define OOT_IQUE_TW				0x3D81FB3E
+#define OOT_IQUE_CN				0xB1E1E07B
+#define OOT_UNKNOWN				0xFFFFFFFF
--- a/libultraship/libultraship/KeyboardController.h
+++ b/libultraship/libultraship/KeyboardController.h
@ -10,11 +10,16 @@ namespace Ship {

 			void ReadFromSource();
 			void WriteToSource(ControllerCallback* controller);
+			bool Connected() const { return true; }
+			bool CanRumble() const { return false; }

 			bool PressButton(int32_t dwScancode);
 			bool ReleaseButton(int32_t dwScancode);
 			void ReleaseAllButtons();

+			bool HasPadConf() const { return false; }
+			std::optional<std::string> GetPadConfSection() { return {}; }
+
 		protected:
 			std::string GetControllerType();
 			std::string GetConfSection();
--- a/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
+++ b/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
@ -170,6 +170,12 @@
 #define G_TEXRECT_WIDE          0x37
 #define G_FILLWIDERECT          0x38

+/* GFX Effects */
+
+// RDP Cmd
+#define G_SETGRAYSCALE       0x39
+#define G_SETINTENSITY       0x40
+
 /*
 * The following commands are the "generated" RDP commands; the user
 * never sees them, the RSP microcode generates them.
@ -2821,6 +2827,14 @@ _DW({                                   \
    _g->words.w1 = 0;                       \
 }

+#define gsSPGrayscale(pkt, state)                   \
+{                                                   \
+    Gfx *_g = (Gfx *)(pkt);                         \
+                                                    \
+    _g->words.w0 = _SHIFTL(G_SETGRAYSCALE, 24, 8);  \
+    _g->words.w1 = state;                           \
+}
+
 #ifdef  F3DEX_GBI_2
    /*
     *  One gSPGeometryMode(pkt,c,s) GBI is equal to these two GBIs.
@ -3161,6 +3175,8 @@ _DW({                                   \
             (_SHIFTL(r, 24, 8) | _SHIFTL(g, 16, 8) |   \
              _SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8)))

+#define gsDPSetGrayscaleColor(pkt, r, g, b, lerp)        \
+            DPRGBColor(pkt, G_SETINTENSITY, r, g, b, lerp)
 #define gDPSetEnvColor(pkt, r, g, b, a)                 \
            DPRGBColor(pkt, G_SETENVCOLOR, r,g,b,a)
 #define gsDPSetEnvColor(r, g, b, a)                 \
@ -3177,7 +3193,6 @@ _DW({                                   \
            gDPSetColor(pkt, G_SETFILLCOLOR, (d))
 #define gsDPSetFillColor(d)                     \
            gsDPSetColor(G_SETFILLCOLOR, (d))
-
 #define gDPSetPrimDepth(pkt, z, dz)                 \
        gDPSetColor(pkt, G_SETPRIMDEPTH,            \
                _SHIFTL(z, 16, 16) | _SHIFTL(dz, 0, 16))
@ -4223,6 +4238,17 @@ _DW({                                   \
    gDPPipeSync(pkt);                       \
 })

+#define gDPLoadTLUT_pal128(pkt, pal, dram)              \
+_DW({                                   \
+    gDPSetTextureImage(pkt, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dram);  \
+    gDPTileSync(pkt);                       \
+    gDPSetTile(pkt, 0, 0, 0, 256 + ((pal)&1)*128,   \
+        G_TX_LOADTILE, 0 , 0, 0, 0, 0, 0, 0);           \
+    gDPLoadSync(pkt);                       \
+    gDPLoadTLUTCmd(pkt, G_TX_LOADTILE, 127);            \
+    gDPPipeSync(pkt);                       \
+})
+
 #else /* **** WORKAROUND hardware 1 load_tlut bug ****** */

 #define gDPLoadTLUT_pal256(pkt, dram)                                   \
--- a/Show more
+++ b/Show more