Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109 from yenatch/master 

png export fixes
This commit is contained in:
Bryan Bishop 2013-02-12 00:57:34 -08:00
parent b62d644d93 7f7f461240
commit 2063814b75
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -38,18 +38,18 @@ pokecrystal.gbc: pokecrystal.o
cmp baserom.gbc $@ cmp baserom.gbc $@
@lzs: ${VERTGFX} ${HORIZGFX} lzs: ${VERTGFX} ${HORIZGFX}
@pngs: pngs:
cd extras; python gfx.py mass-decompress; python gfx.py dump-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 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 $@ cd extras; python gfx.py png-to-2bpp $@
@.png: ${VERTGFX} .png: ${VERTGFX}
cd extras; python gfx.py png-to-lz --vert $@ cd extras; python gfx.py png-to-lz --vert $@
@.png: ${HORIZGFX} .png: ${HORIZGFX}
cd extras; python gfx.py png-to-lz $@ cd extras; python gfx.py png-to-lz $@

11
extras/gfx.py
View File

@ -610,6 +610,8 @@ class Decompressed:
self.tiles = transpose(self.tiles) self.tiles = transpose(self.tiles)
self.pic = connect(self.tiles) self.pic = connect(self.tiles)
self.output = self.pic + self.animtiles
def decompress(self): def decompress(self):
"""replica of crystal's decompression""" """replica of crystal's decompression"""
@ -1428,13 +1430,16 @@ def mass_to_png(debug=False):
to_png(os.path.join(root, name)) to_png(os.path.join(root, name))
def mass_to_colored_png(debug=False): def mass_to_colored_png(debug=False):
# greyscale # greyscale, unless a palette is detected
for root, dirs, files in os.walk('../gfx/'): for root, dirs, files in os.walk('../gfx/'):
if 'pics' not in root and 'trainers' not in root: if 'pics' not in root and 'trainers' not in root:
for name in files: for name in files:
if debug: print os.path.splitext(name), os.path.join(root, name) if debug: print os.path.splitext(name), os.path.join(root, name)
if os.path.splitext(name)[1] == '.2bpp': 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 # only monster and trainer pics for now
for root, dirs, files in os.walk('../gfx/pics/'): for root, dirs, files in os.walk('../gfx/pics/'):
@ -1449,7 +1454,7 @@ def mass_to_colored_png(debug=False):
for name in files: for name in files:
if debug: print os.path.splitext(name), os.path.join(root, name) if debug: print os.path.splitext(name), os.path.join(root, name)
if os.path.splitext(name)[1] == '.2bpp': 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): def mass_decompress(debug=False):