`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, 17 insertions, 9 deletions

diff --git a/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp b/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
index 2f16eac..016df12 100644
--- a/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
+++ b/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
@@ -1,5 +1,6 @@
 #include "SetAlternateHeaders.h"
 
+#include "Globals.h"
 #include "Utils/BitConverter.h"
 #include "Utils/StringHelper.h"
 #include "ZFile.h"
@@ -10,8 +11,12 @@ SetAlternateHeaders::SetAlternateHeaders(ZFile* nParent) : ZRoomCommand(nParent)
 
 void SetAlternateHeaders::DeclareReferences([[maybe_unused]] const std::string& prefix)
 {
-	if (segmentOffset != 0)
-		parent->AddDeclarationPlaceholder(segmentOffset);
+	if (cmdArg2 != 0)
+	{
+		std::string varName =
+			StringHelper::Sprintf("%sAlternateHeaders0x%06X", prefix.c_str(), segmentOffset);
+		parent->AddDeclarationPlaceholder(segmentOffset, varName);
+	}
 }
 
 void SetAlternateHeaders::ParseRawDataLate()
@@ -42,23 +47,26 @@ void SetAlternateHeaders::DeclareReferencesLate(const std::string& prefix)
 
 		for (size_t i = 0; i < headers.size(); i++)
 		{
-			declaration += StringHelper::Sprintf(
-				"\t%s,", parent->GetDeclarationPtrName(headers.at(i)).c_str());
+			std::string altHeaderName;
+			Globals::Instance->GetSegmentedPtrName(headers.at(i), parent, "", altHeaderName);
+
+			declaration += StringHelper::Sprintf("\t%s,", altHeaderName.c_str());
 
 			if (i + 1 < headers.size())
 				declaration += "\n";
 		}
 
-		parent->AddDeclarationArray(
-			segmentOffset, DeclarationAlignment::Align4, headers.size() * 4, "SceneCmd*",
-			StringHelper::Sprintf("%sAltHeader_%06X", prefix.c_str(), segmentOffset), 0,
-			declaration);
+		std::string varName =
+			StringHelper::Sprintf("%sAlternateHeaders0x%06X", prefix.c_str(), segmentOffset);
+		parent->AddDeclarationArray(segmentOffset, GetDeclarationAlignment(), headers.size() * 4,
+		                            "SceneCmd*", varName, 0, declaration);
 	}
 }
 
 std::string SetAlternateHeaders::GetBodySourceCode() const
 {
-	std::string listName = parent->GetDeclarationPtrName(cmdArg2);
+	std::string listName;
+	Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "SceneCmd*", listName);
 	return StringHelper::Sprintf("SCENE_CMD_ALTERNATE_HEADER_LIST(%s)", listName.c_str());
 }