From 5a96c85430677ce7081e672b7bfaf2ae44bb6522 Mon Sep 17 00:00:00 2001 From: 12abz <109289447+ThePerfectMario64@users.noreply.github.com> Date: Fri, 16 Aug 2024 04:04:26 -0500 Subject: [PATCH] [SM64] Fix #421 - Custom path DL/Geolayout exports (#422) * [SM64] Fix Custom path DL/Geolayout imports * Lilaa3 Suggestion --- fast64_internal/sm64/sm64_f3d_writer.py | 2 ++ fast64_internal/sm64/sm64_geolayout_writer.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fast64_internal/sm64/sm64_f3d_writer.py b/fast64_internal/sm64/sm64_f3d_writer.py index fd7277480..4ccb05256 100644 --- a/fast64_internal/sm64/sm64_f3d_writer.py +++ b/fast64_internal/sm64/sm64_f3d_writer.py @@ -377,6 +377,8 @@ def sm64ExportF3DtoC( scrollName = "actor_dl_" + name elif headerType == "Level": scrollName = levelName + "_level_dl_" + name + elif headerType == "Custom": + scrollName = "dl_" + name gfxFormatter = SM64GfxFormatter(ScrollMethod.Vertex) exportData = fModel.to_c(TextureExportSettings(texSeparate, savePNG, texDir, modelDirPath), gfxFormatter) diff --git a/fast64_internal/sm64/sm64_geolayout_writer.py b/fast64_internal/sm64/sm64_geolayout_writer.py index a0a2f1aab..daabb1ca7 100644 --- a/fast64_internal/sm64/sm64_geolayout_writer.py +++ b/fast64_internal/sm64/sm64_geolayout_writer.py @@ -627,6 +627,8 @@ def saveGeolayoutC( scrollName = "actor_geo_" + dirName elif headerType == "Level": scrollName = levelName + "_level_geo_" + dirName + elif headerType == "Custom": + scrollName = "geo_" + dirName gfxFormatter = SM64GfxFormatter(ScrollMethod.Vertex) if not customExport and headerType == "Level":