Skip to content

Commit

Permalink
Mitigate #1170 (#1172)
Browse files Browse the repository at this point in the history
* add old star rod dirs to gitignore

* remove something from mapfs to introduce bug

* fix build

See #1170

* Revert "remove something from mapfs to introduce bug"

This reverts commit 4a39278.
  • Loading branch information
bates64 authored Feb 16, 2024
1 parent 6a2ad7e commit e1176ac
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@ build/
dump
*.backup
crash.xml
/audio/*
/sprite/*
/battle/*
/globals/*
/map/*
/world/*
/image/*
/strings/*
/res/*

/tools/Yay0compress
/tools/n64crc
7 changes: 6 additions & 1 deletion tools/splat_ext/pm_map_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,12 @@ def split(self, rom_bytes):
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
Expand Down

0 comments on commit e1176ac

Please sign in to comment.