From 19f3a9e31bba87714edaa316e74dcc8b1f04d65a Mon Sep 17 00:00:00 2001
From: Kat Harrison <Kat Harrison>
Date: Mon, 27 May 2013 23:07:34 -0400
Subject: Include overworld sprites

Created /extras/overworldripper.py and used it to extract overworld sprites and convert them to png files.

original-commit-id: e08e7cf7b22bc8d29011dc864a895293157ceecd
---
 overworldripper.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 overworldripper.py

diff --git a/overworldripper.py b/overworldripper.py
new file mode 100644
index 0000000..7148db6
--- /dev/null
+++ b/overworldripper.py
@@ -0,0 +1,13 @@
+import gfx
+
+def rip_sprites_from_bank(bank, offset=0):
+    file_handler = open("../gfx/overworld/bank" + str(hex(bank))[2:] + ".asm", "w")
+    for sprite in range(0 + offset, 256 + offset):
+        filename = "../gfx/overworld/" + str(sprite).zfill(3) + ".2bpp"
+        gfx.get_uncompressed_gfx((bank * 0x4000 + ((sprite - offset) * 4 * 0x10)), 4, filename)
+        gfx.to_png(filename)
+        file_handler.write("INCBIN \"" + filename[3:] + "\"\n")
+    file_handler.close()
+
+rip_sprites_from_bank(0x30)
+rip_sprites_from_bank(0x31, offset=256)
\ No newline at end of file
-- 
cgit v1.2.3


From 84ca20850dacf45fd80b69fd9dcf16d4d9196859 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Wed, 29 May 2013 19:44:06 -0500
Subject: make gfx.py png take only a path

original-commit-id: 915c6358490494b87c81a464492944f80ee86384
---
 gfx.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gfx.py b/gfx.py
index 54cd04c..396d7c5 100644
--- a/gfx.py
+++ b/gfx.py
@@ -1604,7 +1604,9 @@ if __name__ == "__main__":
 	elif sys.argv[1] == 'png':
 
 		if '.2bpp' in sys.argv[2]:
-			if sys.argv[4] == 'greyscale':
+			if len(sys.argv) == 3:
+				to_png(sys.argv[2])
+			elif sys.argv[4] == 'greyscale':
 				to_png(sys.argv[2], sys.argv[3])
 			else:
 				to_png(sys.argv[2], sys.argv[3], sys.argv[4])
-- 
cgit v1.2.3