From 7abda2aeff11e39ee29d875c2cf9c17fec191d97 Mon Sep 17 00:00:00 2001
From: entrpntr <entrpntr@gmail.com>
Date: Sat, 23 May 2020 02:18:35 -0400
Subject: [PATCH] Updates to add pngs.

---
 gfx/debug/color_test.png          | Bin 0 -> 200 bytes
 gfx/debug/up_arrow.png            | Bin 0 -> 81 bytes
 gfx/mystery_gift/mystery_gift.png | Bin 0 -> 343 bytes
 tools/gfx.py                      |  19 +++++++++++++++----
 4 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 gfx/debug/color_test.png
 create mode 100644 gfx/debug/up_arrow.png
 create mode 100644 gfx/mystery_gift/mystery_gift.png

diff --git a/gfx/debug/color_test.png b/gfx/debug/color_test.png
new file mode 100644
index 0000000000000000000000000000000000000000..e33be965470acdfac46a64054f480d3afa47f2a5
GIT binary patch
literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^8-SRD2}m%QeKoQMQvIGTjv*DddMBLbWHID%X5A@u
zr;E#AM^|RiDi2S+0|u*GY|qs3C3hqra-PP-)AQQu{Nn@7yAH-BS5+?DR4adW?kmg9
zo9z>%)OyW41UA^RYwJjGY+Plnv#KXDa)J0+rRW83r{`DrXcnzpr+e>S59|L>v(lZ_
zhj%@7c%i?h!CGvGQ(}ASn+;pftSPyEd3`lwzjEA06|3AsASZgd`njxgN@xNA^|MXg

literal 0
HcmV?d00001

diff --git a/gfx/debug/up_arrow.png b/gfx/debug/up_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c623d2a14558c3f5598f30c5f482a2198eb4529
GIT binary patch
literal 81
zcmeAS@N?(olHy`uVBq!ia0vp^93adDBp6m-`S}e<NqD+AhE&{2P5=TX<#lWVm!cS)
bR);Y#h~HxVKaV?l1xT%@tDnm{r-UW|)Lj&|

literal 0
HcmV?d00001

diff --git a/gfx/mystery_gift/mystery_gift.png b/gfx/mystery_gift/mystery_gift.png
new file mode 100644
index 0000000000000000000000000000000000000000..818fa455742e5f302bb38cb37850f00178929760
GIT binary patch
literal 343
zcmV-d0jU0oP)<h;3K|Lk000e1NJLTq004jh000;Q00000UC^?a0003VNkl<Zc-no^
zK}y6h6b9gbh)^g4@dnwungg_SWH#cN3gZpDg5X9x#T&X9nT-Jt;1wPiantgAX^W&q
z@)m`pAASEz1FY(4u@ZqHLu?@=VuWQdRKW;YBYhJ$VSJ$=z8irY6j<Q|u#JE?ehO?m
z1<h@*I{=R@f}`LfxI8N`oo`X2O+epJTkCQLCl0891Pn*2TN5G>ZT9xf6A+q#2)VG4
zy=I7^?v5Un?Gy0%LzdzE7*d9^p$Yu8c>kipqnM{~rQ2(ZDgoyY8V_q8^ZpU5DY`BN
z#YKTzoWto5f$;dy(@<a~1vI6j1Z;*R!=lRa<>q1aHy8D)g@1r#3TXN~i1#52w!kh6
pb}nr58RCV^W&rXTt_pvh1HYzFvscV1AngDE002ovPDHLkV1gc*j_CjZ

literal 0
HcmV?d00001

diff --git a/tools/gfx.py b/tools/gfx.py
index c4996552..5abbb029 100644
--- a/tools/gfx.py
+++ b/tools/gfx.py
@@ -107,6 +107,10 @@ def filepath_rules(filepath):
         elif name == 'balls':
             args['width'] = 32
 
+    elif 'gfx/debug' in filedir:
+        if name == 'color_test':
+            args['width'] = 176
+
     elif 'gfx/font' in filedir:
         if name == 'font_inversed':
             args['width'] = 128
@@ -179,6 +183,11 @@ def filepath_rules(filepath):
         elif name == 'pokegear':
             args['width'] = 128
 
+    elif 'gfx/mystery_gift' in filedir:
+        if name == 'mystery_gift':
+            args['width'] = 128
+            args['rows'] = [(0, 15), (0, 15), (0, 2)]
+
     elif 'gfx/sgb' in filedir:
         args['width'] = 128
         args['pal_file'] = os.path.join(filedir, name + '.pal')
@@ -201,8 +210,13 @@ def filepath_rules(filepath):
         else:
             args['width'] = 16
 
+
     elif 'gfx/tilesets' in filedir:
-        args['width'] = 128
+        if filedir in ['gfx/tilesets/flower', 'gfx/tilesets/lava', 'gfx/tilesets/tower-pillar', 'gfx/tilesets/water', 'gfx/tilesets/whirlpool']:
+            args['width'] = 8
+        else:
+            args['width'] = 128
+            args['tileset'] = True
 
     elif 'gfx/trainer_card' in filedir:
         if name in ['badges', 'trainer_card']:
@@ -236,9 +250,6 @@ def filepath_rules(filepath):
     elif os.path.join(filedir, name) in pics:
         args['pic'] = True
 
-    elif filedir == 'gfx/tilesets':
-        args['tileset'] = True
-
     if args.get('pal_file'):
         if os.path.exists(args['pal_file']):
             args['palout'] = args['pal_file']