From 173c5923cbdfc23559103c43dc076322580fb435 Mon Sep 17 00:00:00 2001
From: golem galvanize <golemgalvanize@github.com>
Date: Wed, 17 Jan 2018 19:19:47 -0500
Subject: [PATCH] clean up reel_time_gfx

---
 data/slot_machine.s                              |   2 +-
 .../slot_machine/reel_pikachu_and_machine.png    | Bin 3051 -> 0 bytes
 graphics/slot_machine/reel_time_machine.png      | Bin 0 -> 954 bytes
 graphics/slot_machine/reel_time_pikachu.png      | Bin 0 -> 2210 bytes
 graphics_file_rules.mk                           |   5 +++++
 5 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100755 graphics/slot_machine/reel_pikachu_and_machine.png
 create mode 100755 graphics/slot_machine/reel_time_machine.png
 create mode 100755 graphics/slot_machine/reel_time_pikachu.png

diff --git a/data/slot_machine.s b/data/slot_machine.s
index b09ee25c0..a3db540fa 100644
--- a/data/slot_machine.s
+++ b/data/slot_machine.s
@@ -1349,7 +1349,7 @@ gUnknown_085A8544:: @ 85A8544
 	null_obj_pal
 
 gUnknown_085A858C:: @ 85A858C
-	.incbin "graphics/slot_machine/reel_pikachu_and_machine.4bpp.lz"
+	.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz"
 
 gUnknown_085A96E0:: @ 85A96E0
 	@if anyone knows what this tilemap is please do share
diff --git a/graphics/slot_machine/reel_pikachu_and_machine.png b/graphics/slot_machine/reel_pikachu_and_machine.png
deleted file mode 100755
index ddbd332eecd22fd2083ad3b8a161b365863a6453..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3051
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

diff --git a/graphics/slot_machine/reel_time_machine.png b/graphics/slot_machine/reel_time_machine.png
new file mode 100755
index 0000000000000000000000000000000000000000..59279ccef32d1d6172c424825dba77cef8e66226
GIT binary patch
literal 954
zcmV;r14aCaP)<h;3K|Lk000e1NJLTq002M$003|V0{{R3Ts><*0000mP)t-stgOZV
z|NsC0#rEz1y_^7IN&x?AQoTw+i#ahl?yLZ;lmKc${{a7#l$=^xYAGo}w!)-E0009;
zNkl<ZNQu3czfaph6vr)9o{)%GDs|}Mv|~ZSVM2ldM{Ll>+}bP^43*lg@y5#9G4L1E
z44uJ4{)YYmjw^Nc1!0KVqWJZl?YsDV7n=&&Cy`(8!}mSko!{4nfnhHQgU7>x!v*n(
zB_6AX%>ekn2BSn%;^Oo?DbS%mQi09S#m|U7%UQXH_d^8o+84vq^QqFq=9g2ha5?m4
zg&gpG0r)y#`_exzfIHt0)E*A+f?%3|`WOTw%{pv@SO);zI@oc-fvrfl7x7A15L@4#
zN1DC(5Ch)?8cn4hoGeh`CjYdD3hccC?8V>|L8BWDP@~Y;0}GQ#0RV;^J<D2`58Rb3
zU|H>Ud!EG(s=ykExV1YP04U{OAkhHrG!DPl0KN4z918_k1>6^DI1vErv8u3<j-d{4
z?*T-0fN6Kri2!bO04V`UBhb+T@F2kLlmS-*Y?J}J5pZ+>+#fJi02i_ZJkbH<uK;!t
zL<bbXmVr1oGO$0-11>|?kpWk}Wf}oT1*~#tfSyL-X9KX?0PGIx0dL?*z#G|V1_N(!
z(g1iT(u7fgV|fB80Lb^9(Sk}C|0aHat<SgMm*{LMP`emG2|$m%ssa}!V2OEb6}TLp
zoe5y50hkpEfO)LaBU+*8k$J4rCCrz%#XPo}Uq+Xi*9!vWDhwLUe`{%W<1H$n({NbH
zn--0(@yHYM+Az@GlnT97RLJg%mxL_GN(FSJT!F=ExnC}jWw>Y2=$3cG1*B7-ySzlW
z+0z5Y_y;rp7^=4D+Wq`2jwwxazIosf0TfRkl^Nx90d0}e8Kska##H9yfzwCVn=lE`
z0;bcSvCLXJ5zf0W17rqaNUu|d<&Gl(IE!ZxVJ;OFG=Tjo497x%^c4WGKI?%A;LcZl
z6EXn*m;mNwfegs%#}S*OihyZzV3JknRt0(%ff-vUyp$xn2>Ddvc_Fh1QkuzVmI2QL
z=}Y5Y@ryFxvdaLFfi7{gJ?4Iauc{re-uNiSM+g<b{0@6>Bap~l3cp}L<`)$}4D-xS
zvJ#y#V3r=@STC%}#DRstj*Y;(<Ew=L*6^m1p_nTxPvvRuO=}J1Xy6^`{9^E_-Y<?y
cz<>3NKWgrfDf9owGXMYp07*qoM6N<$f_Ig;6aWAK

literal 0
HcmV?d00001

diff --git a/graphics/slot_machine/reel_time_pikachu.png b/graphics/slot_machine/reel_time_pikachu.png
new file mode 100755
index 0000000000000000000000000000000000000000..29b004c84ca8ce20efbf5d4158ca76bd59548456
GIT binary patch
literal 2210
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

literal 0
HcmV?d00001

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 250916022..f6724f685 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -16,6 +16,7 @@ rayquazadir := graphics/rayquaza_scene
 roulettegfxdir := graphics/roulette
 pknvdir := graphics/pokenav/
 pknvoptionsdir := graphics/pokenav/options
+slotmachinedir := graphics/slot_machine
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
@@ -464,6 +465,10 @@ $(bttransgfxdir)/frontier_square_4.4bpp: $(bttransgfxdir)/frontier_squares_blank
                                          $(bttransgfxdir)/frontier_squares_4.4bpp
 	@cat $^ >$@
 
+$(slotmachinedir)/reel_time_gfx.4bpp: $(slotmachinedir)/reel_time_pikachu.4bpp \
+										 $(slotmachinedir)/reel_time_machine.4bpp
+	@cat $^ >$@
+
 $(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp \
                                 $(pknvoptionsdir)/condition.4bpp \
                                 $(pknvoptionsdir)/match_call.4bpp \