diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | extras/gfx.py | 11 |
2 files changed, 14 insertions, 9 deletions
@@ -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..3aa98b3ca 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""" @@ -1428,13 +1430,16 @@ def mass_to_png(debug=False): to_png(os.path.join(root, name)) def mass_to_colored_png(debug=False): - # greyscale + # greyscale, unless a palette is detected for root, dirs, files in os.walk('../gfx/'): if 'pics' not in root and 'trainers' not in root: for name in files: if debug: print os.path.splitext(name), os.path.join(root, name) if os.path.splitext(name)[1] == '.2bpp': - to_png(os.path.join(root, name)) + if name[:5]+'.pal' in files: + to_png(os.path.join(root, name), None, os.path.join(root, name[:-5]+'.pal')) + else: + to_png(os.path.join(root, name)) # only monster and trainer pics for now for root, dirs, files in os.walk('../gfx/pics/'): @@ -1449,7 +1454,7 @@ def mass_to_colored_png(debug=False): for name in files: if debug: print os.path.splitext(name), os.path.join(root, name) if os.path.splitext(name)[1] == '.2bpp': - to_png(os.path.join(root, name), None, os.path.join(root, name[:-5] + '.pal')) + to_png(os.path.join(root, name), None, os.path.join(root, name[:-5]+'.pal')) def mass_decompress(debug=False): |