1 files changed, 18 insertions, 0 deletions
diff --git a/src/factories/DisplayListFactory.cpp b/src/factories/DisplayListFactory.cpp
index 2d6d48e..2e336f0 100644
--- a/src/factories/DisplayListFactory.cpp
+++ b/src/factories/DisplayListFactory.cpp
@@ -6,6 +6,9 @@
 #include <fstream>
 #include <tuple>
 #include "n64/gbi-otr.h"
+#ifdef OOT_SUPPORT
+#include "oot/OoTDListHelpers.h"
+#endif
 
 #ifdef STANDALONE
 #include <gfxd.h>
@@ -196,6 +199,11 @@ void DebugDisplayList(uint32_t w0, uint32_t w1) {
 #endif
 
 std::optional<std::tuple<std::string, YAML::Node>> SearchVtx(uint32_t ptr) {
+#ifdef OOT_SUPPORT
+    auto result = OoT::DListHelpers::SearchVtx(ptr);
+    if (result.has_value()) return result;
+#endif
+
     const auto* decs = Companion::Instance->GetNodesByTypeRef("VTX", Companion::Instance->GetConfig().includeAutogen);
     if (decs == nullptr) {
         return std::nullopt;
@@ -230,6 +238,11 @@ std::optional<std::tuple<std::string, YAML::Node>> SearchVtx(uint32_t ptr) {
 
 ExportResult DListBinaryExporter::Export(std::ostream& write, std::shared_ptr<IParsedData> raw, std::string& entryName,
                                          YAML::Node& node, std::string* replacement) {
+#ifdef OOT_SUPPORT
+    auto ootResult = OoT::DListHelpers::Export(write, raw, entryName, node, replacement);
+    if (ootResult.has_value()) return ootResult.value();
+#endif
+
     const auto gbi = Companion::Instance->GetGBIVersion();
     auto cmds = std::static_pointer_cast<DListData>(raw)->mGfxs;
     auto writer = LUS::BinaryWriter();
@@ -511,6 +524,11 @@ ExportResult DListBinaryExporter::Export(std::ostream& write, std::shared_ptr<IP
 }
 
 std::optional<std::shared_ptr<IParsedData>> DListFactory::parse(std::vector<uint8_t>& raw_buffer, YAML::Node& node) {
+#ifdef OOT_SUPPORT
+    auto ootResult = OoT::DListHelpers::Parse(raw_buffer, node);
+    if (ootResult.has_value()) return ootResult.value();
+#endif
+
     const auto gbi = Companion::Instance->GetGBIVersion();
 
     auto count = GetSafeNode<int32_t>(node, "count", -1);