From e1176acfed7be0ff9933b66ac24c92849726f0cd Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@nanaian.town>
Date: Fri, 16 Feb 2024 21:38:54 +0000
Subject: [PATCH] Mitigate #1170 (#1172)

* add old star rod dirs to gitignore

* remove something from mapfs to introduce bug

* fix build

See https://github.com/pmret/papermario/issues/1170

* Revert "remove something from mapfs to introduce bug"

This reverts commit 4a3927866eb315342777b5cf46f9e233310fd1ee.
---
 .gitignore                     | 9 +++++++++
 tools/splat_ext/pm_map_data.py | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 35a6fd2457..3a9a53c61e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,15 @@ build/
 dump
 *.backup
 crash.xml
+/audio/*
+/sprite/*
+/battle/*
+/globals/*
+/map/*
+/world/*
+/image/*
+/strings/*
+/res/*
 
 /tools/Yay0compress
 /tools/n64crc
diff --git a/tools/splat_ext/pm_map_data.py b/tools/splat_ext/pm_map_data.py
index 3d5e0908cc..e3061feec5 100644
--- a/tools/splat_ext/pm_map_data.py
+++ b/tools/splat_ext/pm_map_data.py
@@ -130,7 +130,12 @@ class N64SegPm_map_data(N64Segment):
             if name == "end_data":
                 break
 
-            assert self.files.get(name) is not None
+            if self.files.get(name) is None:
+                # TODO
+                # https://github.com/pmret/papermario/issues/1170
+                self.warn(f"skipping unknown file {name}")
+                asset_idx += 1
+                continue
 
             if offset == 0:
                 path = None