From 77df64ba9c5dff5dcafad6545eefa6cd614c66b3 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 27 Jun 2020 17:22:33 -0400
Subject: [PATCH] Fix the slot machine tilemap, and adjust the slot graphics

---
 Makefile                   |   3 +++
 gfx/slots/blue_slots_1.png | Bin 459 -> 469 bytes
 gfx/slots/red_slots_1.png  | Bin 471 -> 470 bytes
 gfx/slots/slots.tilemap    | Bin 236 -> 240 bytes
 4 files changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 2b077082..5daa6a74 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,9 @@ gfx/intro_credits/red_nidorino_3.2bpp: $(RGBGFX) += -h
 
 gfx/intro_credits/the_end.2bpp: tools/gfx += --interleave --png=$<
 
+gfx/slots/red_slots_1.2bpp: tools/gfx += --trim-whitespace
+gfx/slots/blue_slots_1.2bpp: tools/gfx += --trim-whitespace
+
 gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace
 
 gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates
diff --git a/gfx/slots/blue_slots_1.png b/gfx/slots/blue_slots_1.png
index 41ebfdea4e2667eb9b75fcf2b1676a0ed4509b32..ea4cf0bddd2f0d2ccc9f9263fa8c892950509996 100644
GIT binary patch
literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq004jh000;Q00000UC^?a0004;Nkl<Zc-nQ6
zziI+O5XML4niwJm?hzzvl?M>?(8?k?;*Lt1ZG8brbtnlo>Fw1JkhRg;CKfjKVj3~E
z#bJuWCbF5iix3iTV7Wj0<NM~@S?E?>7f;lUQWHeT0pfJ}ce4NxsVFrE$T5Ie+k3ht
zTg!u#O}Sd@TdhCEc4TUu*b$(VtgSs~BXRF+n$CXhRJNlz14^}{z5)UIH^7?=wWCUb
zQUpABzQUokS{?zmN$j)^dLZAHl;}CDrCfRrH^_}riva&K93xW59WBJCH^i3({hnOC
zlO)wgw|aqC?jxE=pNVsT7(vAu1Bz;#s>c!UI=1LopmqL>7ou%2Ko1m|hKVT5@?}3w
zDZpRs=>zmSjJC6akn&@12%NQd#$f|MMB8jk24pfA^ntU+7Fv_C4-7MnEZcC4BK>Ue
zI3T|OD9!@FPSp)oEB9aTX=)@!?Zy0%0Wj`X;{lMW)2<03c5U!sm6G~ofdDZ0%2-wi
zz%s008)1MQ!Qj$`0hax9=|U|Ert9)4gaAC8>D0190WQ}qCBuMkNQ|{&ox*vO00000
LNkvXXu0mjfqoU99

literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq000O800Afh000003J>>m0004!Nkl<Zc-nQ7
zu};EJ6ox+`UDRka=_3%q$p;`&q7wrWZGpIS<pqpWBhj$9vjfJ2)J0|&9bDWEE(B)=
zqXS`q)N@L04dBg}lXL(3pL@@}X=#+O?HJF~`1r`@r^ZN`qddkb2V79@#rnvnKceq5
z3Sy*RI=F)n$z%Nu$Bv2gsl(V+rk9M|Sa;4D1oYmNSnuJEL!3Xl^w4)hqJ0kF*ynVJ
z6>#cN2=2%V{x|n8+?$H`g4fk0F@(;c7D~B3OIHmur<6#cl+X5;;rse-wFH}AWV7%E
zSxsarqAZC4{`XI~eqwW-{fVyr=Wni(d}aSt<E_M}<^I1E4Gy0vbQMWtI%n8<Uyf|J
zl-Y515$VfH(8*9t@z4l$LsXlZNp+WsL1~ST1`jE$44s6QXkl<}X@kldRg>DTmKY12
zTP7!U@~s$|iWnL0&PY{)J6hzo$zO5O#!6!!=s~7UJx41|vqQVZjX|JdC9(MJB&UhA
zEn`m%h8k96L-}URP>+6%xw!bwxg1AZiX;o~`~&R%1`<Za^IQM`002ovPDHLkV1nIH
B*3|$2

diff --git a/gfx/slots/red_slots_1.png b/gfx/slots/red_slots_1.png
index 785c74f98dfcf807402818d4b8f8f39b40f6b277..b27d5801b08d69d07106a89bd635173bfa56503a 100644
GIT binary patch
literal 470
zcmV;{0V)28P)<h;3K|Lk000e1NJLTq004jh000;Q00000UC^?a0004<Nkl<Zc-no@
zK}!Nr5C`zd@)Tr2?;}X&N7&0Idg`D{yJOPjUHbyjX)z)%-TeRsfjk85Y+$i@?j&}R
zI(HBw79p%@X15^7ZD3g*@3-^j{}!6n$pjaaWlS590zmBb{_O57MF1cWfVe*ksjln8
z53P^%XiT0xS7l?aiKZC_#_0WV=s#(k`A<jwZ0x%)oq+&j`kzq;2J{=qrl9_(F<=aX
z<1p&*Q6CL|fE+W;5XCd_xpl2E^hZNI4E-np56U9~EXeR3kwaz>xx)>=+7@E@dh3x}
zay>VzYlyoSf_OQ71DM;0#XA9ptDCK@BJMSCQy~!DF3W@Hqy_K`z3oGV=qc~?3^|2-
z#T#4^0Kiu2Brof|^GgMiwev1vW8kGul%PU^L2sf!vd%3c?i_*E_F-O*$>n%VqK5nq
zxU~R^cQJ6XwX}50x2_H<cF+I{5a&_I7<8M})fi-Jl?QtOE|HQEOB=MXz_X_)pioEv
z&dy3&fRj!Dm38+uzJ&zf-e(5?0uMmNw~zqj=Mc%gB>*X+(nb>a0-oE=^E3!l)c^nh
M07*qoM6N<$f)G5><NyEw

literal 471
zcmV;|0Vw{7P)<h;3K|Lk000e1NJLTq000O800Afh000003J>>m0004=Nkl<Zc-nQ6
z!AcuZ6ox--XC*WidLJQF^9b2QX;&^xNaiM?o7wsTrK>@aX48EhpoKyRg1SzjmNDzD
zB;5qN?jl4a1d8_doSQKtI$k~wXZ~~kJBKqvw~4hG{l3P*fXPJTQh7jYPSo;zpf$?$
znPWU-?3nqu)b}Ie%M{5o{esA5EcM%nd92*-GmA4lde5b2bfIMWh<Kh7-P2`;ah#If
zvqe~;@rT{MQuc_xV!1IK59yzJj+8}p(J2-&ie1;@tBX#th;ilarE;9py?y`3v_O*J
z3b;fQc@$Af(je!_{)BG@rq`T3OG~-^$A7sgb5_=PB(aj;f1g^wn;-0+Dw4?KgNE0?
z@{tR3k)wY|4Vf!krMF3~$VoTV15qsphP@K)faV&%yPOmWH|edaMUDQw%@?%S*fSiI
z)Dqa7;kUQh*r3!?c0N<@5Spy|^&Q2w&tDN9QvXDKz>cF@q54yGWBF+LVwf0QhonPg
zNW<wjt!+_Vr*Tf`$JPxSrk3XcjVlU6Fn9VBdw9HOnfC2VMUqE*{tr*^9-}U1p)UXc
N002ovPDHLkV1gFp;v4_~

diff --git a/gfx/slots/slots.tilemap b/gfx/slots/slots.tilemap
index 8af0cdd36fdc1ad84f932c09a0cc42cc5779ca38..68807bbd1fddd7b0958913834ba0950ff32aae4b 100644
GIT binary patch
delta 26
acmaFE_<?bPKO^r%e{~>H1|q<$BN_m2mIto@

delta 18
Xcmeys_=a(U|HJ_Gi52P~@`MHeN?r$l