From 2d50005e307eeb5085e580b16294bfb219a73ecd Mon Sep 17 00:00:00 2001
From: MeirGavish <meir.gavish@gmail.com>
Date: Fri, 22 Aug 2025 19:43:27 +0300
Subject: [PATCH] Added art for Scary Face and Smiley Face by @GreenNinja2525
 and enabled them in code

---
 graphics/joker_gfx14.grit |   1 +
 graphics/joker_gfx14.png  | Bin 0 -> 1185 bytes
 include/joker_gfx.h       |   1 +
 source/joker.c            |   2 ++
 source/joker_effects.c    |   7 +++----
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 graphics/joker_gfx14.grit
 create mode 100644 graphics/joker_gfx14.png

diff --git a/graphics/joker_gfx14.grit b/graphics/joker_gfx14.grit
new file mode 100644
index 0000000..a8ac3f6
--- /dev/null
+++ b/graphics/joker_gfx14.grit
@@ -0,0 +1 @@
+-gB4 -Mw4 -Mh4 -m! -pn 16
\ No newline at end of file
diff --git a/graphics/joker_gfx14.png b/graphics/joker_gfx14.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1b6bcd6803bf8890e9f8dbc5cddac35a98befd6
GIT binary patch
literal 1185
zcmV;S1YY}zP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(000DNNkl<ZXo2Nf
zziZn-6#nvqZcf}_JaiH9STOQv=+F+$R&Y6zDUhKw9<r3;{uv3SO9r`9p<6g&D4~!H
z%}~e~Vd&`KrGqhvV=o;Nw}bL7r_-HulASit4}zo9olf6--+S-wGy@I3o&5N%Yo8R)
zs*h)E`u)xMBMmh9`{swKPX2cDjqxRP^FJ-_z(3`p-I>dwdp#1r0N_@bxKDlE3KRc3
zb2$J&_j-iEqwm`JwFV&a+}joHtiEN#GZt?*-&h&oX>kVtFm^oA-fk5Hd6}dRWEi=R
zTVXivH6ruR#=Q)Yo(B0e@J~7XQ;v440082b$Pe0wA@7^UyA>w>Oa_~`c_Dsv4mQ7(
zibR$%HXvfM<f&cPmk=l*`aGioLh{c*WD@djg`r&Q8}G%*pZcgUjWHU4)wjUCT_Jyd
zbsjsZj5K|9Ao-VTeIb97<W(iugoupT5RhY^%`aKWdYaOg$*ZJfg^U5rcIyD5Ap+c1
zgMnras~kYEAvP`Yrq~`k9?FgvNzB{}+S{#yR_;_fRirY&-%<d1P|o0Pg<&ia-)|g*
z#=N9Z^=`ukKxo~dgS7$D=733zKpvDmN#s@H1Zsa--vamg7=Bp>VD>yAb{+7qpeC?#
ztshHX#(v`ftiFYX7iVJSNI5_UYX#VPblSCFM}ByD0RUK7e5k$NZyZFFU_xdE$RROl
z*-ML8%{6R%To>0HAJ_4!xu)&gy&lDeL978x#MBt45}EcnCitfu&Ri~)^i@zOlxuxB
zy&RmLJ`Cd50SYl9t&_P)`dJd9GnYf&S;5$F|7zxeRU4sO%vc48e3FOd{_=w9u0lgq
zL>7e*;&+2Lo>PhNtMf#1laS9lEATtFC6JQb>h|-*vDAmg0DxO!a7+57abgZ&^GhK^
zB&k9jlcg#U`F5)S?(K?%xA*QS)(ETH&$0LJ2tbe+xwnhic0G2k#4@OoB;q=mn{q~0
zxFsg?!0_?{3yTk9jX>mO?<XPA0BTH|%AZVLHBJ^oxFv?c$sxL(0=U-)s{@~2e-=hC
zVR(5F@xBPBM~z5-s~n(fQ}4;rmyI?N`J3!5hr;mkLhE5_C-U-sAP%WELj+y?Pc!Qe
zP7XuYPA`XHa~a$_1G@?7Pp?0R`cR%A@?=B+aH~NAJpL7(%PI%RUetM3O^(!-6{fl!
zC?PlpU`lSI6D-y9`D##6OjRIN4p8G<?jyHNx*MdIrP!4XLf++`7aBvvon8*z;wT_p
zW#Sorho{d01a;Y~LQRYzbx3E6(*Q|(*jz@tRlsb!j$w0I7_D0zg$!sqTO?Q+AZg=c
zG7z09rZs}!;TW78iZ#4RzB-VB+!7OKisf2A+d_z-BPeHlUBA%yJNT}UudV<Hj74#-
zy9R>rkgsLj%L5S^`Ra=BD0z{{%U)GIY^$0(GXTjxYYvFp!4XuiQpornj&V6il1ba)
zd;4)T|MQ8}bJdEWgVW2wuYA?cuYH;S>GSv>&JW0?W?xc+00000NkvXXu0mjflVURm

literal 0
HcmV?d00001

diff --git a/include/joker_gfx.h b/include/joker_gfx.h
index ce1c916..bcb1ad2 100644
--- a/include/joker_gfx.h
+++ b/include/joker_gfx.h
@@ -15,5 +15,6 @@
 #include "joker_gfx11.h"
 #include "joker_gfx12.h"
 #include "joker_gfx13.h"
+#include "joker_gfx14.h"
 
 #endif
\ No newline at end of file
diff --git a/source/joker.c b/source/joker.c
index 6ec320b..d8665ea 100644
--- a/source/joker.c
+++ b/source/joker.c
@@ -132,6 +132,7 @@ void joker_init()
     joker_gfxTiles[11] = joker_gfx11Tiles;
     joker_gfxTiles[12] = joker_gfx12Tiles;
     joker_gfxTiles[13] = joker_gfx13Tiles;
+    joker_gfxTiles[14] = joker_gfx14Tiles;
 
     joker_gfxPal[0] = joker_gfx0Pal;
     joker_gfxPal[1] = joker_gfx1Pal;
@@ -147,6 +148,7 @@ void joker_init()
     joker_gfxPal[11] = joker_gfx11Pal;
     joker_gfxPal[12] = joker_gfx12Pal;
     joker_gfxPal[13] = joker_gfx13Pal;
+    joker_gfxPal[14] = joker_gfx14Pal;
 
     for (int i = 0; i < num_spritesheets; i++)
     {
diff --git a/source/joker_effects.c b/source/joker_effects.c
index 155c850..1382ea2 100644
--- a/source/joker_effects.c
+++ b/source/joker_effects.c
@@ -382,7 +382,6 @@ static JokerEffect scholar_joker_effect(Joker *joker, Card *scored_card) {
     return effect;
 }
 
-__attribute__((unused))
 static JokerEffect scary_face_joker_effect(Joker *joker, Card *scored_card) {
     JokerEffect effect = {0};
     if (scored_card == NULL)
@@ -422,7 +421,6 @@ static JokerEffect bull_joker_effect(Joker *joker, Card *scored_card) {
     return effect;
 }
 
-__attribute__((unused))
 static JokerEffect smiley_face_joker_effect(Joker *joker, Card *scored_card) {
     JokerEffect effect = {0};
     if (scored_card == NULL)
@@ -505,16 +503,17 @@ const JokerInfo joker_registry[] = {
     { COMMON_JOKER, 4, scholar_joker_effect },          // 26
     { COMMON_JOKER, 4, business_card_joker_effect },    // 27
     // Business card should be paired with Shortcut for palette optimization when it's added
+    { COMMON_JOKER, 4, scary_face_joker_effect },       // 28
+    { COMMON_JOKER, 4, smiley_face_joker_effect },      // 29
 
     // The following jokers don't have sprites yet, 
     // uncomment them when their sprites are added.
 #if 0
     { COMMON_JOKER, 5, raised_fist_joker_effect },
     { COMMON_JOKER, 6, reserved_parking_joker_effect },
-    { COMMON_JOKER, 4, scary_face_joker_effect },
+
     { COMMON_JOKER, 4, abstract_joker_effect },
     { UNCOMMON_JOKER, 6, bull_joker_effect},
-    { COMMON_JOKER, 4, smiley_face_joker_effect },
 #endif
 };