diff options
| author | dannye <33dannye@gmail.com> | 2021-04-17 21:00:28 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-17 21:00:28 -0500 |
| commit | d4154b289176647ff20e19879de70073bd6d9a30 (patch) | |
| tree | f4175a9303dd0e1430f4c42e79a4d5ffb1f32c00 /tools | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Prevent some gcc versions from complaining about {0} in tools/scan_includes.c (diff) | |
| download | pokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.tar.gz pokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.tar.xz pokeyellow-d4154b289176647ff20e19879de70073bd6d9a30.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rwxr-xr-x | tools/unnamed.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/Makefile b/tools/Makefile index f8dceb1a..6bea053d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,7 +1,7 @@ .PHONY: all clean CC := gcc -CFLAGS := -O3 -std=c99 -Wall -Wextra -pedantic +CFLAGS := -O3 -std=c99 -Wall -Wextra -Wno-missing-field-initializers tools := scan_includes gfx pkmncompress pcm diff --git a/tools/unnamed.py b/tools/unnamed.py index bee4e29b..db743051 100755 --- a/tools/unnamed.py +++ b/tools/unnamed.py @@ -82,14 +82,14 @@ for objfile in objects: elif magic == b'RGB9': obj_ver = 10 + unpack_file("<I", f)[0] - if obj_ver not in [6, 10, 11, 12, 13, 15, 16]: + if obj_ver not in [6, 10, 11, 12, 13, 15, 16, 17]: print("Error: File '%s' is of an unknown format." % objfile, file=stderr) exit(1) num_symbols = unpack_file("<I", f)[0] unpack_file("<I", f) # skip num sections - if obj_ver in [16]: + if obj_ver in [16, 17]: node_filenames = [] num_nodes = unpack_file("<I", f)[0] for x in range(num_nodes): @@ -109,7 +109,7 @@ for objfile in objects: sym_type = symtype(unpack_file("<B", f)[0] & 0x7f) if sym_type == symtype.IMPORT: continue - if obj_ver in [16]: + if obj_ver in [16, 17]: sym_fileno = unpack_file("<I", f)[0] sym_filename = node_filenames[sym_fileno] else: |