refactor: use LUS 1.0 RC

Co-authored-by: kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: David Chavez <david@dcvz.io>
Co-authored-by: KiritoDv <kiritodev01@gmail.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>

OTRExporter/OTRExporter/AnimationExporter.cpp

@@ -1,11 +1,11 @@
 #include "AnimationExporter.h"
-#include <Animation.h>
+#include <resource/type/Animation.h>
 
 void OTRExporter_Animation::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer)
 {
 	ZAnimation* anim = (ZAnimation*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::Animation);
+	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_Animation);
 
 	ZNormalAnimation* normalAnim = dynamic_cast<ZNormalAnimation*>(anim);
 	ZCurveAnimation* curveAnim = dynamic_cast<ZCurveAnimation*>(anim);

OTRExporter/OTRExporter/AudioExporter.cpp

@@ -1,6 +1,5 @@
 #include "AudioExporter.h"
 #include "Main.h"
-#include <Animation.h>
 #include <Utils/MemoryStream.h>
 #include <Globals.h>
 #include <Utils/File.h>
@@ -30,7 +29,7 @@ void OTRExporter_Audio::WriteSampleEntryReference(ZAudio* audio, SampleEntry* en
 
 void OTRExporter_Audio::WriteSampleEntry(SampleEntry* entry, BinaryWriter* writer)
 {
-	WriteHeader(nullptr, "", writer, Ship::ResourceType::AudioSample, Ship::Version::Rachael);
+	WriteHeader(nullptr, "", writer, Ship::ResourceType::SOH_AudioSample, Ship::Version::Rachael);
 
 	writer->Write(entry->codec);
 	writer->Write(entry->medium);
@@ -82,7 +81,7 @@ void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 {
 	ZAudio* audio = (ZAudio*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::Audio, Ship::Version::Rachael);
+	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_Audio, Ship::Version::Rachael);
 
 	// Write Samples as individual files
 	for (auto pair : audio->samples)
@@ -115,7 +114,7 @@ void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 		MemoryStream* fntStream = new MemoryStream();
 		BinaryWriter fntWriter = BinaryWriter(fntStream);
 
-		WriteHeader(nullptr, "", &fntWriter, Ship::ResourceType::AudioSoundFont, Ship::Version::Rachael);
+		WriteHeader(nullptr, "", &fntWriter, Ship::ResourceType::SOH_AudioSoundFont, Ship::Version::Rachael);
 
 		fntWriter.Write((uint32_t)i);
 		fntWriter.Write(audio->soundFontTable[i].medium);
@@ -174,7 +173,7 @@ void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWrit
 		MemoryStream* seqStream = new MemoryStream();
 		BinaryWriter seqWriter = BinaryWriter(seqStream);
 
-		WriteHeader(nullptr, "", &seqWriter, Ship::ResourceType::AudioSequence, Ship::Version::Rachael);
+		WriteHeader(nullptr, "", &seqWriter, Ship::ResourceType::SOH_AudioSequence, Ship::Version::Rachael);
 
 		seqWriter.Write((uint32_t)seq.size());
 		seqWriter.Write(seq.data(), seq.size());

OTRExporter/OTRExporter/BackgroundExporter.cpp

@@ -4,6 +4,10 @@
 void OTRExporter_Background::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer)
 {
 	ZBackground* bg = (ZBackground*)res;
+
+	WriteHeader(bg, outPath, writer, Ship::ResourceType::SOH_Background);
+
+	writer->Write((uint32_t)bg->GetRawDataSize());
 	
 	auto data = bg->parent->GetRawData();
 	writer->Write((char*)data.data() + bg->GetRawDataIndex(), bg->GetRawDataSize());

OTRExporter/OTRExporter/CMakeLists.txt

@@ -158,16 +158,19 @@ endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPD/
-	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils
-	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2
-	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/include
+    # TODO: these should no longer be necessary if we were to link against LUS
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource/types
     ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern
-	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/spdlog/include
-	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/graphic/Fast3D/U64
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/Mercury
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/tinyxml2
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils
 	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/StormLib/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/spdlog/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/nlohmann-json/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../soh/soh
 	.
 )
 

OTRExporter/OTRExporter/CollisionExporter.cpp

@@ -1,11 +1,11 @@
 #include "CollisionExporter.h"
-#include <Resource.h>
+#include <libultraship/bridge.h>
 
 void OTRExporter_Collision::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer)
 {
 	ZCollisionHeader* col = (ZCollisionHeader*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::CollisionHeader);
+	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_CollisionHeader);
 	
 	writer->Write(col->absMinX);
 	writer->Write(col->absMinY);

OTRExporter/OTRExporter/CutsceneExporter.cpp

@@ -1,11 +1,11 @@
 #include "CutsceneExporter.h"
-#include <Resource.h>
+#include <libultraship/bridge.h>
 
 void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer)
 {
 	ZCutscene* cs = (ZCutscene*)res;
 
-	WriteHeader(cs, outPath, writer, Ship::ResourceType::Cutscene);
+	WriteHeader(cs, outPath, writer, Ship::ResourceType::SOH_Cutscene);
 
 	//writer->Write((uint32_t)cs->commands.size() + 2 + 2);
 	writer->Write((uint32_t)0);

OTRExporter/OTRExporter/DisplayListExporter.cpp

@@ -5,7 +5,7 @@
 #include <Utils/BitConverter.h>
 #include "StrHash64/StrHash64.h"
 #include "spdlog/spdlog.h"
-#include "PR/ultra64/gbi.h"
+#include <libultraship/libultra/gbi.h>
 #include <Globals.h>
 #include <iostream>
 #include <string>

OTRExporter/OTRExporter/Exporter.h

@@ -3,7 +3,7 @@
 #include "ZArray.h"
 //#include "OTRExporter.h"
 #include <Utils/BinaryWriter.h>
-#include <Resource.h>
+#include <libultraship/bridge.h>
 #include "VersionInfo.h"
 
 class OTRExporter : public ZResourceExporter

OTRExporter/OTRExporter/Main.cpp

@@ -1,4 +1,4 @@
-#include <Archive.h>
+#include "Main.h"
 #include "BackgroundExporter.h"
 #include "TextureExporter.h"
 #include "RoomExporter.h"

OTRExporter/OTRExporter/Main.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Archive.h>
+#include <libultraship/bridge.h>
 
 extern std::shared_ptr<Ship::Archive> otrArchive;
 extern std::map<std::string, std::vector<char>> files;

OTRExporter/OTRExporter/PathExporter.cpp

@@ -5,7 +5,7 @@ void OTRExporter_Path::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 {
 	ZPath* path = (ZPath*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::Path);
+	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_Path);
 	
 	writer->Write((uint32_t)path->pathways.size());
 

OTRExporter/OTRExporter/PlayerAnimationExporter.cpp

@@ -1,11 +1,11 @@
 #include "PlayerAnimationExporter.h"
-#include <Resource.h>
+#include <libultraship/bridge.h>
 
 void OTRExporter_PlayerAnimationExporter::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer)
 {
 	ZPlayerAnimationData* anim = (ZPlayerAnimationData*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::PlayerAnimation);
+	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_PlayerAnimation);
 
 	auto start = std::chrono::steady_clock::now();
 	

OTRExporter/OTRExporter/RoomExporter.cpp

@@ -23,7 +23,7 @@
 #include <ZRoom/Commands/SetAlternateHeaders.h>
 #include "CollisionExporter.h"
 #include "DisplayListExporter.h"
-#include "Resource.h"
+#include <libultraship/bridge.h>
 #include <Globals.h>
 #include <ZRoom/Commands/SetExitList.h>
 #include <ZRoom/Commands/SetPathways.h>
@@ -39,7 +39,7 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 {
 	ZRoom* room = (ZRoom*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::Room);
+	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_Room);
 
 	writer->Write((uint32_t)room->commands.size());
 

OTRExporter/OTRExporter/SkeletonExporter.cpp

@@ -1,5 +1,5 @@
 #include "SkeletonExporter.h"
-#include <Resource.h>
+#include <libultraship/bridge.h>
 #include <Globals.h>
 #include "DisplayListExporter.h"
 
@@ -7,7 +7,7 @@ void OTRExporter_Skeleton::Save(ZResource* res, const fs::path& outPath, BinaryW
 {
 	ZSkeleton* skel = (ZSkeleton*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::Skeleton);
+	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_Skeleton);
 
 	writer->Write((uint8_t)skel->type);
 	writer->Write((uint8_t)skel->limbType);

OTRExporter/OTRExporter/SkeletonLimbExporter.cpp

@@ -1,13 +1,13 @@
 #include "SkeletonLimbExporter.h"
 #include "DisplayListExporter.h"
-#include <Resource.h>
+#include <libultraship/bridge.h>
 #include <Globals.h>
 
 void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer)
 {
 	ZLimb* limb = (ZLimb*)res;
 
-	WriteHeader(res, outPath, writer, Ship::ResourceType::SkeletonLimb);
+	WriteHeader(res, outPath, writer, Ship::ResourceType::SOH_SkeletonLimb);
 
 	writer->Write((uint8_t)limb->type);
 	writer->Write((uint8_t)limb->skinSegmentType);

OTRExporter/OTRExporter/TextExporter.cpp

@@ -5,7 +5,7 @@ void OTRExporter_Text::Save(ZResource* res, const fs::path& outPath, BinaryWrite
 {
 	ZText* txt = (ZText*)res;
 
-	WriteHeader(txt, outPath, writer, Ship::ResourceType::Text);
+	WriteHeader(txt, outPath, writer, Ship::ResourceType::SOH_Text);
 
 	writer->Write((uint32_t)txt->messages.size());
 

OTRExporter/OTRExporter/VersionInfo.cpp

@@ -1,27 +1,25 @@
 #include "VersionInfo.h"
-#include <Resource.h>
+#include <libultraship/bridge.h>
 
 std::map<Ship::ResourceType, uint32_t> resourceVersions;
 
 void InitVersionInfo()
 {
 	resourceVersions = std::map<Ship::ResourceType, uint32_t> {
-	{ Ship::ResourceType::Animation, 0 },
-	{ Ship::ResourceType::Model, 0 },
+	{ Ship::ResourceType::SOH_Animation, 0 },
 	{ Ship::ResourceType::Texture, 0 },
-	{ Ship::ResourceType::Material, 0 },
-	{ Ship::ResourceType::PlayerAnimation, 0 },
+	{ Ship::ResourceType::SOH_PlayerAnimation, 0 },
 	{ Ship::ResourceType::DisplayList, 0 },
-	{ Ship::ResourceType::Room, 0 },
-	{ Ship::ResourceType::CollisionHeader, 0 },
-	{ Ship::ResourceType::Skeleton, 0 },
-	{ Ship::ResourceType::SkeletonLimb, 0 },
+	{ Ship::ResourceType::SOH_Room, 0 },
+	{ Ship::ResourceType::SOH_CollisionHeader, 0 },
+	{ Ship::ResourceType::SOH_Skeleton, 0 },
+	{ Ship::ResourceType::SOH_SkeletonLimb, 0 },
 	{ Ship::ResourceType::Matrix, 0 },
-	{ Ship::ResourceType::Path, 0 },
+	{ Ship::ResourceType::SOH_Path, 0 },
 	{ Ship::ResourceType::Vertex, 0 },
-	{ Ship::ResourceType::Cutscene, 0 },
+	{ Ship::ResourceType::SOH_Cutscene, 0 },
 	{ Ship::ResourceType::Array, 0 },
-	{ Ship::ResourceType::Text, 0 },
+	{ Ship::ResourceType::SOH_Text, 0 },
 	{ Ship::ResourceType::Blob, 0 },
 	};
 }

OTRExporter/OTRExporter/VtxExporter.cpp

@@ -1,5 +1,5 @@
 #include "VtxExporter.h"
-#include "Resource.h"
+#include <libultraship/bridge.h>
 #include "VersionInfo.h"
 
 

OTRExporter/OTRExporter/z64cutscene.h

@@ -2,7 +2,7 @@
 #define Z64CUTSCENE_H
 
 #if 0
-#include "ultra64.h"
+#include <libultraship/libultra.h>
 
 typedef struct {
     /* 0x00 */ u16 entrance;       // entrance index upon which the cutscene should trigger

ZAPDTR/ZAPD/CMakeLists.txt

@@ -336,6 +336,8 @@ find_package(PNG REQUIRED)
 
 target_include_directories(${PROJECT_NAME} PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/include
 	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2
 	${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/libgfxd
 	${PNG_PNG_INCLUDE_DIR}/

ZAPDTR/ZAPD/ZResource.h

@@ -7,8 +7,8 @@
 #include <string>
 #include <vector>
 #include "Declaration.h"
-#include "Utils/BinaryWriter.h"
-#include "Utils/Directory.h"
+#include <Utils/BinaryWriter.h>
+#include <Utils/Directory.h>
 #include "tinyxml2.h"
 
 #define SEGMENT_SCENE 2

libultraship

@@ -1 +1 @@
-Subproject commit b1c75c86e902e5036ee1d36afad1a35313988fe7
+Subproject commit c5bab5aef8a9dd77047438718de64fb2e27eedfc

soh/CMakeLists.txt

@@ -123,7 +123,7 @@ set(Header_Files__include
     #"include/stdbool_n64.h"
     #"include/stddef_n64.h"
     #"include/stdlib_n64.h"
-    "include/ultra64.h"
+    # "include/ultra64.h"
     "include/unk.h"
     "include/variables.h"
     "include/vt.h"
@@ -288,6 +288,194 @@ set(Source_Files__soh
 )
 source_group("Source Files\\soh" FILES ${Source_Files__soh})
 
+set(Header_Files__soh__resourceTypes
+    "soh/resource/type/Animation.h"
+    "soh/resource/type/AudioSample.h"
+    "soh/resource/type/AudioSequence.h"
+    "soh/resource/type/AudioSoundFont.h"
+    "soh/resource/type/CollisionHeader.h"
+    "soh/resource/type/Cutscene.h"
+    "soh/resource/type/Path.h"
+    "soh/resource/type/PlayerAnimation.h"
+    "soh/resource/type/Scene.h"
+    "soh/resource/type/Skeleton.h"
+    "soh/resource/type/SkeletonLimb.h"
+    "soh/resource/type/Text.h"
+    "soh/resource/type/Background.h"
+)
+source_group("Header Files\\soh\\resource\\type" FILES ${Header_Files__soh__resourceTypes})
+
+set(Source_Files__soh__resourceTypes
+    "soh/resource/type/Animation.cpp"
+    "soh/resource/type/AudioSample.cpp"
+    "soh/resource/type/AudioSequence.cpp"
+    "soh/resource/type/AudioSoundFont.cpp"
+    "soh/resource/type/CollisionHeader.cpp"
+    "soh/resource/type/Cutscene.cpp"
+    "soh/resource/type/Path.cpp"
+    "soh/resource/type/PlayerAnimation.cpp"
+    "soh/resource/type/Scene.cpp"
+    "soh/resource/type/Skeleton.cpp"
+    "soh/resource/type/SkeletonLimb.cpp"
+    "soh/resource/type/Text.cpp"
+    "soh/resource/type/Background.cpp"
+)
+source_group("Source Files\\soh\\resource\\type" FILES ${Source_Files__soh__resourceTypes})
+
+set(Header_Files__soh__resourceFactories
+    "soh/resource/importer/AnimationFactory.h"
+    "soh/resource/importer/AudioSampleFactory.h"
+    "soh/resource/importer/AudioSequenceFactory.h"
+    "soh/resource/importer/AudioSoundFontFactory.h"
+    "soh/resource/importer/CollisionHeaderFactory.h"
+    "soh/resource/importer/CutsceneFactory.h"
+    "soh/resource/importer/PathFactory.h"
+    "soh/resource/importer/PlayerAnimationFactory.h"
+    "soh/resource/importer/SceneFactory.h"
+    "soh/resource/importer/SkeletonFactory.h"
+    "soh/resource/importer/SkeletonLimbFactory.h"
+    "soh/resource/importer/TextFactory.h"
+    "soh/resource/importer/BackgroundFactory.h"
+)
+source_group("Header Files\\soh\\resource\\importer" FILES ${Header_Files__soh__resourceFactories})
+
+set(Source_Files__soh__resourceFactories
+    "soh/resource/importer/AnimationFactory.cpp"
+    "soh/resource/importer/AudioSampleFactory.cpp"
+    "soh/resource/importer/AudioSequenceFactory.cpp"
+    "soh/resource/importer/AudioSoundFontFactory.cpp"
+    "soh/resource/importer/CollisionHeaderFactory.cpp"
+    "soh/resource/importer/CutsceneFactory.cpp"
+    "soh/resource/importer/PathFactory.cpp"
+    "soh/resource/importer/PlayerAnimationFactory.cpp"
+    "soh/resource/importer/SceneFactory.cpp"
+    "soh/resource/importer/SkeletonFactory.cpp"
+    "soh/resource/importer/SkeletonLimbFactory.cpp"
+    "soh/resource/importer/TextFactory.cpp"
+    "soh/resource/importer/BackgroundFactory.cpp"
+)
+source_group("Source Files\\soh\\resource\\importer" FILES ${Source_Files__soh__resourceFactories})
+
+set(Header_Files__soh__scenecommandTypes
+    "soh/resource/type/scenecommand/EndMarker.h"
+    "soh/resource/type/scenecommand/RomFile.h"
+    "soh/resource/type/scenecommand/SceneCommand.h"
+    "soh/resource/type/scenecommand/SetActorList.h"
+    "soh/resource/type/scenecommand/SetAlternateHeaders.h"
+    "soh/resource/type/scenecommand/SetCameraSettings.h"
+    "soh/resource/type/scenecommand/SetCollisionHeader.h"
+    "soh/resource/type/scenecommand/SetCsCamera.h"
+    "soh/resource/type/scenecommand/SetCutscenes.h"
+    "soh/resource/type/scenecommand/SetEchoSettings.h"
+    "soh/resource/type/scenecommand/SetEntranceList.h"
+    "soh/resource/type/scenecommand/SetExitList.h"
+    "soh/resource/type/scenecommand/SetLightingSettings.h"
+    "soh/resource/type/scenecommand/SetLightList.h"
+    "soh/resource/type/scenecommand/SetMesh.h"
+    "soh/resource/type/scenecommand/SetObjectList.h"
+    "soh/resource/type/scenecommand/SetPathways.h"
+    "soh/resource/type/scenecommand/SetRoomBehavior.h"
+    "soh/resource/type/scenecommand/SetRoomList.h"
+    "soh/resource/type/scenecommand/SetSkyboxModifier.h"
+    "soh/resource/type/scenecommand/SetSkyboxSettings.h"
+    "soh/resource/type/scenecommand/SetSoundSettings.h"
+    "soh/resource/type/scenecommand/SetSpecialObjects.h"
+    "soh/resource/type/scenecommand/SetStartPositionList.h"
+    "soh/resource/type/scenecommand/SetTimeSettings.h"
+    "soh/resource/type/scenecommand/SetTransitionActorList.h"
+    "soh/resource/type/scenecommand/SetWindSettings.h"
+)
+source_group("Header Files\\soh\\resource\\type\\scenecommand" FILES ${Header_Files__soh__scenecommandTypes})
+
+set(Source_Files__soh__scenecommandTypes
+    "soh/resource/type/scenecommand/EndMarker.cpp"
+    "soh/resource/type/scenecommand/SetActorList.cpp"
+    "soh/resource/type/scenecommand/SetAlternateHeaders.cpp"
+    "soh/resource/type/scenecommand/SetCameraSettings.cpp"
+    "soh/resource/type/scenecommand/SetCollisionHeader.cpp"
+    "soh/resource/type/scenecommand/SetCsCamera.cpp"
+    "soh/resource/type/scenecommand/SetCutscenes.cpp"
+    "soh/resource/type/scenecommand/SetEchoSettings.cpp"
+    "soh/resource/type/scenecommand/SetEntranceList.cpp"
+    "soh/resource/type/scenecommand/SetExitList.cpp"
+    "soh/resource/type/scenecommand/SetLightingSettings.cpp"
+    "soh/resource/type/scenecommand/SetLightList.cpp"
+    "soh/resource/type/scenecommand/SetMesh.cpp"
+    "soh/resource/type/scenecommand/SetObjectList.cpp"
+    "soh/resource/type/scenecommand/SetPathways.cpp"
+    "soh/resource/type/scenecommand/SetRoomBehavior.cpp"
+    "soh/resource/type/scenecommand/SetRoomList.cpp"
+    "soh/resource/type/scenecommand/SetSkyboxModifier.cpp"
+    "soh/resource/type/scenecommand/SetSkyboxSettings.cpp"
+    "soh/resource/type/scenecommand/SetSoundSettings.cpp"
+    "soh/resource/type/scenecommand/SetSpecialObjects.cpp"
+    "soh/resource/type/scenecommand/SetStartPositionList.cpp"
+    "soh/resource/type/scenecommand/SetTimeSettings.cpp"
+    "soh/resource/type/scenecommand/SetTransitionActorList.cpp"
+    "soh/resource/type/scenecommand/SetWindSettings.cpp"
+)
+source_group("Source Files\\soh\\resource\\type\\scenecommand" FILES ${Source_Files__soh__scenecommandTypes})
+
+set(Header_Files__soh__scenecommandFactories
+    "soh/resource/importer/scenecommand/EndMarkerFactory.h"
+    "soh/resource/importer/scenecommand/SceneCommandFactory.h"
+    "soh/resource/importer/scenecommand/SetActorListFactory.h"
+    "soh/resource/importer/scenecommand/SetAlternateHeadersFactory.h"
+    "soh/resource/importer/scenecommand/SetCameraSettingsFactory.h"
+    "soh/resource/importer/scenecommand/SetCollisionHeaderFactory.h"
+    "soh/resource/importer/scenecommand/SetCsCameraFactory.h"
+    "soh/resource/importer/scenecommand/SetCutscenesFactory.h"
+    "soh/resource/importer/scenecommand/SetEchoSettingsFactory.h"
+    "soh/resource/importer/scenecommand/SetEntranceListFactory.h"
+    "soh/resource/importer/scenecommand/SetExitListFactory.h"
+    "soh/resource/importer/scenecommand/SetLightingSettingsFactory.h"
+    "soh/resource/importer/scenecommand/SetLightListFactory.h"
+    "soh/resource/importer/scenecommand/SetMeshFactory.h"
+    "soh/resource/importer/scenecommand/SetObjectListFactory.h"
+    "soh/resource/importer/scenecommand/SetPathwaysFactory.h"
+    "soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h"
+    "soh/resource/importer/scenecommand/SetRoomListFactory.h"
+    "soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h"
+    "soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h"
+    "soh/resource/importer/scenecommand/SetSoundSettingsFactory.h"
+    "soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h"
+    "soh/resource/importer/scenecommand/SetStartPositionListFactory.h"
+    "soh/resource/importer/scenecommand/SetTimeSettingsFactory.h"
+    "soh/resource/importer/scenecommand/SetTransitionActorListFactory.h"
+    "soh/resource/importer/scenecommand/SetWindSettingsFactory.h"
+)
+source_group("Header Files\\soh\\resource\\importer\\scenecommand" FILES ${Header_Files__soh__scenecommandFactories})
+
+set(Source_Files__soh__scenecommandFactories
+    "soh/resource/importer/scenecommand/EndMarkerFactory.cpp"
+    "soh/resource/importer/scenecommand/SceneCommandFactory.cpp"
+    "soh/resource/importer/scenecommand/SetActorListFactory.cpp"
+    "soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp"
+    "soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp"
+    "soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp"
+    "soh/resource/importer/scenecommand/SetCsCameraFactory.cpp"
+    "soh/resource/importer/scenecommand/SetCutscenesFactory.cpp"
+    "soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp"
+    "soh/resource/importer/scenecommand/SetEntranceListFactory.cpp"
+    "soh/resource/importer/scenecommand/SetExitListFactory.cpp"
+    "soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp"
+    "soh/resource/importer/scenecommand/SetLightListFactory.cpp"
+    "soh/resource/importer/scenecommand/SetMeshFactory.cpp"
+    "soh/resource/importer/scenecommand/SetObjectListFactory.cpp"
+    "soh/resource/importer/scenecommand/SetPathwaysFactory.cpp"
+    "soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp"
+    "soh/resource/importer/scenecommand/SetRoomListFactory.cpp"
+    "soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp"
+    "soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp"
+    "soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp"
+    "soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp"
+    "soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp"
+    "soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp"
+    "soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp"
+    "soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp"
+)
+source_group("Source Files\\soh\\resource\\importer\\scenecommand" FILES ${Source_Files__soh__scenecommandFactories})
+
 set(Source_Files__soh__Enhancements
     "soh/Enhancements/bootcommands.c"
     "soh/Enhancements/debugconsole.cpp"
@@ -1655,6 +1843,14 @@ set(ALL_FILES
     ${Source_Files__src__overlays__gamestates__ovl_title}
     ${Source_Files__src__overlays__misc__ovl_kaleido_scope}
     ${Source_Files__src__overlays__misc__ovl_map_mark_data}
+    ${Header_Files__soh__resourceTypes}
+    ${Source_Files__soh__resourceTypes}
+    ${Header_Files__soh__resourceFactories}
+    ${Source_Files__soh__resourceFactories}
+    ${Header_Files__soh__scenecommandTypes}
+    ${Source_Files__soh__scenecommandTypes}
+    ${Source_Files__soh__scenecommandFactories}
+    ${Header_Files__soh__scenecommandFactories}
 )
 
 ################################################################################
@@ -1741,7 +1937,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE assets
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/misc
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/core
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/types
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/type
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/audio
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern/Mercury
@@ -1752,6 +1948,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE assets
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic/Fast3D/U64/PR
     ${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic
 	${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPDUtils
+    ${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD/resource/type
 	${SDL2-INCLUDE}
     ${SDL2-NET-INCLUDE}
 	${CMAKE_CURRENT_SOURCE_DIR}/assets/

soh/include/fp.h

@@ -1,6 +1,6 @@
 #ifndef FP_H
 #define FP_H
-#include "ultra64.h"
+#include <libultraship/libultra.h>
 
 extern f32 qNaN0x3FFFFF;
 extern f32 qNaN0x10000;

soh/include/functions.h

@@ -2,6 +2,7 @@
 #define FUNCTIONS_H
 
 #include "z64.h"
+#include <stdarg.h>
 
 #ifdef __cplusplus
 #define this thisx
@@ -97,8 +98,6 @@ void LogUtils_CheckValidPointer(const char* exp, void* ptr, const char* file, s3
 void LogUtils_LogThreadId(const char* name, s32 line);
 void LogUtils_HungupThread(const char* name, s32 line);
 void LogUtils_ResetHungup(void);
-s32 vsprintf(char* dst, const char* fmt, va_list args);
-s32 sprintf(char* dst, const char* fmt, ...);
 void __osPiCreateAccessQueue(void);
 void __osPiGetAccess(void);
 void __osPiRelAccess(void);

soh/include/global.h

@@ -9,7 +9,7 @@
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/gameconsole.h"
 #include "soh/Enhancements/gameplaystats.h"
-#include <Cvar.h>
+#include <libultraship/bridge.h>
 
 #define _AudioseqSegmentRomStart "Audioseq"
 #define _AudiobankSegmentRomStart "Audiobank"
@@ -38,4 +38,8 @@
 #define _z_select_staticSegmentRomStart 0
 #define _z_select_staticSegmentRomEnd 0
 
+// TODO: POSIX/BSD Bug, this is a hack to fix the build compilation on any BSD system (Switch, Wii-U, Vita, etc)
+// <sys/types.h> defines quad as a macro, which conflicts with the quad parameter on z_collision_check.c
+#undef quad
+
 #endif

soh/include/libc/math.h

@@ -1,7 +1,7 @@
 #ifndef MATH_H
 #define MATH_H
 
-#include "ultra64/types.h"
+#include <libultraship/libultra.h>
 
 #define M_PI 3.14159265358979323846f
 #define M_SQRT2 1.41421356237309504880f

soh/include/libc/stdlib.h

@@ -1,7 +1,7 @@
 #ifndef STDLIB_H
 #define STDLIB_H
 
-#include "ultra64.h"
+#include <libultraship/libultra.h>
 
 #if 0
 

soh/include/macros.h

@@ -300,9 +300,9 @@ extern GraphicsContext* __gfxCtx;
 // #endregion
 
 // #region SOH [Enhancements]
-#define CHECK_EQUIPMENT_AGE(i, j) (CVar_GetS32("gTimelessEquipment", 0) || (gEquipAgeReqs[i][j] == 9) || (gEquipAgeReqs[i][j] == ((void)0, gSaveContext.linkAge)))
-#define CHECK_SLOT_AGE(slotIndex) (CVar_GetS32("gTimelessEquipment", 0) || (gSlotAgeReqs[slotIndex] == 9) || gSlotAgeReqs[slotIndex] == ((void)0, gSaveContext.linkAge))
-#define CHECK_ITEM_AGE(itemIndex) (CVar_GetS32("gTimelessEquipment", 0) || (gItemAgeReqs[itemIndex] == 9) || (gItemAgeReqs[itemIndex] == gSaveContext.linkAge))
+#define CHECK_EQUIPMENT_AGE(i, j) (CVarGetInteger("gTimelessEquipment", 0) || (gEquipAgeReqs[i][j] == 9) || (gEquipAgeReqs[i][j] == ((void)0, gSaveContext.linkAge)))
+#define CHECK_SLOT_AGE(slotIndex) (CVarGetInteger("gTimelessEquipment", 0) || (gSlotAgeReqs[slotIndex] == 9) || gSlotAgeReqs[slotIndex] == ((void)0, gSaveContext.linkAge))
+#define CHECK_ITEM_AGE(itemIndex) (CVarGetInteger("gTimelessEquipment", 0) || (gItemAgeReqs[itemIndex] == 9) || (gItemAgeReqs[itemIndex] == gSaveContext.linkAge))
 
 #define DPAD_ITEM(button) ((gSaveContext.buttonStatus[(button) + 5] != BTN_DISABLED) \
                                 ? gSaveContext.equips.buttonItems[(button) + 4]       \

soh/include/ultra64.h

@@ -1,35 +0,0 @@
-#ifndef ULTRA64_H
-#define ULTRA64_H
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include "ultra64/types.h"
-#include "unk.h"
-
-#include "libc/stdarg.h"
-#include "libc/stdbool.h"
-#include "libc/stddef.h"
-#include "libc/stdlib.h"
-#include "libc/math.h"
-
-#include "ultra64/exception.h"
-#include "ultra64/rcp.h"
-#include "ultra64/rdp.h"
-#include "ultra64/rsp.h"
-#include "ultra64/thread.h"
-#include "ultra64/convert.h"
-#include "ultra64/time.h"
-#include "ultra64/message.h"
-#include "ultra64/sptask.h"
-#include "ultra64/gu.h"
-#include "ultra64/vi.h"
-#include "ultra64/pi.h"
-#include "ultra64/controller.h"
-#include "ultra64/printf.h"
-#include "ultra64/mbi.h"
-#include "ultra64/pfs.h"
-#include "ultra64/motor.h"
-#include "ultra64/r4300.h"
-
-#endif

soh/include/z64.h

@@ -1,8 +1,8 @@
 #ifndef Z64_H
 #define Z64_H
 
-#include "ultra64.h"
-#include "ultra64/gs2dex.h"
+#include <libultraship/libultra.h>
+#include "unk.h" // this used to get pulled in via ultra64.h
 #include "z64save.h"
 #include "z64light.h"
 #include "z64bgcheck.h"
@@ -27,7 +27,7 @@
 #include "alignment.h"
 #include "sequence.h"
 #include "sfx.h"
-#include <color.h>
+#include <libultraship/color.h>
 #include "ichain.h"
 #include "regs.h"
 
@@ -45,6 +45,7 @@ namespace Ship
     class Scene;
     class DisplayList;
 };
+#include <memory>
 #endif
 
 #define SCREEN_WIDTH  320
@@ -948,14 +949,6 @@ typedef struct {
 typedef struct {
     /* 0x00 */ Gfx* opa;
     /* 0x04 */ Gfx* xlu;
-
-#ifdef __cplusplus
-    Ship::DisplayList* opaDL;
-    Ship::DisplayList* xluDL;
-#else
-void* opaDL;
-void* xluDL;
-#endif
 } PolygonDlist; // size = 0x8
 
 
@@ -1016,14 +1009,6 @@ typedef struct {
     /* 0x06 */ s16   unk_06;
     /* 0x08 */ Gfx*  opa;
     /* 0x0C */ Gfx*  xlu;
-
-#ifdef __cplusplus
-    Ship::DisplayList* opaDL;
-    Ship::DisplayList* xluDL;
-#else
-    void* opaDL;
-    void* xluDL;
-#endif
 } PolygonDlist2; // size = 0x8
 
 typedef struct {
@@ -1087,12 +1072,7 @@ typedef struct {
     /* 0x58 */ OSMesgQueue loadQueue;
     /* 0x70 */ OSMesg loadMsg;
     /* 0x74 */ s16 unk_74[2]; // context-specific data used by the current scene draw config
-
-#ifdef __cplusplus
-    Ship::Scene* roomToLoad;
-#else
     void* roomToLoad;
-#endif
 } RoomContext; // size = 0x78
 
 typedef struct {
@@ -1310,13 +1290,7 @@ typedef struct PlayState {
     /* 0x000A4 */ s16 sceneNum;
     /* 0x000A6 */ u8 sceneConfig;
     /* 0x000A7 */ char unk_A7[0x9];
-
-#ifdef __cplusplus
-    Ship::Scene* sceneSegment;
-#else
     /* 0x000B0 */ void* sceneSegment;
-#endif
-
     /* 0x000B8 */ View view;
     /* 0x001E0 */ Camera mainCamera;
     /* 0x0034C */ Camera subCameras[NUM_CAMS - SUBCAM_FIRST];

soh/include/z64animation.h

@@ -1,7 +1,7 @@
 #ifndef Z64_ANIMATION_H
 #define Z64_ANIMATION_H
 
-#include "ultra64.h"
+#include <libultraship/libultra.h>
 #include "z64dma.h"
 #include "z64math.h"
 

soh/include/z64audio.h

@@ -127,7 +127,7 @@ typedef struct {
 typedef struct {
     /* 0x00 */ s32 order;
     /* 0x04 */ s32 npredictors;
-    /* 0x08 */ s16 book[]; // size 8 * order * npredictors. 8-byte aligned
+    /* 0x08 */ s16* book; // size 8 * order * npredictors. 8-byte aligned
 } AdpcmBook; // size >= 0x8
 
 typedef struct 
@@ -137,7 +137,7 @@ typedef struct
             /* 0x00 */ u32 codec : 4;
             /* 0x00 */ u32 medium : 2;
             /* 0x00 */ u32 unk_bit26 : 1;
-            /* 0x00 */ u32 unk_bit25 : 1;
+            /* 0x00 */ u32 unk_bit25 : 1; // this has been named isRelocated in zret
             /* 0x01 */ u32 size : 24;
         };
         u32 asU32;
@@ -819,7 +819,7 @@ typedef struct {
     /* 0x0E */ u8 ttl;        // duration after which the DMA can be discarded
 } SampleDma; // size = 0x10
 
-#include <ultra64/abi.h>
+#include <libultraship/libultra/abi.h>
 
 typedef struct {
     /* 0x0000 */ char unk_0000;

soh/include/z64camera.h

@@ -1,7 +1,7 @@
 #ifndef Z64CAMERA_H
 #define Z64CAMERA_H
 
-#include "ultra64.h"
+#include <libultraship/libultra.h>
 #include "z64cutscene.h"
 
 #define CAM_STAT_CUT        0

soh/include/z64cutscene.h

@@ -1,7 +1,7 @@
 #ifndef Z64CUTSCENE_H
 #define Z64CUTSCENE_H
 
-#include "ultra64.h"
+#include <libultraship/libultra.h>