Exporter Support Added (#127)

* Initial exporter implementation

* Updated to use static library.

* minor cleanup

* Cleaned things up a bit

* Fixed merge issues

* Minor commenting

* Added Begin and End functions, and removed HL stuff (to be turned into an exporter at a later date)

* Cleaned some stuff up

* Additional cleanup

* Removed some commented out code

* Fixed compilation issues

* Cleanup

* Fixed merge issues

* Got rid of unused windows.h includes

* Cleanup

* Fixed warning

* Removed additional redundancies

* Cleanup

* Fixed merge issues

* Fixed some compiler issues, added makefile for exportertest.

* Removed redundancies and clang formatted

* Made sure exportertest compiles with C++17

* Moved certain files into new "Utils" folder.

* GetExporterMap uses a reference now

* Minor fixes and updates.

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>

49 files changed, 132 insertions, 132 deletions

diff --git a/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp b/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp
index 18cfd1e..d375fd1 100644
--- a/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp
+++ b/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp
@@ -1,8 +1,8 @@
 #include "SetActorCutsceneList.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetActorList.cpp b/ZAPD/ZRoom/Commands/SetActorList.cpp
index b93623b..9b7c93c 100644
--- a/ZAPD/ZRoom/Commands/SetActorList.cpp
+++ b/ZAPD/ZRoom/Commands/SetActorList.cpp
@@ -1,8 +1,8 @@
 #include "SetActorList.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZNames.h"
 #include "ZRoom/ZRoom.h"
diff --git a/ZAPD/ZRoom/Commands/SetActorList.h b/ZAPD/ZRoom/Commands/SetActorList.h
index bb4091f..36d00bb 100644
--- a/ZAPD/ZRoom/Commands/SetActorList.h
+++ b/ZAPD/ZRoom/Commands/SetActorList.h
@@ -5,16 +5,6 @@
 class ActorSpawnEntry
 {
 public:
-	ActorSpawnEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
-
-	std::string GetBodySourceCode() const;
-
-	std::string GetSourceTypeName() const;
-	int32_t GetRawDataSize() const;
-
-	uint16_t GetActorId() const;
-
-protected:
 	uint16_t actorNum;
 	int16_t posX;
 	int16_t posY;
@@ -23,6 +13,15 @@ protected:
 	int16_t rotY;
 	int16_t rotZ;
 	uint16_t initVar;
+
+	ActorSpawnEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
+
+	std::string GetBodySourceCode() const;
+
+	std::string GetSourceTypeName() const;
+	int32_t GetRawDataSize() const;
+
+	uint16_t GetActorId() const;
 };
 
 class SetActorList : public ZRoomCommand
diff --git a/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp b/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
index c5f9387..f869ac4 100644
--- a/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
+++ b/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
@@ -1,7 +1,7 @@
 #include "SetAlternateHeaders.h"
 
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 
 SetAlternateHeaders::SetAlternateHeaders(ZFile* nParent) : ZRoomCommand(nParent)
diff --git a/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp b/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
index aeef2e8..89e7a96 100644
--- a/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
+++ b/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
@@ -1,8 +1,8 @@
 #include "SetAnimatedMaterialList.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetCameraSettings.cpp b/ZAPD/ZRoom/Commands/SetCameraSettings.cpp
index fb41b88..ae2d31c 100644
--- a/ZAPD/ZRoom/Commands/SetCameraSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetCameraSettings.cpp
@@ -1,7 +1,7 @@
 #include "SetCameraSettings.h"
 
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 
 SetCameraSettings::SetCameraSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetCameraSettings.h b/ZAPD/ZRoom/Commands/SetCameraSettings.h
index 1a0eb11..6cd629c 100644
--- a/ZAPD/ZRoom/Commands/SetCameraSettings.h
+++ b/ZAPD/ZRoom/Commands/SetCameraSettings.h
@@ -14,7 +14,8 @@ public:
 	std::string GetCommandCName() const override;
 	RoomCommand GetRoomCommand() const override;
 
-private:
 	uint8_t cameraMovement;
 	uint32_t mapHighlight;
+
+private:
 };
diff --git a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
index 569a7c0..22273e0 100644
--- a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
+++ b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
@@ -1,7 +1,7 @@
 #include "SetCollisionHeader.h"
 
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetCollisionHeader.h b/ZAPD/ZRoom/Commands/SetCollisionHeader.h
index 7ea15ef..b0a599f 100644
--- a/ZAPD/ZRoom/Commands/SetCollisionHeader.h
+++ b/ZAPD/ZRoom/Commands/SetCollisionHeader.h
@@ -6,6 +6,8 @@
 class SetCollisionHeader : public ZRoomCommand
 {
 public:
+	ZCollisionHeader* collisionHeader;
+
 	SetCollisionHeader(ZFile* nParent);
 	~SetCollisionHeader();
 
@@ -15,7 +17,4 @@ public:
 
 	std::string GetCommandCName() const override;
 	RoomCommand GetRoomCommand() const override;
-
-private:
-	ZCollisionHeader* collisionHeader;
 };
diff --git a/ZAPD/ZRoom/Commands/SetCsCamera.cpp b/ZAPD/ZRoom/Commands/SetCsCamera.cpp
index 0402d93..0aa7a20 100644
--- a/ZAPD/ZRoom/Commands/SetCsCamera.cpp
+++ b/ZAPD/ZRoom/Commands/SetCsCamera.cpp
@@ -1,7 +1,7 @@
 #include "SetCsCamera.h"
 
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetCsCamera.h b/ZAPD/ZRoom/Commands/SetCsCamera.h
index e62b073..820e584 100644
--- a/ZAPD/ZRoom/Commands/SetCsCamera.h
+++ b/ZAPD/ZRoom/Commands/SetCsCamera.h
@@ -25,6 +25,9 @@ public:
 class SetCsCamera : public ZRoomCommand
 {
 public:
+	std::vector<CsCameraEntry> cameras;
+	std::vector<ZVector> points;
+
 	SetCsCamera(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -35,8 +38,4 @@ public:
 	RoomCommand GetRoomCommand() const override;
 	size_t GetRawDataSize() const override;
 	std::string GetCommandCName() const override;
-
-private:
-	std::vector<CsCameraEntry> cameras;
-	std::vector<ZVector> points;
 };
diff --git a/ZAPD/ZRoom/Commands/SetCutscenes.cpp b/ZAPD/ZRoom/Commands/SetCutscenes.cpp
index d9ecb79..84e2d72 100644
--- a/ZAPD/ZRoom/Commands/SetCutscenes.cpp
+++ b/ZAPD/ZRoom/Commands/SetCutscenes.cpp
@@ -1,8 +1,8 @@
 #include "SetCutscenes.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetEchoSettings.cpp b/ZAPD/ZRoom/Commands/SetEchoSettings.cpp
index 275dc63..79a278b 100644
--- a/ZAPD/ZRoom/Commands/SetEchoSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetEchoSettings.cpp
@@ -1,5 +1,5 @@
 #include "SetEchoSettings.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 SetEchoSettings::SetEchoSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetEchoSettings.h b/ZAPD/ZRoom/Commands/SetEchoSettings.h
index 5963263..4a2714a 100644
--- a/ZAPD/ZRoom/Commands/SetEchoSettings.h
+++ b/ZAPD/ZRoom/Commands/SetEchoSettings.h
@@ -5,6 +5,8 @@
 class SetEchoSettings : public ZRoomCommand
 {
 public:
+	uint8_t echo;
+
 	SetEchoSettings(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -15,5 +17,4 @@ public:
 	RoomCommand GetRoomCommand() const override;
 
 private:
-	uint8_t echo;
 };
diff --git a/ZAPD/ZRoom/Commands/SetEntranceList.cpp b/ZAPD/ZRoom/Commands/SetEntranceList.cpp
index 4ba73a2..bdc4022 100644
--- a/ZAPD/ZRoom/Commands/SetEntranceList.cpp
+++ b/ZAPD/ZRoom/Commands/SetEntranceList.cpp
@@ -1,7 +1,7 @@
 #include "SetEntranceList.h"
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "SetStartPositionList.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetEntranceList.h b/ZAPD/ZRoom/Commands/SetEntranceList.h
index 5e76f9f..e13e9a8 100644
--- a/ZAPD/ZRoom/Commands/SetEntranceList.h
+++ b/ZAPD/ZRoom/Commands/SetEntranceList.h
@@ -5,18 +5,19 @@
 class EntranceEntry
 {
 public:
+	uint8_t startPositionIndex;
+	uint8_t roomToLoad;
+
 	EntranceEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
 
 	std::string GetBodySourceCode() const;
-
-protected:
-	uint8_t startPositionIndex;
-	uint8_t roomToLoad;
 };
 
 class SetEntranceList : public ZRoomCommand
 {
 public:
+	std::vector<EntranceEntry> entrances;
+
 	SetEntranceList(ZFile* nParent);
 
 	void DeclareReferences(const std::string& prefix) override;
@@ -27,7 +28,4 @@ public:
 
 	RoomCommand GetRoomCommand() const override;
 	std::string GetCommandCName() const override;
-
-private:
-	std::vector<EntranceEntry> entrances;
 };
diff --git a/ZAPD/ZRoom/Commands/SetExitList.cpp b/ZAPD/ZRoom/Commands/SetExitList.cpp
index 5bfd19a..2203c85 100644
--- a/ZAPD/ZRoom/Commands/SetExitList.cpp
+++ b/ZAPD/ZRoom/Commands/SetExitList.cpp
@@ -1,7 +1,7 @@
 #include "SetExitList.h"
 
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetLightList.cpp b/ZAPD/ZRoom/Commands/SetLightList.cpp
index a12832c..3bfc3a0 100644
--- a/ZAPD/ZRoom/Commands/SetLightList.cpp
+++ b/ZAPD/ZRoom/Commands/SetLightList.cpp
@@ -1,6 +1,6 @@
 #include "SetLightList.h"
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 
 SetLightList::SetLightList(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp
index e677738..cad2152 100644
--- a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp
@@ -1,6 +1,6 @@
 #include "SetLightingSettings.h"
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetLightingSettings.h b/ZAPD/ZRoom/Commands/SetLightingSettings.h
index 7717957..03a2d4e 100644
--- a/ZAPD/ZRoom/Commands/SetLightingSettings.h
+++ b/ZAPD/ZRoom/Commands/SetLightingSettings.h
@@ -5,13 +5,6 @@
 class LightingSettings
 {
 public:
-	LightingSettings(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
-
-	std::string GetBodySourceCode() const;
-
-	size_t GetRawDataSize() const;
-
-protected:
 	uint8_t ambientClrR, ambientClrG, ambientClrB;
 	uint8_t diffuseClrA_R, diffuseClrA_G, diffuseClrA_B;
 	uint8_t diffuseDirA_X, diffuseDirA_Y, diffuseDirA_Z;
@@ -20,11 +13,19 @@ protected:
 	uint8_t fogClrR, fogClrG, fogClrB;
 	uint16_t unk;
 	uint16_t drawDistance;
+
+	LightingSettings(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
+
+	std::string GetBodySourceCode() const;
+
+	size_t GetRawDataSize() const;
 };
 
 class SetLightingSettings : public ZRoomCommand
 {
 public:
+	std::vector<LightingSettings> settings;
+
 	SetLightingSettings(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -36,5 +37,4 @@ public:
 	std::string GetCommandCName() const override;
 
 private:
-	std::vector<LightingSettings> settings;
 };
diff --git a/ZAPD/ZRoom/Commands/SetMesh.cpp b/ZAPD/ZRoom/Commands/SetMesh.cpp
index f2a9676..08ae6b8 100644
--- a/ZAPD/ZRoom/Commands/SetMesh.cpp
+++ b/ZAPD/ZRoom/Commands/SetMesh.cpp
@@ -1,8 +1,8 @@
 #include "SetMesh.h"
 #include <Globals.h>
-#include <Path.h>
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include <Utils/Path.h>
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 #include "ZBackground.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
@@ -306,9 +306,7 @@ void BgImage::ParseRawData()
 ZBackground* BgImage::MakeBackground(segptr_t ptr, const std::string& prefix)
 {
 	if (ptr == 0)
-	{
 		return nullptr;
-	}
 
 	uint32_t backAddress = Seg2Filespace(ptr, parent->baseAddress);
 
diff --git a/ZAPD/ZRoom/Commands/SetMesh.h b/ZAPD/ZRoom/Commands/SetMesh.h
index 20ec9c3..f4b69df 100644
--- a/ZAPD/ZRoom/Commands/SetMesh.h
+++ b/ZAPD/ZRoom/Commands/SetMesh.h
@@ -168,6 +168,9 @@ protected:
 class SetMesh : public ZRoomCommand
 {
 public:
+	uint8_t data;
+	uint8_t meshHeaderType;
+
 	SetMesh(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -180,7 +183,6 @@ public:
 	std::string GetCommandCName() const override;
 
 private:
-	uint8_t meshHeaderType;
 	std::shared_ptr<PolygonTypeBase> polyType;
 
 	std::string GenDListExterns(ZDisplayList* dList);
diff --git a/ZAPD/ZRoom/Commands/SetMinimapChests.cpp b/ZAPD/ZRoom/Commands/SetMinimapChests.cpp
index bd9c8a0..781cbc7 100644
--- a/ZAPD/ZRoom/Commands/SetMinimapChests.cpp
+++ b/ZAPD/ZRoom/Commands/SetMinimapChests.cpp
@@ -1,8 +1,8 @@
 #include "SetMinimapChests.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetMinimapList.cpp b/ZAPD/ZRoom/Commands/SetMinimapList.cpp
index c94ef30..27c8aef 100644
--- a/ZAPD/ZRoom/Commands/SetMinimapList.cpp
+++ b/ZAPD/ZRoom/Commands/SetMinimapList.cpp
@@ -1,8 +1,8 @@
 #include "SetMinimapList.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetObjectList.cpp b/ZAPD/ZRoom/Commands/SetObjectList.cpp
index d3184b4..3d2b295 100644
--- a/ZAPD/ZRoom/Commands/SetObjectList.cpp
+++ b/ZAPD/ZRoom/Commands/SetObjectList.cpp
@@ -1,8 +1,8 @@
 #include "SetObjectList.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZNames.h"
 #include "ZRoom/ZRoom.h"
diff --git a/ZAPD/ZRoom/Commands/SetPathways.cpp b/ZAPD/ZRoom/Commands/SetPathways.cpp
index 13ee7a7..3355615 100644
--- a/ZAPD/ZRoom/Commands/SetPathways.cpp
+++ b/ZAPD/ZRoom/Commands/SetPathways.cpp
@@ -1,7 +1,7 @@
 #include "SetPathways.h"
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp b/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp
index d667328..350e5a8 100644
--- a/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp
+++ b/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp
@@ -1,7 +1,7 @@
 #include "SetRoomBehavior.h"
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 SetRoomBehavior::SetRoomBehavior(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetRoomBehavior.h b/ZAPD/ZRoom/Commands/SetRoomBehavior.h
index 7989ea3..1022654 100644
--- a/ZAPD/ZRoom/Commands/SetRoomBehavior.h
+++ b/ZAPD/ZRoom/Commands/SetRoomBehavior.h
@@ -5,16 +5,6 @@
 class SetRoomBehavior : public ZRoomCommand
 {
 public:
-	SetRoomBehavior(ZFile* nParent);
-
-	void ParseRawData() override;
-
-	std::string GetBodySourceCode() const override;
-
-	RoomCommand GetRoomCommand() const override;
-	std::string GetCommandCName() const override;
-
-protected:
 	uint8_t gameplayFlags;
 	uint32_t gameplayFlags2;
 
@@ -27,4 +17,15 @@ protected:
 
 	uint8_t enablePosLights;
 	uint8_t kankyoContextUnkE2;
+
+	SetRoomBehavior(ZFile* nParent);
+
+	void ParseRawData() override;
+
+	std::string GetBodySourceCode() const override;
+
+	RoomCommand GetRoomCommand() const override;
+	std::string GetCommandCName() const override;
+
+protected:
 };
diff --git a/ZAPD/ZRoom/Commands/SetRoomList.cpp b/ZAPD/ZRoom/Commands/SetRoomList.cpp
index 8cac82e..af2edcf 100644
--- a/ZAPD/ZRoom/Commands/SetRoomList.cpp
+++ b/ZAPD/ZRoom/Commands/SetRoomList.cpp
@@ -1,8 +1,8 @@
 #include "SetRoomList.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetRoomList.h b/ZAPD/ZRoom/Commands/SetRoomList.h
index eaa2013..d0690f2 100644
--- a/ZAPD/ZRoom/Commands/SetRoomList.h
+++ b/ZAPD/ZRoom/Commands/SetRoomList.h
@@ -5,17 +5,18 @@
 class RoomEntry
 {
 public:
-	RoomEntry(uint32_t nVAS, uint32_t nVAE);
-	RoomEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
-
-protected:
 	int32_t virtualAddressStart;
 	int32_t virtualAddressEnd;
+
+	RoomEntry(uint32_t nVAS, uint32_t nVAE);
+	RoomEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex);
 };
 
 class SetRoomList : public ZRoomCommand
 {
 public:
+	std::vector<RoomEntry> rooms;
+
 	SetRoomList(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -28,5 +29,4 @@ public:
 	std::string GetCommandCName() const override;
 
 private:
-	std::vector<RoomEntry> rooms;
 };
diff --git a/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp b/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp
index d8af2d1..b16f135 100644
--- a/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp
+++ b/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp
@@ -1,6 +1,6 @@
 #include "SetSkyboxModifier.h"
 
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 SetSkyboxModifier::SetSkyboxModifier(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetSkyboxModifier.h b/ZAPD/ZRoom/Commands/SetSkyboxModifier.h
index 1b0e022..97310ca 100644
--- a/ZAPD/ZRoom/Commands/SetSkyboxModifier.h
+++ b/ZAPD/ZRoom/Commands/SetSkyboxModifier.h
@@ -5,6 +5,9 @@
 class SetSkyboxModifier : public ZRoomCommand
 {
 public:
+	uint8_t disableSky;
+	uint8_t disableSunMoon;
+
 	SetSkyboxModifier(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -15,6 +18,4 @@ public:
 	RoomCommand GetRoomCommand() const override;
 
 private:
-	uint8_t disableSky;
-	uint8_t disableSunMoon;
 };
diff --git a/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp b/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp
index 43c5c1e..d5ae7ef 100644
--- a/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp
@@ -1,6 +1,6 @@
 #include "SetSkyboxSettings.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 SetSkyboxSettings::SetSkyboxSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetSkyboxSettings.h b/ZAPD/ZRoom/Commands/SetSkyboxSettings.h
index 380addc..6007e7d 100644
--- a/ZAPD/ZRoom/Commands/SetSkyboxSettings.h
+++ b/ZAPD/ZRoom/Commands/SetSkyboxSettings.h
@@ -5,6 +5,11 @@
 class SetSkyboxSettings : public ZRoomCommand
 {
 public:
+	uint8_t unk1;  // (MM Only)
+	uint8_t skyboxNumber;
+	uint8_t cloudsType;
+	uint8_t isIndoors;
+
 	SetSkyboxSettings(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -15,8 +20,4 @@ public:
 	RoomCommand GetRoomCommand() const override;
 
 private:
-	uint8_t unk1;  // (MM Only)
-	uint8_t skyboxNumber;
-	uint8_t cloudsType;
-	uint8_t isIndoors;
 };
diff --git a/ZAPD/ZRoom/Commands/SetSoundSettings.cpp b/ZAPD/ZRoom/Commands/SetSoundSettings.cpp
index 9472468..54b9132 100644
--- a/ZAPD/ZRoom/Commands/SetSoundSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetSoundSettings.cpp
@@ -1,5 +1,5 @@
 #include "SetSoundSettings.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 SetSoundSettings::SetSoundSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetSoundSettings.h b/ZAPD/ZRoom/Commands/SetSoundSettings.h
index 0e35af7..6971ced 100644
--- a/ZAPD/ZRoom/Commands/SetSoundSettings.h
+++ b/ZAPD/ZRoom/Commands/SetSoundSettings.h
@@ -5,6 +5,10 @@
 class SetSoundSettings : public ZRoomCommand
 {
 public:
+	uint8_t reverb;
+	uint8_t nightTimeSFX;
+	uint8_t musicSequence;
+
 	SetSoundSettings(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -15,7 +19,4 @@ public:
 	std::string GetCommandCName() const override;
 
 private:
-	uint8_t reverb;
-	uint8_t nightTimeSFX;
-	uint8_t musicSequence;
 };
diff --git a/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp b/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp
index b202c4d..0c24a2f 100644
--- a/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp
+++ b/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp
@@ -1,6 +1,6 @@
 #include "SetSpecialObjects.h"
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 
 SetSpecialObjects::SetSpecialObjects(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetSpecialObjects.h b/ZAPD/ZRoom/Commands/SetSpecialObjects.h
index 959133d..7fc0ece 100644
--- a/ZAPD/ZRoom/Commands/SetSpecialObjects.h
+++ b/ZAPD/ZRoom/Commands/SetSpecialObjects.h
@@ -5,6 +5,9 @@
 class SetSpecialObjects : public ZRoomCommand
 {
 public:
+	uint8_t elfMessage;
+	uint16_t globalObject;
+
 	SetSpecialObjects(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -15,6 +18,4 @@ public:
 	std::string GetCommandCName() const override;
 
 private:
-	uint8_t elfMessage;
-	uint16_t globalObject;
 };
diff --git a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
index 01bd1bf..6021edb 100644
--- a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
+++ b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
@@ -1,8 +1,8 @@
 #include "SetStartPositionList.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZNames.h"
 #include "ZRoom/ZRoom.h"
diff --git a/ZAPD/ZRoom/Commands/SetStartPositionList.h b/ZAPD/ZRoom/Commands/SetStartPositionList.h
index 02cf7c6..0c83061 100644
--- a/ZAPD/ZRoom/Commands/SetStartPositionList.h
+++ b/ZAPD/ZRoom/Commands/SetStartPositionList.h
@@ -6,6 +6,7 @@
 class SetStartPositionList : public ZRoomCommand
 {
 public:
+	std::vector<ActorSpawnEntry> actors;
 	SetStartPositionList(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -17,5 +18,4 @@ public:
 	std::string GetCommandCName() const override;
 
 private:
-	std::vector<ActorSpawnEntry> actors;
 };
diff --git a/ZAPD/ZRoom/Commands/SetTimeSettings.cpp b/ZAPD/ZRoom/Commands/SetTimeSettings.cpp
index 708c421..9d4d356 100644
--- a/ZAPD/ZRoom/Commands/SetTimeSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetTimeSettings.cpp
@@ -1,6 +1,6 @@
 #include "SetTimeSettings.h"
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 
 SetTimeSettings::SetTimeSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetTimeSettings.h b/ZAPD/ZRoom/Commands/SetTimeSettings.h
index cafafc1..7ff2711 100644
--- a/ZAPD/ZRoom/Commands/SetTimeSettings.h
+++ b/ZAPD/ZRoom/Commands/SetTimeSettings.h
@@ -5,6 +5,10 @@
 class SetTimeSettings : public ZRoomCommand
 {
 public:
+	uint8_t hour;
+	uint8_t min;
+	uint8_t unk;
+
 	SetTimeSettings(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -13,9 +17,4 @@ public:
 
 	std::string GetCommandCName() const override;
 	RoomCommand GetRoomCommand() const override;
-
-private:
-	uint8_t hour;
-	uint8_t min;
-	uint8_t unk;
 };
diff --git a/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp b/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
index 9d70e6d..ba8355a 100644
--- a/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
+++ b/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
@@ -1,8 +1,8 @@
 #include "SetTransitionActorList.h"
 
-#include "BitConverter.h"
+#include "Utils/BitConverter.h"
 #include "Globals.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 #include "ZFile.h"
 #include "ZRoom/ZNames.h"
 #include "ZRoom/ZRoom.h"
diff --git a/ZAPD/ZRoom/Commands/SetWind.cpp b/ZAPD/ZRoom/Commands/SetWind.cpp
index 3b50c81..1893b56 100644
--- a/ZAPD/ZRoom/Commands/SetWind.cpp
+++ b/ZAPD/ZRoom/Commands/SetWind.cpp
@@ -1,5 +1,5 @@
 #include "SetWind.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 SetWind::SetWind(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetWind.h b/ZAPD/ZRoom/Commands/SetWind.h
index 8e00b4f..05eaafe 100644
--- a/ZAPD/ZRoom/Commands/SetWind.h
+++ b/ZAPD/ZRoom/Commands/SetWind.h
@@ -5,6 +5,11 @@
 class SetWind : public ZRoomCommand
 {
 public:
+	uint8_t windWest;
+	uint8_t windVertical;
+	uint8_t windSouth;
+	uint8_t clothFlappingStrength;
+
 	SetWind(ZFile* nParent);
 
 	void ParseRawData() override;
@@ -13,10 +18,4 @@ public:
 
 	std::string GetCommandCName() const override;
 	RoomCommand GetRoomCommand() const override;
-
-private:
-	uint8_t windWest;
-	uint8_t windVertical;
-	uint8_t windSouth;
-	uint8_t clothFlappingStrength;
 };
diff --git a/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp b/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp
index 4420c9d..d20e4a3 100644
--- a/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp
+++ b/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp
@@ -1,6 +1,6 @@
 #include "SetWorldMapVisited.h"
 
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 SetWorldMapVisited::SetWorldMapVisited(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/Unused09.cpp b/ZAPD/ZRoom/Commands/Unused09.cpp
index 69db353..7e7b709 100644
--- a/ZAPD/ZRoom/Commands/Unused09.cpp
+++ b/ZAPD/ZRoom/Commands/Unused09.cpp
@@ -1,5 +1,5 @@
 #include "Unused09.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 Unused09::Unused09(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/Unused1D.cpp b/ZAPD/ZRoom/Commands/Unused1D.cpp
index 14ac6e4..1e03314 100644
--- a/ZAPD/ZRoom/Commands/Unused1D.cpp
+++ b/ZAPD/ZRoom/Commands/Unused1D.cpp
@@ -1,5 +1,5 @@
 #include "Unused1D.h"
-#include "StringHelper.h"
+#include "Utils/StringHelper.h"
 
 Unused1D::Unused1D(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp b/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp
index 3f35c13..a892086 100644
--- a/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp
+++ b/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp
@@ -1,6 +1,6 @@
 #include "ZRoomCommandUnk.h"
-#include "BitConverter.h"
-#include "StringHelper.h"
+#include "Utils/BitConverter.h"
+#include "Utils/StringHelper.h"
 #include "ZRoom/ZRoom.h"
 
 ZRoomCommandUnk::ZRoomCommandUnk(ZFile* nParent) : ZRoomCommand(nParent)