pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
JimB16 2015-08-30 13:18:44 +02:00
commit 7608472ef4
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -76,8 +76,8 @@ pokecrystal.gbc: $(crystal_obj)
pngs:
find . -iname "*.lz" -exec $(gfx) unlz {} +
find . -iname "*.[12]bpp" -exec $(gfx) png {} +
find . -iname "*.[12]bpp" -exec touch {} +
find . -iname "*.lz" -exec touch {} +
find . -iname "*.[12]bpp" -exec touch {} \;
find . -iname "*.lz" -exec touch {} \;
%.2bpp: %.png ; $(gfx) 2bpp $<
%.1bpp: %.png ; $(gfx) 1bpp $<

2
extras

@ -1 +1 @@
Subproject commit 5ad74a89aee5181b30eed0b11ef75c1b01ed41eb
Subproject commit 3a6ef54a5e26644699b98d9b73998df5673f4e72

9
gfx.py
View File

@ -20,6 +20,10 @@ def filepath_rules(filepath):
name, ext = os.path.splitext(filename)
if 'gfx/pics/' in filedir:
if 'unown' in filedir:
index = filedir.find('unown_')
if index != -1:
filedir = filedir[:index + len('unown')] + filedir[index + len('unown_a'):]
if name == 'front':
args['pal_file'] = os.path.join(filedir, 'normal.pal')
args['pic'] = True
@ -35,7 +39,10 @@ def filepath_rules(filepath):
args['pic'] = True
if args.get('pal_file'):
args['palout'] = args['pal_file']
if os.path.exists(args['pal_file']):
args['palout'] = args['pal_file']
else:
del args['pal_file']
if args.get('pic'):
if ext == '.png':