diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-27 11:18:30 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-27 11:18:30 -0500 |
| commit | ddc4a929058ff103cac5743ca39bb8e4b520ee90 (patch) | |
| tree | 9d986f9685c4c898e80aab898d199f5b72f9977b /Makefile | |
| parent | c61b3d42ad4e88b32e9c321b7fcc559ec0220e64 (diff) | |
| parent | 94f5f61265b9654925b66dca7c3256668435eeea (diff) | |
Merge pull request #161 from kanzure/remove-extras
This merges branch 'remove-extras' into master. The extras/ path is now
replaced by a git submodule that is independently version controlled and
separate from the pokecrystal project.
The git submodule is a reference to v1.1.0 of this repository:
https://github.com/kanzure/pokemon-reverse-engineering-tools
It's also available as a generic python module now:
https://pypi.python.org/pypi/pokemontools
https://github.com/kanzure/pokecrystal/pull/161
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -25,21 +25,22 @@ pokecrystal.gbc: pokecrystal.o rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ pngs: - cd extras && python gfx.py mass-decompress && python gfx.py dump-pngs + python extras/pokemontools/gfx.py mass-decompress + python extras/pokemontools/gfx.py dump-pngs lzs: $(LZ_GFX) $(TWOBPP_GFX) @: gfx/pics/%/front.lz: gfx/pics/%/tiles.2bpp gfx/pics/%/front.png - python extras/gfx.py png-to-lz --front $^ + python extras/pokemontools/gfx.py png-to-lz --front $^ gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png - python extras/gfx.py png-to-2bpp $< + python extras/pokemontools/gfx.py png-to-2bpp $< gfx/pics/%/back.lz: gfx/pics/%/back.png - python extras/gfx.py png-to-lz --vert $< + python extras/pokemontools/gfx.py png-to-lz --vert $< gfx/trainers/%.lz: gfx/trainers/%.png - python extras/gfx.py png-to-lz --vert $< + python extras/pokemontools/gfx.py png-to-lz --vert $< .png.lz: - python extras/gfx.py png-to-lz $< + python extras/pokemontools/gfx.py png-to-lz $< .png.2bpp: - python extras/gfx.py png-to-lz $< + python extras/pokemontools/gfx.py png-to-lz $< |