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

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

This commit is contained in:
Bryan Bishop 2013-08-03 21:42:03 -05:00
parent 4619cf13de 36b7935bed
commit 783a22cc21
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -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/%/front.png gfx/pics/%/tiles.2bpp
python extras/gfx.py png-to-lz --front $^
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/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 $<

2
extras

@ -1 +1 @@
Subproject commit 0403a4a90d473cc0a4bf5c53677c0a84406bc4ad
Subproject commit 3011f9243cbe4b0de7ab2392941385c705697909