diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-03 21:40:45 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-03 21:40:45 -0500 |
| commit | 36b7935bed07e8f7b7cffd2a796b95222b27a5da (patch) | |
| tree | 6bf0e566f88559c45c8f388f1f840200092c32b8 | |
| parent | 268a2d28fdbacf48ea5e9d0cbac37ac4deee7082 (diff) | |
| parent | daa0760e2652f0019b20d3a93b4dda76be5f5288 (diff) | |
Merge branch 'master' into remove-extras-fix-make-gfx
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,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/pokemontools/gfx.py png-to-lz --front $^ gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png python extras/pokemontools/gfx.py png-to-2bpp $< |