Merge remote-tracking branch 'upstream/master'

3 files changed, 10 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index e9a324c9c..e791e3491 100644
--- a/Makefile
+++ b/Makefile
@@ -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 $<
diff --git a/extras b/extras
-Subproject 5ad74a89aee5181b30eed0b11ef75c1b01ed41e
+Subproject 3a6ef54a5e26644699b98d9b73998df5673f4e7
diff --git a/gfx.py b/gfx.py
index 730c73451..9aed17939 100644
--- a/gfx.py
+++ b/gfx.py
@@ -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':