diff options
author | mid-kid <esteve.varela@gmail.com> | 2020-02-04 23:19:41 +0100 |
---|---|---|
committer | mid-kid <esteve.varela@gmail.com> | 2020-02-04 23:19:41 +0100 |
commit | 24c058bc0af611f0fb8da5286dc08ae1837b131c (patch) | |
tree | aec48b84dfe947b6f412e391dfcdb9fb6a1c226b /tools | |
parent | ed44d1cdb7e2f389be56a0158f8ce857e02a76b3 (diff) |
Fix tools/unnamed.py for new rgbds object format
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/unnamed.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/unnamed.py b/tools/unnamed.py index cea500fcd..2c7cdd389 100755 --- a/tools/unnamed.py +++ b/tools/unnamed.py @@ -73,8 +73,16 @@ if not objects: files = {} for objfile in objects: f = open(objfile, "rb") - if unpack_file("4s", f)[0] != b'RGB6': - print("Error: File '%s' is of an unknown format." % filename, file=stderr) + obj_ver = None + + magic = unpack_file("4s", f)[0] + if magic == b'RGB6': + obj_ver = 6 + elif magic == b'RGB9': + obj_ver = 10 + unpack_file("<I", f)[0] + + if obj_ver not in [6, 10]: + print("Error: File '%s' is of an unknown format." % objfile, file=stderr) exit(1) num_symbols = unpack_file("<II", f)[0] |