From c529c4be6966440ed02a168abfe62e69422fd73a Mon Sep 17 00:00:00 2001
From: MeirGavish <meir.gavish@gmail.com>
Date: Tue, 7 Oct 2025 21:26:43 +0300
Subject: [PATCH] Added art for jokers Abstract Joker by @MathisMartin31 and
 Bull by @NoWhammies10 and @GreenNinja2525

---
 graphics/joker_gfx16.grit     |   1 +
 graphics/joker_gfx16.png      | Bin 0 -> 1230 bytes
 include/def_joker_gfx_table.h |   3 ++-
 include/joker_gfx.h           |   1 +
 source/joker_effects.c        |   4 ++--
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 graphics/joker_gfx16.grit
 create mode 100644 graphics/joker_gfx16.png

diff --git a/graphics/joker_gfx16.grit b/graphics/joker_gfx16.grit
new file mode 100644
index 0000000..a8ac3f6
--- /dev/null
+++ b/graphics/joker_gfx16.grit
@@ -0,0 +1 @@
+-gB4 -Mw4 -Mh4 -m! -pn 16
\ No newline at end of file
diff --git a/graphics/joker_gfx16.png b/graphics/joker_gfx16.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed5ae2a1b6606ee1f7d92e81c99f56a9d433fbda
GIT binary patch
literal 1230
zcmV;<1Tp)GP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(000D)Nkl<ZXo2Nf
zL1-IC6n(pLeCj2Uu_2YH0uEHh=hQuf1OmMktEMi*#k5oc>rf~ZpNw;AatPE1U4mLx
zhoD1CMU6skfl%3p;-pujJv34ZZUqueb@HL6JKMu}R<pA+v%6ZWG4z43cjnLhd2i<b
znVmHtLF=IH%F2`C=F)-@X45)o1HeT512AqbE%*wiBm-~(;Kn=oK<h%OjNO0!@|7L+
z`}pF`JepQj>v`{)jn+ZijUa;3e-i9HvsvFh|EA3NtjVkT)Y%e3P$-qXUs9<2O9eO&
zFijJ?-#!2UPv9s*#1$)%0NJ@YRQ|A)PLs}@X^w_hD3!6ho!9mm#U|h*s$tWrVrA-5
zpj;(FQu3<yDuRrBT*O)dDiKt+QF4Q>eW6tL`e<5JtlYH$1V!M<uiUj``JH$UNRq^O
zB2i~}Vj;i}ieCkBc7kysk{4&0UmZX^5n>6T>h#gO4+3RIjlif8JbHWkOvO<xaZ!Y*
zh@AsS-N5dRZ@jYHhd%+Jgh|~1sT+7vy%KvMQSn-nAgR+sRQEUs07zZ`o>mNd^tpc&
z+IAd-E%C4r(IK(`BKhvpFSO#6yeGnmgR2)h^m*8WGnWOa8!*?$Ki)I4Oa%6qPq4DO
zC<wd@$Q(DVD$I2kMvVX$01SKh^^NOriza{!0KoYAciL#!11?^MGnWNG1)+BF!Tc}e
zN3*;A<LJ3<+rE0fP8`1qu|~!dnJ>TeVjciqeDJqd=S-*2J<fTn#S<q63Z*h;(rNFx
zZQH&dK*{oAi1h$4lTK?_gLVZl<@oq@rU4wT0{8(ddmGelo!0&K^kZb#_R&4g(J(jz
z@FIwU@Z|ZrKVQ8H*sGuwfDuofIJ98cgLC*Lj{1GP1u9Ud(?O?0$ujcu<(EK>cx~Lx
z42&8<YcX^@9@t5c5n9OSeKS8hI~xcA{+V9|u|t3@?bL}gA};|W4ggc1e+Gbt20+8b
zEt($raUdS2n^qMw>9jHgX42_^eb{aw6~IS)*n?X%;Y_D!V!PEqc5NTz(~kg9;#Yp2
zM|N%BOO)&fj2Hhh3<d*i?Nnghzo)dZ?%%`KP6dO(AacL@BzU@f`7N+}oTK90YIwu}
zjCKjGEdb!+<;a6kp=njUxZc{S1eQ3<2U|N805oKhp93W10lLJ+Z7p@;jL4tv|BSd>
zG)H9#!Dd!WdVE;KnSDT&1O@V`{t?{GjL*b(u#qG@UL@A`^j_{<K`KBPc?LG?BeFsA
z=N(c3qL2q5B|0hc{I)3O0JcpI27_4f4=4m+FEu*yuNz;je&T!n?(q3o{Ya<F-ORw<
z%ml8bWzXVYoqbZU-Qf1(H8dVS@yZ*IpWyc5HQ($LLVROWLAzf0`#7;IO1r4`I;h?u
zSKoh6`agqdn%<qFP6VX@QD=?6xCDZP#rn7qZxNbS6?YmB19o>B50!p&{*~_nD&@p7
z@%C1H1r_Vh0<2GV7SJU=LWuACLMU1XZFf?L^3gSp|K;L_yIkDR)-4w|T*q;g{sZ?^
sx{sqtzz#uSA4mUd|I)$ypFWTO3*iiB4+y;$0000007*qoM6N<$g2+ouKL7v#

literal 0
HcmV?d00001

diff --git a/include/def_joker_gfx_table.h b/include/def_joker_gfx_table.h
index dd1e762..796940f 100644
--- a/include/def_joker_gfx_table.h
+++ b/include/def_joker_gfx_table.h
@@ -13,4 +13,5 @@ DEF_JOKER_GFX(11)
 DEF_JOKER_GFX(12)
 DEF_JOKER_GFX(13)
 DEF_JOKER_GFX(14)
-DEF_JOKER_GFX(15)
\ No newline at end of file
+DEF_JOKER_GFX(15)
+DEF_JOKER_GFX(16)
\ No newline at end of file
diff --git a/include/joker_gfx.h b/include/joker_gfx.h
index f1202ba..bab5633 100644
--- a/include/joker_gfx.h
+++ b/include/joker_gfx.h
@@ -17,5 +17,6 @@
 #include "joker_gfx13.h"
 #include "joker_gfx14.h"
 #include "joker_gfx15.h"
+#include "joker_gfx16.h"
 
 #endif
\ No newline at end of file
diff --git a/source/joker_effects.c b/source/joker_effects.c
index 84d36f2..3f1bb9e 100644
--- a/source/joker_effects.c
+++ b/source/joker_effects.c
@@ -641,12 +641,12 @@ const JokerInfo joker_registry[] = {
     { COMMON_JOKER, 4, smiley_face_joker_effect },      // 29
     { COMMON_JOKER, 5, raised_fist_joker_effect },      // 30
     { COMMON_JOKER, 6, reserved_parking_joker_effect }, // 31
+    { COMMON_JOKER, 4, abstract_joker_effect },         // 32
+    { UNCOMMON_JOKER, 6, bull_joker_effect},            // 33
 
     // The following jokers don't have sprites yet, 
     // uncomment them when their sprites are added.
 #if 0
-    { COMMON_JOKER, 4, abstract_joker_effect },
-    { UNCOMMON_JOKER, 6, bull_joker_effect},
     { RARE_JOKER, 8, the_duo_joker_effect},
     { RARE_JOKER, 8, the_trio_joker_effect},
     { RARE_JOKER, 8, the_family_joker_effect},