From ebec180bf1125b4f29b068922d1220c8af9b63b0 Mon Sep 17 00:00:00 2001
From: a55uka <59313695+a55uka@users.noreply.github.com>
Date: Tue, 3 Nov 2026 00:12:54 +0000
Subject: nup_writer: keep the dump's own layout for non-exefs/romfs entries

---
 src/core/file_sys/nup_writer.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/core/file_sys/nup_writer.cpp b/src/core/file_sys/nup_writer.cpp
index 4161969f98..54bb4c77d3 100644
--- a/src/core/file_sys/nup_writer.cpp
+++ b/src/core/file_sys/nup_writer.cpp
@@ -638,10 +638,13 @@ private:
                 std::ranges::find(skip, lower) != skip.end()) {
                 continue;
             }
+            // Keep the dump's own layout for anything that is not exefs/romfs, the
+            // same way the reference packer does: a root-level data/ folder stays
+            // data/, and other extras keep their name instead of moving under data/.
             if (entry.is_directory(ec)) {
-                CollectTree(index, entry.path(), "data/" + name);
+                CollectTree(index, entry.path(), name);
             } else {
-                AddFile(index, entry, "data/" + name);
+                AddFile(index, entry, name);
             }
         }
         return plan.packages.back().title_id;
-- 
cgit v1.2.3