Merge branch 'master' into remove-extras-fix-make-gfx

This commit is contained in:
Bryan Bishop 2013-08-03 21:40:45 -05:00
commit 36b7935bed

View File

@ -31,7 +31,7 @@ pngs:
lzs: $(LZ_GFX) $(TWOBPP_GFX) 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/pokemontools/gfx.py png-to-lz --front $^ python extras/pokemontools/gfx.py png-to-lz --front $^
gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png
python extras/pokemontools/gfx.py png-to-2bpp $< python extras/pokemontools/gfx.py png-to-2bpp $<