`ExternalFile`: Expose other XML's declarations during extraction (#151)

* proof of concept

* fix header include paths

* GetDeclarationAlignment and others

* this should fix this

* minor

* DeclareVar in ExtractFromXML

* fix vtx intersections

* Fix segmented vtxs

* --version

* zcollision changes

* Use GetSegmentedPtrName a lot more

* memory related stuff

* minor style fixes and use the actual symbol for zlinkanimation instead of the hex address

* Simplify lots of GetSourceOutputCode

* ZSkeleton cleanup and other changes

* Elevate unknown types in skeleton to errors

* ZAnimation cleanup

* Add ExternalFile to config

* delete some code

* Remove unused code

* fix conflicts

* format

* remove redundant constructors

* minor fixes

* fix vtx warnings

* extract every vtx as standalone files

* format

* uups

* Bugfix: don't create extra blank files

* Fix some Vtx warnings and remove "defaulting to normal" in skeleton error

* Refactor ZLimb

* Make each limb to look up in every file for dlists

* Use GetSegmentedArrayIndexedName in VTX references in dlists

* simplify simple condition

* search by type

* run format

* Revert "search by type"

This reverts commit a049bdfc94c4ab04613b354f466dee836a20508a.

* Add range checks

* uups

* Always set rangeEnd

* special case zsymbol

* Revert "Revert "search by type""

This reverts commit 3f6e77c780bd30dc7000614304021a0940168316.

* symbol fix and IsOffsetInFileRange

* Bugfix and minor checks

* run format

* Don't extract data from external files

* Fix extraction of overly big tluts

* Minor changes

* More minor fixes

* Fix clang warnings

* Remove unused parameter

* Fix merge issues

* Fix ZLimbTable::DeclareVar

* Fix limbs not naming properly their DLists

* Remove segment number check

* Fix merge problems

* Run formatter

* Maybe fix?

* path

* empty commit

* Fix a typo

* Fix merge issues

* Fix null ptr dereferencing

* Fix merge issues and some clang warnings

* Format

* Fix not-matching

* Format

* Fix merge issues

* Fix exporter

* Last fixes I hope

* Fix merge issues

* format

* fix

* fix

* I'm dumb

* format

* static fix

* Whoops

* fix asan

* Fix?

* fix

* reduce artificial changes

* reduce artificial changes 2

* reorder more stuff

* format

* fix borken thing

* Remove redundant stuff in zfile

* fix

* Format

* Fix conflict issues

* format

* cleanup header includes

* format

* Add error checks in for ExternalXMLFolder

* format

1 files changed, 24 insertions, 8 deletions

diff --git a/ZAPD/ZTexture.cpp b/ZAPD/ZTexture.cpp
index 624a955..49ac16c 100644
--- a/ZAPD/ZTexture.cpp
+++ b/ZAPD/ZTexture.cpp
@@ -33,6 +33,10 @@ void ZTexture::ExtractFromBinary(uint32_t nRawDataIndex, int32_t nWidth, int32_t
 	name = GetDefaultName(parent->GetName());
 	outName = name;
 
+	// Don't parse raw data of external files
+	if (parent->GetMode() == ZFileMode::ExternalFile)
+		return;
+
 	ParseRawData();
 	CalcHash();
 }
@@ -327,15 +331,10 @@ void ZTexture::DeclareReferences([[maybe_unused]] const std::string& prefix)
 			if (format == TextureType::Palette4bpp)
 				tlutDim = 4;
 
-			auto filepath = Globals::Instance->outputPath / fs::path(name).stem();
-			std::string incStr = StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(),
-			                                           GetExternalExtension().c_str());
-
 			tlut = new ZTexture(parent);
 			tlut->ExtractFromBinary(tlutOffset, tlutDim, tlutDim, TextureType::RGBA16bpp, true);
 			parent->AddTextureResource(tlutOffset, tlut);
-			parent->AddDeclarationIncludeArray(tlutOffset, incStr, tlut->GetRawDataSize(),
-			                                   tlut->GetSourceTypeName(), tlut->GetName(), 0);
+			tlut->DeclareVar(prefix, "");
 		}
 		else
 		{
@@ -738,15 +737,32 @@ Declaration* ZTexture::DeclareVar(const std::string& prefix,
                                   [[maybe_unused]] const std::string& bodyStr)
 {
 	std::string auxName = name;
+	std::string auxOutName = outName;
 
-	if (name == "")
+	if (auxName == "")
 		auxName = GetDefaultName(prefix);
 
-	auto filepath = Globals::Instance->outputPath / fs::path(auxName).stem();
+	if (auxOutName == "")
+		auxOutName = GetDefaultName(prefix);
+
+	auto filepath = Globals::Instance->outputPath / fs::path(auxOutName).stem();
 
 	std::string incStr =
 		StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), GetExternalExtension().c_str());
 
+	if (!Globals::Instance->cfg.texturePool.empty())
+	{
+		CalcHash();
+
+		// TEXTURE POOL CHECK
+		const auto& poolEntry = Globals::Instance->cfg.texturePool.find(hash);
+		if (poolEntry != Globals::Instance->cfg.texturePool.end())
+		{
+			incStr = StringHelper::Sprintf("%s.%s.inc.c", poolEntry->second.path.c_str(),
+			                               GetExternalExtension().c_str());
+		}
+	}
+
 	Declaration* decl = parent->AddDeclarationIncludeArray(rawDataIndex, incStr, GetRawDataSize(),
 	                                                       GetSourceTypeName(), auxName, 0);
 	decl->staticConf = staticConf;