diff options
| author | Archez <Archez@users.noreply.github.com> | 2024-05-02 20:43:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 20:43:16 -0400 |
| commit | b3314eb7916736d597335860b2ccbfc35e0be7ed (patch) | |
| tree | 6a2ec524f95861adb2dff7fbf1acfd8418562215 | |
| parent | 67feb47d9d3281585a1981412e4f24451941e0b2 (diff) | |
search for dlist in external files for branch z (#21)
| -rw-r--r-- | OTRExporter/DisplayListExporter.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/OTRExporter/DisplayListExporter.cpp b/OTRExporter/DisplayListExporter.cpp index fc06e3d..8c4b533 100644 --- a/OTRExporter/DisplayListExporter.cpp +++ b/OTRExporter/DisplayListExporter.cpp @@ -369,9 +369,24 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina } else { - word0 = 0; - word1 = 0; - spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); + // If we can't find the display list in this file, try looking in other files based on the segment number + uint32_t seg = data2 & 0xFFFFFFFF; + std::string resourceName = ""; + bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", resourceName, res->parent->workerID); + if (foundDecl) { + ZFile* assocFile = Globals::Instance->GetSegment(GETSEGNUM(seg), res->parent->workerID); + std::string assocFileName = assocFile->GetName(); + std::string fName = GetPathToRes(assocFile->resources[0], resourceName.c_str()); + + uint64_t hash = CRC64(fName.c_str()); + + word0 = hash >> 32; + word1 = hash & 0xFFFFFFFF; + } else { + word0 = 0; + word1 = 0; + spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data2))); + } } for (size_t i = 0; i < dList->otherDLists.size(); i++) |