30 files changed, 60 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index 1562f245..aa4cb3de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,7 @@ pokesilver.txt
 # osx files
 .DS_STORE
 
-# compiled graphics
-*.lz
-*.2bpp
-*.1bpp
+# compiled graphics (include for now)
+#*.lz
+#*.2bpp
+#*.1bpp
diff --git a/Makefile b/Makefile
index f67934ed..a36266a3 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ gfx := $(PYTHON) tools/gfx.py
 ### Build targets
 
 .SUFFIXES:
-.PHONY: all gold silver clean pngs compare tools
+.PHONY: all gold silver clean tidy pngs compare tools
 .SECONDEXPANSION:
 .PRECIOUS:
 .SECONDARY:
@@ -47,9 +47,13 @@ all: $(roms)
 gold: pokegold.gbc
 silver: pokesilver.gbc
 
+tidy:
+	rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
+	$(MAKE) clean -C tools/
+
 clean:
 	rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym)
-	find gfx/pokemon gfx/trainers -iname "*.[1,2]bpp" -delete
+	find gfx -iname "*.png" -delete
 	$(MAKE) clean -C tools/
 
 compare: $(roms)
@@ -99,7 +103,8 @@ pokesilver.gbc: $(silver_obj) pokesilver.link
 	tools/sort_symfile.sh pokesilver.sym
 
 pngs:
-	find gfx/pokemon gfx/trainers gfx/mail -iname "*.lz"      -exec $(gfx) unlz {} +
-	find gfx/pokemon gfx/trainers gfx/mail -iname "*.[12]bpp" -exec $(gfx) png  {} +
-	find gfx/pokemon gfx/trainers gfx/mail -iname "*.[12]bpp" -exec touch {} +
-	find gfx/pokemon gfx/trainers gfx/mail -iname "*.lz"      -exec touch {} +
+	find gfx -iname "*.lz"      -exec $(gfx) unlz {} +
+	find gfx -iname "*.[12]bpp" -exec $(gfx) png  {} +
+	find gfx -iname "*.[12]bpp" -exec touch {} +
+	find gfx -iname "*.lz"      -exec touch {} +
+	find gfx/pokemon gfx/trainers -iname "*.[1,2]bpp" -delete
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index ca713987..b388675f 100755
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -1304,13 +1304,13 @@ ENDC
 
 IF DEF(_GOLD)
 SGBBorderMap: INCBIN "gfx/sgb_border/gold.map"
-SGBBorderPalettes: INCLUDE "gfx/sgb_border/pals/gold.pal"
+SGBBorderPalettes: INCLUDE "gfx/sgb_border/gold.pal"
 SGBBorder: INCBIN "gfx/sgb_border/gold.2bpp"
 ENDC
 
 IF DEF(_SILVER)
 SGBBorderMap: INCBIN "gfx/sgb_border/silver.map"
-SGBBorderPalettes: INCLUDE "gfx/sgb_border/pals/silver.pal"
+SGBBorderPalettes: INCLUDE "gfx/sgb_border/silver.pal"
 SGBBorder: INCBIN "gfx/sgb_border/silver.2bpp"
 ENDC
 
diff --git a/engine/items/pack.asm b/engine/items/pack.asm
index a8c1fedc..1f2d533d 100755
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -1569,5 +1569,5 @@ Text_CantUseItInABattle:
 	text_far Text_YouCantUseItInABattle
 	db "@"
 
-PackMenuGFX: INCBIN "gfx/misc/pack_menu.2bpp"
-PackGFX: INCBIN "gfx/misc/pack.2bpp"
+PackMenuGFX: INCBIN "gfx/pack/pack_menu.2bpp"
+PackGFX: INCBIN "gfx/pack/pack.2bpp"
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index cd88ec28..2101cf84 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -888,8 +888,8 @@ BoxNameInputUpper:
 	db "- ? ! ♂ ♀ / . , &"
 	db "lower  DEL   END "
 
-NamingScreenGFX_ED: INCBIN "gfx/naming_screen/ed.1bpp" ; leftover from gen 1
-NamingScreenGFX_MiddleLine: INCBIN "gfx/naming_screen/middleline.1bpp"
+NamingScreenGFX_ED: INCBIN "gfx/naming_screen/end.1bpp" ; leftover from gen 1
+NamingScreenGFX_MiddleLine: INCBIN "gfx/naming_screen/middle_line.1bpp"
 NamingScreenGFX_UnderLine: INCBIN "gfx/naming_screen/underline.1bpp"
 
 _ComposeMailMessage:
@@ -957,7 +957,7 @@ Function12267: ; 12267 (4:6267)
 	ld [hl], $4e
 	ret
 
-MailIcon: INCBIN "gfx/naming_screen/mail_icon.2bpp"
+MailIcon: INCBIN "gfx/icons/mail_big.2bpp"
 
 Function12341: ; 12341 (4:6341)
 	ld a, $21
diff --git a/gfx/naming_screen/mail_icon.2bpp b/gfx/icons/mail_big.2bpp
index 18892689..18892689 100644
--- a/gfx/naming_screen/mail_icon.2bpp
+++ b/gfx/icons/mail_big.2bpp
diff --git a/gfx/icons/mail_big.png b/gfx/icons/mail_big.png
new file mode 100644
index 00000000..7ad25edb
--- /dev/null
+++ b/gfx/icons/mail_big.png
diff --git a/gfx/intro/copyright.png b/gfx/intro/copyright.png
new file mode 100644
index 00000000..0ad7c2ef
--- /dev/null
+++ b/gfx/intro/copyright.png
diff --git a/gfx/intro/gamefreak_logo.png b/gfx/intro/gamefreak_logo.png
new file mode 100644
index 00000000..7038efb5
--- /dev/null
+++ b/gfx/intro/gamefreak_logo.png
diff --git a/gfx/intro/gamefreak_presents.png b/gfx/intro/gamefreak_presents.png
new file mode 100644
index 00000000..d5ff5c43
--- /dev/null
+++ b/gfx/intro/gamefreak_presents.png
diff --git a/gfx/intro/logo_sparkle.png b/gfx/intro/logo_sparkle.png
new file mode 100644
index 00000000..feaa9c1f
--- /dev/null
+++ b/gfx/intro/logo_sparkle.png
diff --git a/gfx/intro/logo_star.png b/gfx/intro/logo_star.png
new file mode 100644
index 00000000..8fc2f734
--- /dev/null
+++ b/gfx/intro/logo_star.png
diff --git a/gfx/naming_screen/border.png b/gfx/naming_screen/border.png
new file mode 100644
index 00000000..36935ab8
--- /dev/null
+++ b/gfx/naming_screen/border.png
diff --git a/gfx/naming_screen/cursor.png b/gfx/naming_screen/cursor.png
new file mode 100644
index 00000000..a0429a3a
--- /dev/null
+++ b/gfx/naming_screen/cursor.png
diff --git a/gfx/naming_screen/ed.1bpp b/gfx/naming_screen/end.1bpp
index 7bbee183..7bbee183 100644
--- a/gfx/naming_screen/ed.1bpp
+++ b/gfx/naming_screen/end.1bpp
diff --git a/gfx/naming_screen/end.png b/gfx/naming_screen/end.png
new file mode 100644
index 00000000..c8e132b9
--- /dev/null
+++ b/gfx/naming_screen/end.png
diff --git a/gfx/naming_screen/middleline.1bpp b/gfx/naming_screen/middle_line.1bpp
index 9713c883..9713c883 100644
--- a/gfx/naming_screen/middleline.1bpp
+++ b/gfx/naming_screen/middle_line.1bpp
diff --git a/gfx/naming_screen/middle_line.png b/gfx/naming_screen/middle_line.png
new file mode 100644
index 00000000..a34e82bf
--- /dev/null
+++ b/gfx/naming_screen/middle_line.png
diff --git a/gfx/naming_screen/underline.png b/gfx/naming_screen/underline.png
new file mode 100644
index 00000000..e92cd4d6
--- /dev/null
+++ b/gfx/naming_screen/underline.png
diff --git a/gfx/overworld/heal_machine.png b/gfx/overworld/heal_machine.png
new file mode 100644
index 00000000..f58d6be3
--- /dev/null
+++ b/gfx/overworld/heal_machine.png
diff --git a/gfx/misc/pack.2bpp b/gfx/pack/pack.2bpp
index 22be5508..22be5508 100644
--- a/gfx/misc/pack.2bpp
+++ b/gfx/pack/pack.2bpp
diff --git a/gfx/pack/pack.png b/gfx/pack/pack.png
new file mode 100644
index 00000000..b85fc099
--- /dev/null
+++ b/gfx/pack/pack.png
diff --git a/gfx/misc/pack_menu.2bpp b/gfx/pack/pack_menu.2bpp
index 484bc94c..484bc94c 100644
--- a/gfx/misc/pack_menu.2bpp
+++ b/gfx/pack/pack_menu.2bpp
diff --git a/gfx/pack/pack_menu.png b/gfx/pack/pack_menu.png
new file mode 100644
index 00000000..aa693cc4
--- /dev/null
+++ b/gfx/pack/pack_menu.png
diff --git a/gfx/sgb_border/pals/gold.pal b/gfx/sgb_border/gold.pal
index 047c676e..047c676e 100755
--- a/gfx/sgb_border/pals/gold.pal
+++ b/gfx/sgb_border/gold.pal
diff --git a/gfx/sgb_border/gold.png b/gfx/sgb_border/gold.png
new file mode 100644
index 00000000..ab03c950
--- /dev/null
+++ b/gfx/sgb_border/gold.png
diff --git a/gfx/sgb_border/pals/silver.pal b/gfx/sgb_border/silver.pal
index cafa90ad..cafa90ad 100755
--- a/gfx/sgb_border/pals/silver.pal
+++ b/gfx/sgb_border/silver.pal
diff --git a/gfx/sgb_border/silver.png b/gfx/sgb_border/silver.png
new file mode 100644
index 00000000..a9d63b6e
--- /dev/null
+++ b/gfx/sgb_border/silver.png
diff --git a/tools/gfx.py b/tools/gfx.py
index 36e06010..2e2703be 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -116,6 +116,42 @@ def filepath_rules(filepath):
             args['width'] = 24
             args['whitespace'] = [4]
 
+    elif 'gfx/pack' in filedir:
+        if name == 'pack':
+            args['width'] = 40
+
+        elif name == 'pack_menu':
+            args['width'] = 128
+
+    elif 'gfx/intro' in filedir:
+        if name == 'copyright':
+            args['width'] = 240
+
+        elif name == 'gamefreak_presents':
+            args['width'] = 104
+
+        elif name in ['gamefreak_logo', 'logo_sparkle']:
+            args['width'] = 24
+
+        elif name == 'logo_star':
+            args['width'] = 8
+
+    elif 'gfx/naming_screen' in filedir:
+        args['width'] = 8
+
+    elif 'gfx/icons' in filedir:
+        if name == 'mail_big':
+            args['width'] = 16
+
+    elif 'gfx/overworld' in filedir:
+        if name == 'heal_machine':
+            args['width'] = 8
+            args['pal_file'] = os.path.join(filedir, name + '.pal')
+
+    elif 'gfx/sgb_border' in filedir:
+        args['width'] = 128
+        args['pal_file'] = os.path.join(filedir, name + '.pal')
+
     elif os.path.join(filedir, name) in pics:
         args['pic'] = True
 
diff --git a/tools/pokemontools/gfx.py b/tools/pokemontools/gfx.py
index 97e4d838..078f44f3 100644
--- a/tools/pokemontools/gfx.py
+++ b/tools/pokemontools/gfx.py
@@ -389,6 +389,8 @@ def export_2bpp_to_png(filein, fileout=None, pal_file=None, height=0, width=0, t
         'pal_file': pal_file,
         'tile_padding': tile_padding,
         'pic_dimensions': pic_dimensions,
+        'rows': kwargs.get('rows', None),
+        'whitespace': kwargs.get('whitespace', None)
     }
     arguments.update(read_filename_arguments(filein))