Merge branch 'main' of https://github.com/HarbourMasters/Starship

45 files changed, 124 insertions, 80 deletions

diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index 41b8f5f4..bd32bfde 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -37,14 +37,14 @@ void Ending_8018CE20(u32 arg0) {
                 if ((D_ending_80192E74[i].unk_11 == 0) || (gVenomHardClear == 1)) {
                     if (D_ending_80192E74[i].unk_10 == 1) {
                         xPos = (SCREEN_WIDTH - Graphics_GetLargeTextWidth(D_ending_80192E74[i].unk_00)) / 2;
-                        RCP_SetupDL(&gMasterDisp, SETUPDL_83);
+                        RCP_SetupDL(&gMasterDisp, SETUPDL_83_OPTIONAL);
                         gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
                         gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
                         Graphics_DisplayLargeText(xPos, D_ending_80192E74[i].unk_0E, 1.0f, 1.0f,
                                                   D_ending_80192E74[i].unk_00);
 
                     } else if (D_ending_80192E74[i].unk_10 == 2) {
-                        RCP_SetupDL(&gMasterDisp, SETUPDL_83);
+                        RCP_SetupDL(&gMasterDisp, SETUPDL_83_OPTIONAL);
                         gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
                         gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
                         Lib_TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00, 192, 30, 64.0f, 105.0f, 1.0f,
@@ -144,7 +144,7 @@ void Ending_8018D638(u32 arg0, AssetInfo* asset) {
     gFillScreenAlpha = gFillScreenAlphaTarget = alpha;
     gFillScreenAlphaStep = 0;
 
-    RCP_SetupDL(&gMasterDisp, SETUPDL_83);
+    RCP_SetupDL(&gMasterDisp, SETUPDL_83_OPTIONAL);
 
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
 
diff --git a/src/port/resource/importers/AnimFactory.cpp b/src/port/resource/importers/AnimFactory.cpp
index c532401d..f4682b4d 100644
--- a/src/port/resource/importers/AnimFactory.cpp
+++ b/src/port/resource/importers/AnimFactory.cpp
@@ -3,8 +3,9 @@
 #include "spdlog/spdlog.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAnimV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAnimV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/AnimFactory.h b/src/port/resource/importers/AnimFactory.h
index 80f07932..b6eae299 100644
--- a/src/port/resource/importers/AnimFactory.h
+++ b/src/port/resource/importers/AnimFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryAnimV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/ColPolyFactory.cpp b/src/port/resource/importers/ColPolyFactory.cpp
index 91ec4602..fe00078e 100644
--- a/src/port/resource/importers/ColPolyFactory.cpp
+++ b/src/port/resource/importers/ColPolyFactory.cpp
@@ -3,8 +3,9 @@
 #include "spdlog/spdlog.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryColPolyV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryColPolyV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                              std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/ColPolyFactory.h b/src/port/resource/importers/ColPolyFactory.h
index 817be9c5..625356df 100644
--- a/src/port/resource/importers/ColPolyFactory.h
+++ b/src/port/resource/importers/ColPolyFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryColPolyV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/EnvSettingsFactory.cpp b/src/port/resource/importers/EnvSettingsFactory.cpp
index 9959aec0..6e7da09c 100644
--- a/src/port/resource/importers/EnvSettingsFactory.cpp
+++ b/src/port/resource/importers/EnvSettingsFactory.cpp
@@ -6,8 +6,9 @@
 
 namespace SF64 {
 
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryEnvSettingsV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryEnvSettingsV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                  std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/EnvSettingsFactory.h b/src/port/resource/importers/EnvSettingsFactory.h
index cd269558..2a040c62 100644
--- a/src/port/resource/importers/EnvSettingsFactory.h
+++ b/src/port/resource/importers/EnvSettingsFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryEnvSettingsV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/GenericArrayFactory.cpp b/src/port/resource/importers/GenericArrayFactory.cpp
index 7fd6e50c..4e6bec07 100644
--- a/src/port/resource/importers/GenericArrayFactory.cpp
+++ b/src/port/resource/importers/GenericArrayFactory.cpp
@@ -3,8 +3,9 @@
 #include "spdlog/spdlog.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryGenericArrayV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryGenericArrayV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                   std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/GenericArrayFactory.h b/src/port/resource/importers/GenericArrayFactory.h
index 78f9087f..e545e031 100644
--- a/src/port/resource/importers/GenericArrayFactory.h
+++ b/src/port/resource/importers/GenericArrayFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryGenericArrayV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/HitboxFactory.cpp b/src/port/resource/importers/HitboxFactory.cpp
index 40d4e3b4..fcf7763d 100644
--- a/src/port/resource/importers/HitboxFactory.cpp
+++ b/src/port/resource/importers/HitboxFactory.cpp
@@ -3,8 +3,9 @@
 #include "spdlog/spdlog.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryHitboxV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryHitboxV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                             std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/HitboxFactory.h b/src/port/resource/importers/HitboxFactory.h
index 5be626ca..9da9f894 100644
--- a/src/port/resource/importers/HitboxFactory.h
+++ b/src/port/resource/importers/HitboxFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryHitboxV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/LimbFactory.cpp b/src/port/resource/importers/LimbFactory.cpp
index e1ffc191..8f35cbc7 100644
--- a/src/port/resource/importers/LimbFactory.cpp
+++ b/src/port/resource/importers/LimbFactory.cpp
@@ -7,8 +7,9 @@
 
 namespace SF64 {
 
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryLimbV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryLimbV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/LimbFactory.h b/src/port/resource/importers/LimbFactory.h
index f229733e..7a874982 100644
--- a/src/port/resource/importers/LimbFactory.h
+++ b/src/port/resource/importers/LimbFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryLimbV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/MessageFactory.cpp b/src/port/resource/importers/MessageFactory.cpp
index fcd4e943..3f04d046 100644
--- a/src/port/resource/importers/MessageFactory.cpp
+++ b/src/port/resource/importers/MessageFactory.cpp
@@ -3,8 +3,9 @@
 #include "spdlog/spdlog.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryMessageV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryMessageV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                              std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/MessageFactory.h b/src/port/resource/importers/MessageFactory.h
index 74e37136..0a89395e 100644
--- a/src/port/resource/importers/MessageFactory.h
+++ b/src/port/resource/importers/MessageFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryMessageV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/MessageLookupFactory.cpp b/src/port/resource/importers/MessageLookupFactory.cpp
index 2ef3beeb..6d6e1f0f 100644
--- a/src/port/resource/importers/MessageLookupFactory.cpp
+++ b/src/port/resource/importers/MessageLookupFactory.cpp
@@ -5,8 +5,9 @@
 #include "ResourceUtil.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryMessageLookupV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryMessageLookupV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                    std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/MessageLookupFactory.h b/src/port/resource/importers/MessageLookupFactory.h
index ab94e3a5..fd17c22c 100644
--- a/src/port/resource/importers/MessageLookupFactory.h
+++ b/src/port/resource/importers/MessageLookupFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryMessageLookupV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/ObjectInitFactory.cpp b/src/port/resource/importers/ObjectInitFactory.cpp
index 04822034..db7df4ad 100644
--- a/src/port/resource/importers/ObjectInitFactory.cpp
+++ b/src/port/resource/importers/ObjectInitFactory.cpp
@@ -6,8 +6,9 @@
 
 namespace SF64 {
 
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryObjectInitV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryObjectInitV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                 std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/ObjectInitFactory.h b/src/port/resource/importers/ObjectInitFactory.h
index 9e8ab64b..583c5615 100644
--- a/src/port/resource/importers/ObjectInitFactory.h
+++ b/src/port/resource/importers/ObjectInitFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryObjectInitV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/ScriptCommandFactory.cpp b/src/port/resource/importers/ScriptCommandFactory.cpp
index e5489c92..1b70e79b 100644
--- a/src/port/resource/importers/ScriptCommandFactory.cpp
+++ b/src/port/resource/importers/ScriptCommandFactory.cpp
@@ -4,8 +4,9 @@
 #include "ResourceUtil.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryScriptCMDV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryScriptCMDV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/ScriptCommandFactory.h b/src/port/resource/importers/ScriptCommandFactory.h
index a2e8432c..0b38712c 100644
--- a/src/port/resource/importers/ScriptCommandFactory.h
+++ b/src/port/resource/importers/ScriptCommandFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryScriptCMDV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/ScriptFactory.cpp b/src/port/resource/importers/ScriptFactory.cpp
index 12f837fe..ed661efd 100644
--- a/src/port/resource/importers/ScriptFactory.cpp
+++ b/src/port/resource/importers/ScriptFactory.cpp
@@ -4,8 +4,9 @@
 #include "ResourceUtil.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryScriptV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryScriptV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                             std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/ScriptFactory.h b/src/port/resource/importers/ScriptFactory.h
index 5c373787..deef1fb2 100644
--- a/src/port/resource/importers/ScriptFactory.h
+++ b/src/port/resource/importers/ScriptFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryScriptV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/SkeletonFactory.cpp b/src/port/resource/importers/SkeletonFactory.cpp
index 8cac1f79..2c3fd204 100644
--- a/src/port/resource/importers/SkeletonFactory.cpp
+++ b/src/port/resource/importers/SkeletonFactory.cpp
@@ -5,8 +5,9 @@
 #include "ResourceUtil.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinarySkeletonV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                               std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/SkeletonFactory.h b/src/port/resource/importers/SkeletonFactory.h
index 767ffffb..b0a460d0 100644
--- a/src/port/resource/importers/SkeletonFactory.h
+++ b/src/port/resource/importers/SkeletonFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinarySkeletonV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/Vec3fFactory.cpp b/src/port/resource/importers/Vec3fFactory.cpp
index 6781c5b7..4076860e 100644
--- a/src/port/resource/importers/Vec3fFactory.cpp
+++ b/src/port/resource/importers/Vec3fFactory.cpp
@@ -3,8 +3,9 @@
 #include "spdlog/spdlog.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryVec3fV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryVec3fV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                            std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/Vec3fFactory.h b/src/port/resource/importers/Vec3fFactory.h
index bb9da1ad..1116aa55 100644
--- a/src/port/resource/importers/Vec3fFactory.h
+++ b/src/port/resource/importers/Vec3fFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryVec3fV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/Vec3sFactory.cpp b/src/port/resource/importers/Vec3sFactory.cpp
index 810dc95d..9a43deb2 100644
--- a/src/port/resource/importers/Vec3sFactory.cpp
+++ b/src/port/resource/importers/Vec3sFactory.cpp
@@ -3,8 +3,9 @@
 #include "spdlog/spdlog.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryVec3sV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryVec3sV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                            std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/Vec3sFactory.h b/src/port/resource/importers/Vec3sFactory.h
index 85162dda..2182e498 100644
--- a/src/port/resource/importers/Vec3sFactory.h
+++ b/src/port/resource/importers/Vec3sFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryVec3sV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/audio/AudioTableFactory.cpp b/src/port/resource/importers/audio/AudioTableFactory.cpp
index a2798a2e..80b02f56 100644
--- a/src/port/resource/importers/audio/AudioTableFactory.cpp
+++ b/src/port/resource/importers/audio/AudioTableFactory.cpp
@@ -3,8 +3,9 @@
 #include "../ResourceUtil.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioTableV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioTableV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                 std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/audio/AudioTableFactory.h b/src/port/resource/importers/audio/AudioTableFactory.h
index e27cbd79..a046131c 100644
--- a/src/port/resource/importers/audio/AudioTableFactory.h
+++ b/src/port/resource/importers/audio/AudioTableFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryAudioTableV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/audio/BookFactory.cpp b/src/port/resource/importers/audio/BookFactory.cpp
index 88d05548..6643d13e 100644
--- a/src/port/resource/importers/audio/BookFactory.cpp
+++ b/src/port/resource/importers/audio/BookFactory.cpp
@@ -2,8 +2,9 @@
 #include "port/resource/type/audio/AdpcmBook.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAdpcmBookV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAdpcmBookV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/audio/BookFactory.h b/src/port/resource/importers/audio/BookFactory.h
index 0207cd81..d7de8c99 100644
--- a/src/port/resource/importers/audio/BookFactory.h
+++ b/src/port/resource/importers/audio/BookFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryAdpcmBookV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/audio/DrumFactory.cpp b/src/port/resource/importers/audio/DrumFactory.cpp
index c6047983..b850dee3 100644
--- a/src/port/resource/importers/audio/DrumFactory.cpp
+++ b/src/port/resource/importers/audio/DrumFactory.cpp
@@ -3,8 +3,9 @@
 #include "port/resource/type/audio/Drum.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryDrumV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryDrumV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/audio/DrumFactory.h b/src/port/resource/importers/audio/DrumFactory.h
index 8b63febb..c618bb08 100644
--- a/src/port/resource/importers/audio/DrumFactory.h
+++ b/src/port/resource/importers/audio/DrumFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryDrumV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/audio/EnvelopeFactory.cpp b/src/port/resource/importers/audio/EnvelopeFactory.cpp
index 1a3dfc60..ab789cb2 100644
--- a/src/port/resource/importers/audio/EnvelopeFactory.cpp
+++ b/src/port/resource/importers/audio/EnvelopeFactory.cpp
@@ -2,8 +2,9 @@
 #include "port/resource/type/audio/Envelope.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryEnvelopeV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryEnvelopeV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                               std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/audio/EnvelopeFactory.h b/src/port/resource/importers/audio/EnvelopeFactory.h
index 41107a4c..af2ac262 100644
--- a/src/port/resource/importers/audio/EnvelopeFactory.h
+++ b/src/port/resource/importers/audio/EnvelopeFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryEnvelopeV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/audio/InstrumentFactory.cpp b/src/port/resource/importers/audio/InstrumentFactory.cpp
index 0a79e305..442ccff0 100644
--- a/src/port/resource/importers/audio/InstrumentFactory.cpp
+++ b/src/port/resource/importers/audio/InstrumentFactory.cpp
@@ -3,8 +3,9 @@
 #include "port/resource/type/audio/Instrument.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryInstrumentV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryInstrumentV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                 std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/audio/InstrumentFactory.h b/src/port/resource/importers/audio/InstrumentFactory.h
index ed99a5f2..64301594 100644
--- a/src/port/resource/importers/audio/InstrumentFactory.h
+++ b/src/port/resource/importers/audio/InstrumentFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryInstrumentV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/audio/LoopFactory.cpp b/src/port/resource/importers/audio/LoopFactory.cpp
index f2dfca35..485c800a 100644
--- a/src/port/resource/importers/audio/LoopFactory.cpp
+++ b/src/port/resource/importers/audio/LoopFactory.cpp
@@ -2,8 +2,9 @@
 #include "port/resource/type/audio/AdpcmLoop.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAdpcmLoopV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAdpcmLoopV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
diff --git a/src/port/resource/importers/audio/LoopFactory.h b/src/port/resource/importers/audio/LoopFactory.h
index b244249e..d2e78b10 100644
--- a/src/port/resource/importers/audio/LoopFactory.h
+++ b/src/port/resource/importers/audio/LoopFactory.h
@@ -6,6 +6,7 @@
 namespace SF64 {
 class ResourceFactoryBinaryAdpcmLoopV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 }; // namespace LUS
diff --git a/src/port/resource/importers/audio/SampleFactory.cpp b/src/port/resource/importers/audio/SampleFactory.cpp
index 890641a3..c83e49c8 100644
--- a/src/port/resource/importers/audio/SampleFactory.cpp
+++ b/src/port/resource/importers/audio/SampleFactory.cpp
@@ -11,8 +11,9 @@
 #include "vorbis/vorbisfile.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinarySampleV1::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinarySampleV1::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                             std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
@@ -142,14 +143,14 @@ static void OggDecoderWorker(std::shared_ptr<Sample> sample, std::shared_ptr<Shi
     ov_clear(&vf);
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryXMLSampleV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryXMLSampleV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
     auto sample = std::make_shared<Sample>(file->InitData);
     auto child = std::get<std::shared_ptr<tinyxml2::XMLDocument>>(file->Reader)->FirstChildElement();
-    std::shared_ptr<Ship::ResourceInitData> initData = std::make_shared<Ship::ResourceInitData>();
     const char* customFormatStr = child->Attribute("CustomFormat");
     memset(&sample->mSample, 0, sizeof(sample->mSample));
     sample->mSample.isRelocated = 0;
@@ -190,10 +191,7 @@ std::shared_ptr<Ship::IResource> ResourceFactoryXMLSampleV0::ReadResource(std::s
     sample->mSample.size = size;
 
     const char* path = child->Attribute("Path");
-    initData->Path = path;
-    initData->IsCustom = false;
-    initData->ByteOrder = Ship::Endianness::Native;
-    auto sampleFile = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(path, initData);
+    auto sampleFile = Ship::Context::GetInstance()->GetResourceManager()->GetArchiveManager()->LoadFile(path);
     if (customFormatStr != nullptr) {
         // Compressed files can take a really long time to decode (~250ms per).
         // This worked when we tested it (09/04/2024) (Works on my machine)
diff --git a/src/port/resource/importers/audio/SampleFactory.h b/src/port/resource/importers/audio/SampleFactory.h
index 01fbf97e..b3e0b0c0 100644
--- a/src/port/resource/importers/audio/SampleFactory.h
+++ b/src/port/resource/importers/audio/SampleFactory.h
@@ -13,12 +13,14 @@ struct OggFileData {
 
 class ResourceFactoryBinarySampleV1 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 
 class ResourceFactoryXMLSampleV0 : public Ship::ResourceFactoryXML {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
   private:
     static uint8_t CodecStrToInt(const char* str, const char* file);
     static uint32_t MediumStrToInt(const char* str);
diff --git a/src/port/resource/importers/audio/SoundFontFactory.cpp b/src/port/resource/importers/audio/SoundFontFactory.cpp
index 1fda2854..c0730360 100644
--- a/src/port/resource/importers/audio/SoundFontFactory.cpp
+++ b/src/port/resource/importers/audio/SoundFontFactory.cpp
@@ -5,8 +5,9 @@
 #include "port/resource/type/audio/SoundFont.h"
 
 namespace SF64 {
-std::shared_ptr<Ship::IResource> ResourceFactoryBinarySoundFontV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryBinarySoundFontV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                                std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
 
@@ -210,8 +211,9 @@ std::vector<EnvelopePointData> ResourceFactoryXMLSoundFontV0::ParseEnvelopes(Sou
     return envelopes;
 }
 
-std::shared_ptr<Ship::IResource> ResourceFactoryXMLSoundFontV0::ReadResource(std::shared_ptr<Ship::File> file) {
-    if (!FileHasValidFormatAndReader(file)) {
+std::shared_ptr<Ship::IResource> ResourceFactoryXMLSoundFontV0::ReadResource(std::shared_ptr<Ship::File> file,
+                                                                           std::shared_ptr<Ship::ResourceInitData> initData) {
+    if (!FileHasValidFormatAndReader(file, initData)) {
         return nullptr;
     }
     auto audioSoundFont = std::make_shared<SoundFont>(file->InitData);
diff --git a/src/port/resource/importers/audio/SoundFontFactory.h b/src/port/resource/importers/audio/SoundFontFactory.h
index b5afda9a..69796b1d 100644
--- a/src/port/resource/importers/audio/SoundFontFactory.h
+++ b/src/port/resource/importers/audio/SoundFontFactory.h
@@ -8,12 +8,14 @@
 namespace SF64 {
 class ResourceFactoryBinarySoundFontV0 : public Ship::ResourceFactoryBinary {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
 };
 
 class ResourceFactoryXMLSoundFontV0 : public Ship::ResourceFactoryXML {
   public:
-    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file) override;
+    std::shared_ptr<Ship::IResource> ReadResource(std::shared_ptr<Ship::File> file,
+                                                  std::shared_ptr<Ship::ResourceInitData> initData) override;
     static int8_t MediumStrToInt(const char* str);
     static int8_t CachePolicyToInt(const char* str);