pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd2d5c09'

Browse Source 
Conflicts:
	main.asm
	wram.asm

Git couldn't figure out what this commit did, so it was redone to merge.
This commit is contained in:
yenatch
2013-08-21 13:54:35 -04:00
parent 4b0889b396 d2d5c09b1d
commit 802c3149c0
5 changed files with 204 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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