Merge pull request #138 from yenatch/master

automated png compression + gfx fixes + no more windows
This commit is contained in:
Bryan Bishop 2013-05-18 01:49:03 -07:00
commit fdc1609f2a
3 changed files with 320 additions and 339 deletions

View File

@ -11,35 +11,24 @@ TEXTFILES = \
text/common_3.tx \ text/common_3.tx \
main.tx main.tx
VERTGFX = \ PNG_PICS = $(shell find gfx/pics/ -type f -name 'front.png')
gfx/pics/%.png \ PNG_ANIMS = $(shell find gfx/pics/ -type f -name 'tiles.png')
gfx/trainers/%.png PNG_TRAINERS = gfx/trainers/*.png
PNG_GFX = $(PNG_PICS) $(PNG_ANIMS) $(PNG_TRAINERS), $(filter-out $(shell find gfx/ -type f -name '*.png'))
HORIZGFX = $(filter-out gfx/%.png, $(VERTGFX)) LZ_PICS = $(shell find gfx/pics/ -type f -name 'front.lz')
LZ_ANIMS = $(shell find gfx/pics/ -type f -name 'tiles.lz')
LZ_TRAINERS = gfx/trainers/*.lz
LZ_GFX = $(filter-out $(LZ_PICS) $(LZ_ANIMS) $(LZ_TRAINERS), $(shell find gfx/ -type f -name '*.lz'))
# uncomment this build target to enable png import:
#all: lzs
# the recompressed graphics may be larger than the originals,
# so take care to reorganize accordingly
all: pokecrystal.gbc all: pokecrystal.gbc
cmp baserom.gbc $< cmp baserom.gbc $<
win: pokecrystal.gbc
fc baserom.gbc $<
clean: clean:
rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES} rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES}
pokecrystal.o: pokecrystal.asm constants.asm wram.asm ${TEXTFILES} lzs
winclean:
del main.tx pokecrystal.o pokecrystal.gbc .\text\sweethoney.tx .\text\phone\bill.tx .\text\phone\elm.tx .\text\phone\mom.tx .\text\phone\trainers1.tx .\text\common.tx .\text\common_2.tx .\text\common_3.tx
pokecrystal.o: pokecrystal.asm constants.asm wram.asm ${TEXTFILES}
rgbasm -o pokecrystal.o pokecrystal.asm rgbasm -o pokecrystal.o pokecrystal.asm
.asm.tx: .asm.tx:
python preprocessor.py < $< > $@ python preprocessor.py < $< > $@
@ -47,19 +36,19 @@ pokecrystal.gbc: pokecrystal.o
rgblink -o $@ $< rgblink -o $@ $<
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
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
lzs: $(LZ_PICS) $(LZ_ANIMS) $(LZ_TRAINERS) $(LZ_GFX)
front.png: tiles.png gfx/pics/%/front.lz: gfx/pics/%/front.png gfx/pics/%/tiles.2bpp
cd extras && python gfx.py png-to-lz --front $@ $(OBJECT_DIRECTORY)/tiles.2bpp python extras/gfx.py png-to-lz --front $< $(@D)/tiles.2bpp
tiles.png: gfx/pics/%/tiles.2bpp:
cd extras && python gfx.py png-to-2bpp $@ python extras/gfx.py png-to-2bpp $<
.png:: ${VERTGFX} gfx/pics/%/back.lz: gfx/pics/%/back.png
cd extras && python gfx.py png-to-lz --vert $@ python extras/gfx.py png-to-lz --vert $<
.png:: ${HORIZGFX} gfx/trainers/%.lz: gfx/trainers/%.png
cd extras && python gfx.py png-to-lz $@ python extras/gfx.py png-to-lz --vert $<
.png.lz:
python extras/gfx.py png-to-lz $<

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +0,0 @@
@set PATH=%PATH%;C:\Program Files (x86)\GnuWin32\bin\;C:\Python27\
@make winclean && make win
@pause