From 955e4eddf8fdfbb68dad3ada8712faf6fb44a417 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 17 Apr 2021 19:16:12 -0400
Subject: Actually use rgbds 0.5.0

---
 tools/unnamed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/unnamed.py b/tools/unnamed.py
index f99a38d8..4268879e 100755
--- a/tools/unnamed.py
+++ b/tools/unnamed.py
@@ -82,7 +82,7 @@ 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)
 
-- 
cgit v1.3.1-sl0p


From bf81961b9d40c47ce2f7332e4cdaa9ca93fd93fc Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 17 Apr 2021 19:20:14 -0400
Subject: Fix tools/unnamed.py

---
 tools/unnamed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/unnamed.py b/tools/unnamed.py
index 4268879e..e4634541 100755
--- a/tools/unnamed.py
+++ b/tools/unnamed.py
@@ -89,7 +89,7 @@ for objfile in objects:
     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:
-- 
cgit v1.3.1-sl0p


From 2fdcb1a3d6919f378b2f83f14d3b3822a19fcc33 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 17 Apr 2021 19:28:38 -0400
Subject: Prevent some gcc versions from complaining about {0} in
 tools/scan_includes.c

---
 tools/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/Makefile b/tools/Makefile
index a9906fad..7ab1d146 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
 
-- 
cgit v1.3.1-sl0p