From afcf8f19575164e4b0fa92319041f888e719f68d Mon Sep 17 00:00:00 2001
From: entrpntr <entrpntr@gmail.com>
Date: Sat, 6 Jun 2020 14:40:15 -0400
Subject: Minor cleanups.

---
 .gitignore                |   2 ++
 engine/gfx/load_font.asm  |   2 +-
 gfx/font.asm              |   1 +
 gfx/new_game/shrink1.2bpp | Bin 784 -> 0 bytes
 gfx/new_game/shrink1.png  | Bin 0 -> 188 bytes
 gfx/pokegear/town_map.png | Bin 660 -> 441 bytes
 tools/gfx.py              |  24 +++++++++++++++++++++---
 7 files changed, 25 insertions(+), 4 deletions(-)
 delete mode 100755 gfx/new_game/shrink1.2bpp
 create mode 100644 gfx/new_game/shrink1.png

diff --git a/.gitignore b/.gitignore
index 6095246c..61729a2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ used_space.png
 #*.1bpp
 
 # ... except for specific 2bpp files generated from lz's)
+gfx/new_game/shrink*.2bpp
 gfx/pokemon/**/*.2bpp
 gfx/trainers/*.2bpp
 gfx/battle/dude.2bpp
@@ -56,6 +57,7 @@ gfx/player/chris_back.2bpp
 gfx/trade/game_boy.2bpp
 gfx/pokegear/pokegear_sprites.2bpp
 gfx/pokegear/pokegear.2bpp
+gfx/pokegear/town_map.2bpp
 gfx/slots/slots_*.2bpp
 gfx/pokedex/pokedex.2bpp
 gfx/pokedex/slowpoke.2bpp
diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm
index 46d2e0e5..4e732211 100755
--- a/engine/gfx/load_font.asm
+++ b/engine/gfx/load_font.asm
@@ -1,6 +1,6 @@
 _LoadStandardFont::
 	ld de, Font
-	ld hl, vTiles4
+	ld hl, vTiles1
 	lb bc, BANK(Font), 128 ; "A" to "9"
 	jp Get1bpp
 
diff --git a/gfx/font.asm b/gfx/font.asm
index 818f0dac..4e37d23b 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -40,6 +40,7 @@ UnusedBoldFontGFX:
 INCBIN "gfx/font/unused_bold_font.1bpp"
 
 TextboxSpaceGFX:
+; StatsScreen_LoadTextboxSpaceGFX reads 2bpp; LoadFrame reads first half as 1bpp
 INCBIN "gfx/font/space.2bpp"
 
 FontsExtra_SolidBlackGFX:
diff --git a/gfx/new_game/shrink1.2bpp b/gfx/new_game/shrink1.2bpp
deleted file mode 100755
index 96b19432..00000000
Binary files a/gfx/new_game/shrink1.2bpp and /dev/null differ
diff --git a/gfx/new_game/shrink1.png b/gfx/new_game/shrink1.png
new file mode 100644
index 00000000..6cf5b807
Binary files /dev/null and b/gfx/new_game/shrink1.png differ
diff --git a/gfx/pokegear/town_map.png b/gfx/pokegear/town_map.png
index e711c5f1..3124c6bb 100755
Binary files a/gfx/pokegear/town_map.png and b/gfx/pokegear/town_map.png differ
diff --git a/tools/gfx.py b/tools/gfx.py
index e0cc0399..7c90b740 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -104,8 +104,12 @@ def filepath_rules(filepath):
     elif 'gfx/battle' in filedir:
         if name == 'dude':
             args['pic_dimensions'] = 6, 6
-        elif name == 'balls':
+        elif name in ['balls', 'enemy_hp_bar_border']:
             args['width'] = 32
+        elif name == 'expbar':
+            args['width'] = 72
+        elif name == 'hp_exp_bar_border':
+            args['width'] = 48
 
     elif 'gfx/credits' in filedir:
         if name in ['bellossom', 'togepi', 'elekid', 'sentret']:
@@ -120,8 +124,13 @@ def filepath_rules(filepath):
             args['width'] = 176
 
     elif 'gfx/font' in filedir:
-        if name == 'font_inversed':
+        if name in ['font', 'font_inversed', 'font_battle_extra', 'font_extra']:
             args['width'] = 128
+        elif name == 'unused_bold_font':
+            args['width'] = 256
+
+    elif 'gfx/frames' in filedir:
+        args['width'] = 24
 
     elif 'gfx/icons' in filedir:
         if name == 'mail_big':
@@ -157,6 +166,11 @@ def filepath_rules(filepath):
     elif 'gfx/naming_screen' in filedir:
         args['width'] = 8
 
+    elif 'gfx/new_game' in filedir:
+        if name in ['shrink1', 'shrink2']:
+            args['width'] = 56
+            args['pic_dimensions'] = 7, 7
+
     elif 'gfx/overworld' in filedir:
         if name == 'heal_machine':
             args['width'] = 8
@@ -187,7 +201,7 @@ def filepath_rules(filepath):
         if name == 'pokegear_sprites':
             args['width'] = 16
 
-        elif name == 'pokegear':
+        elif name in ['pokegear', 'town_map']:
             args['width'] = 128
 
     elif 'gfx/mystery_gift' in filedir:
@@ -225,6 +239,10 @@ def filepath_rules(filepath):
         else:
             args['width'] = 16
 
+    elif 'gfx/stats' in filedir:
+        if name == 'stats_tiles':
+            args['width'] = 136
+
     elif 'gfx/tilesets' in filedir:
         if filedir == 'gfx/tilesets/roofs':
             args['width'] = 24
-- 
cgit v1.2.3