summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@github.com>2013-02-12 03:17:05 -0500
committeryenatch <yenatch@github.com>2013-02-12 03:31:35 -0500
commitad0578fda0aec42c28e3db26bbf68d06aa19f63e (patch)
treec1a8a6d99494bf5d0699dc29d278a2f358ff9477
parent8b8f7200a9bdae9396180bebedce69298677e8a6 (diff)
Fix png export orientation
A quirk of the Decompressed class dissociated the orientation from the output attribute. The makefile no longer suppresses output since it's still relevant.
-rw-r--r--Makefile12
-rw-r--r--extras/gfx.py2
2 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index bb1b14d90..ab95414e3 100644
--- a/Makefile
+++ b/Makefile
@@ -38,18 +38,18 @@ pokecrystal.gbc: pokecrystal.o
cmp baserom.gbc $@
-@lzs: ${VERTGFX} ${HORIZGFX}
+lzs: ${VERTGFX} ${HORIZGFX}
-@pngs:
+pngs:
cd extras; python gfx.py mass-decompress; python gfx.py dump-pngs
-@front.png: tiles.png
+front.png: tiles.png
cd extras; python gfx.py png-to-lz --front $@ $(OBJECT_DIRECTORY)/tiles.2bpp
-@tiles.png:
+tiles.png:
cd extras; python gfx.py png-to-2bpp $@
-@.png: ${VERTGFX}
+.png: ${VERTGFX}
cd extras; python gfx.py png-to-lz --vert $@
-@.png: ${HORIZGFX}
+.png: ${HORIZGFX}
cd extras; python gfx.py png-to-lz $@
diff --git a/extras/gfx.py b/extras/gfx.py
index c641ab7f1..d2e2abfb6 100644
--- a/extras/gfx.py
+++ b/extras/gfx.py
@@ -610,6 +610,8 @@ class Decompressed:
self.tiles = transpose(self.tiles)
self.pic = connect(self.tiles)
+ self.output = self.pic + self.animtiles
+
def decompress(self):
"""replica of crystal's decompression"""