From a94257c7f8b4497a3695c142fd15972ff9e21b63 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 3 Aug 2013 18:40:02 -0500
Subject: [PATCH 1/3] update Makefile for the new gfx.py path

Why isn't the build breaking?
---
 Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index d66ab3257..c62c4b4aa 100644
--- a/Makefile
+++ b/Makefile
@@ -25,21 +25,21 @@ pokecrystal.gbc: pokecrystal.o
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
 
 pngs:
-	cd extras && python gfx.py mass-decompress && python gfx.py dump-pngs
+	cd extras/pokemontools/ && python gfx.py mass-decompress && python gfx.py dump-pngs
 
 lzs: $(LZ_GFX) $(TWOBPP_GFX)
 	@:
 
 gfx/pics/%/front.lz: gfx/pics/%/front.png gfx/pics/%/tiles.2bpp
-	python extras/gfx.py png-to-lz --front $^
+	python extras/pokemontools/gfx.py png-to-lz --front $^
 gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png
-	python extras/gfx.py png-to-2bpp $<
+	python extras/pokemontools/gfx.py png-to-2bpp $<
 gfx/pics/%/back.lz: gfx/pics/%/back.png
-	python extras/gfx.py png-to-lz --vert $<
+	python extras/pokemontools/gfx.py png-to-lz --vert $<
 gfx/trainers/%.lz: gfx/trainers/%.png
-	python extras/gfx.py png-to-lz --vert $<
+	python extras/pokemontools/gfx.py png-to-lz --vert $<
 .png.lz:
-	python extras/gfx.py png-to-lz $<
+	python extras/pokemontools/gfx.py png-to-lz $<
 .png.2bpp:
-	python extras/gfx.py png-to-lz $<
+	python extras/pokemontools/gfx.py png-to-lz $<
 

From 268a2d28fdbacf48ea5e9d0cbac37ac4deee7082 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 3 Aug 2013 20:13:37 -0500
Subject: [PATCH 2/3] probably fix the pngs target for make

Update the submodule to a version where gfx.py is able to handle the
current paths.

Make some other fixes to Makefile to call gfx.py correctly.
---
 Makefile | 3 ++-
 extras   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c62c4b4aa..cd63e435c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ pokecrystal.gbc: pokecrystal.o
 	rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
 
 pngs:
-	cd extras/pokemontools/ && python gfx.py mass-decompress && python gfx.py dump-pngs
+	python extras/pokemontools/gfx.py mass-decompress
+	python extras/pokemontools/gfx.py dump-pngs
 
 lzs: $(LZ_GFX) $(TWOBPP_GFX)
 	@:
diff --git a/extras b/extras
index 0403a4a90..3011f9243 160000
--- a/extras
+++ b/extras
@@ -1 +1 @@
-Subproject commit 0403a4a90d473cc0a4bf5c53677c0a84406bc4ad
+Subproject commit 3011f9243cbe4b0de7ab2392941385c705697909

From daa0760e2652f0019b20d3a93b4dda76be5f5288 Mon Sep 17 00:00:00 2001
From: Bryan Bishop <kanzure@gmail.com>
Date: Sat, 3 Aug 2013 21:29:49 -0500
Subject: [PATCH 3/3] fix gfx/pics/%/front.lz make target

The parameter order was wrong, causing make to always try to make
front.lz files every run.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d66ab3257..6a75eeef0 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ pngs:
 lzs: $(LZ_GFX) $(TWOBPP_GFX)
 	@:
 
-gfx/pics/%/front.lz: gfx/pics/%/front.png gfx/pics/%/tiles.2bpp
+gfx/pics/%/front.lz: gfx/pics/%/tiles.2bpp gfx/pics/%/front.png
 	python extras/gfx.py png-to-lz --front $^
 gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png
 	python extras/gfx.py png-to-2bpp $<