From a443d09b3d12ea1e62cab7da2d573f4ff4a2871e Mon Sep 17 00:00:00 2001
From: Zack Buhman <zack@buhman.org>
Date: Sat, 29 Jul 2023 03:55:51 +0000
Subject: [PATCH] png_to_nbpp*: add support for concatenating multiple files

---
 Makefile                    |  4 ++--
 tools/png_to_nbpp.py        | 17 +++++++++--------
 tools/png_to_nbpp_sprite.py | 17 +++++++++--------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index f0aaeab..cc9e49f 100644
--- a/Makefile
+++ b/Makefile
@@ -54,11 +54,11 @@ gen/%.cpp: gen/%.hpp $(GEN_PYTHON_SOURCE)
 
 res/%.2bpp: pokered/%.png
 	@mkdir -p $(dir $@)
-	python tools/png_to_nbpp.py $< 2 $@
+	python tools/png_to_nbpp.py 2 $@ $<
 
 res/gfx/sprites/%.2bpp: pokered/gfx/sprites/%.png
 	@mkdir -p $(dir $@)
-	python tools/png_to_nbpp_sprite.py $< 2 $@
+	python tools/png_to_nbpp_sprite.py 2 $@ $<
 
 %.2bpp.h:
 	$(BUILD_BINARY_H)
diff --git a/tools/png_to_nbpp.py b/tools/png_to_nbpp.py
index c870acd..5065f40 100644
--- a/tools/png_to_nbpp.py
+++ b/tools/png_to_nbpp.py
@@ -47,13 +47,14 @@ def debug(buf, bpp):
         if (row % 8 == 7):
             print()
 
-in_path = sys.argv[1]
-bpp = int(sys.argv[2])
-out_path = sys.argv[3]
+bpp = int(sys.argv[1])
+out_path = sys.argv[2]
+assert len(sys.argv) >= 4, sys.argv
 
-im = Image.open(in_path)
-buf = convert(im, bpp)
-if 'NBPP_DEBUG' in os.environ:
-    debug(buf, bpp)
 with open(out_path, 'wb') as f:
-    f.write(buf)
+    for in_path in sys.argv[3:]:
+        im = Image.open(in_path)
+        buf = convert(im, bpp)
+        if 'NBPP_DEBUG' in os.environ:
+            debug(buf, bpp)
+        f.write(buf)
diff --git a/tools/png_to_nbpp_sprite.py b/tools/png_to_nbpp_sprite.py
index bbe25be..b9a760b 100644
--- a/tools/png_to_nbpp_sprite.py
+++ b/tools/png_to_nbpp_sprite.py
@@ -56,13 +56,14 @@ def debug(buf, bpp):
         if (row % cell_height == (cell_height - 1)):
             print()
 
-in_path = sys.argv[1]
-bpp = int(sys.argv[2])
-out_path = sys.argv[3]
+bpp = int(sys.argv[1])
+out_path = sys.argv[2]
+assert len(sys.argv) >= 4, sys.argv
 
-im = Image.open(in_path)
-buf = convert(im, bpp)
-if 'NBPP_DEBUG' in os.environ:
-    debug(buf, bpp)
 with open(out_path, 'wb') as f:
-    f.write(buf)
+    for in_path in sys.argv[3:]:
+        im = Image.open(in_path)
+        buf = convert(im, bpp)
+        if 'NBPP_DEBUG' in os.environ:
+            debug(buf, bpp)
+        f.write(buf)