From 28043bd7cad16827b54aceedab5dfc4013164a49 Mon Sep 17 00:00:00 2001
From: MeirGavish <meir.gavish@gmail.com>
Date: Wed, 12 Nov 2025 14:11:16 +0200
Subject: [PATCH] Integrated Photograph joker art by @MathisMartin31

---
 graphics/joker_gfx25.grit     |   1 +
 graphics/joker_gfx25.png      | Bin 0 -> 657 bytes
 graphics/joker_gfx8.png       | Bin 1085 -> 1360 bytes
 graphics/joker_gfx9.png       | Bin 961 -> 1041 bytes
 include/def_joker_gfx_table.h |   3 ++-
 include/joker_gfx.h           |   1 +
 source/joker_effects.c        |  17 +++++++++--------
 7 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 graphics/joker_gfx25.grit
 create mode 100644 graphics/joker_gfx25.png

diff --git a/graphics/joker_gfx25.grit b/graphics/joker_gfx25.grit
new file mode 100644
index 0000000..a8ac3f6
--- /dev/null
+++ b/graphics/joker_gfx25.grit
@@ -0,0 +1 @@
+-gB4 -Mw4 -Mh4 -m! -pn 16
\ No newline at end of file
diff --git a/graphics/joker_gfx25.png b/graphics/joker_gfx25.png
new file mode 100644
index 0000000000000000000000000000000000000000..104deeeeab34fcceb8cc99bb0482ec1cbfd2d843
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00075Nkl<ZXo2OK
z&ui0Q9L7JZB7}kd0fOLI5T$tWB7woKf`}&>o+fyhAiX4#qj(%9mr^i?L3a|_X?XEk
zC<M<UlM$(Z#Rv$S9@;m3)4a{nrYU*5=k(@HntY$9-(T<huAxBh`^i7md|7Niey~=>
zd&?kWkRZSH>3!zmYg=FD{!p)Z3e-=8>#9jXzHxYz%w6ohDD|Q3pZ5|G>V!t#O+mUW
z`8q@C0Ry+2j5nq0h!_AfG^)33Nl*&l_%_D}0ncCWaeNTq_;%`kWc$Es2%$`Zw{PA7
zVDtVuzki)&ek26(Y=0&Zdd*WklHkVvD*!Hl4QXCf0pS6TZxhWZLfw#?1gF6a4b0HM
zv;Cn6R=jAtmWH_m5Lg8fN(lh^i%?ns&|8Fs2%s~rya38FsKUVQCY_*wT>i|^AQEAq
zQE5~P@buQB)OCCBZKfN9VLu>x27rMzZlTZnJDKPE%@1=MS{0N6e0%sV8An!(<J)+n
z=0}F(+jwp_C4z3q%>gp`R?q>4q+3CUR?tZ@zr1+T4TY1S2m{adxpDTVN}HC7sRGFV
z{$xV?yM8w%$jXJllOG>*uUCaU<dnfy(4jqw@%G3IM45x}QuusnrdET(eE^JWy%@_F
zxLqy1VkQAVy$hr(dAOts$fYi_;><!PvSO{tLjezva{-KZgCM;%HjRAa@Tk_i%7sEe
zhybKoV$mI5M!wD>6wU!6_GJ$+Lqpl~Pol2mVL?eyXH>QyAdc1K<Fz_M=>hJ`XY7Ce
rTI$7<Zr^`XzojrJ4o2W=9gqJ9(l7-Sf1(4~00000NkvXXu0mjf-hDNk

literal 0
HcmV?d00001

diff --git a/graphics/joker_gfx8.png b/graphics/joker_gfx8.png
index eaf2fbc34386ff29d34e3e8d298da2cb256cf637..4908967cd46dce9101dbd1952b298d47a019b218 100644
GIT binary patch
delta 1342
zcmV-E1;P5g2+#_UBYy=KNkl<ZXo2OKPiP!f9LGPi5d&dW($uVINT9aWq&XC}Z5FI1
z;KhTG;6d0@gle@xA*B>T+5`_0>QbnMl9X6Oa%kFH+7LWQ!LqFg8=8U#yCF(K6ZX(e
zjj`++Sz+gS*uLk??EKq5k$_)VX7)F~_ul-zzd!HIdm1)~Cx4Q{PF^XxB5m4M^jisv
zUPv0>+0k0nf$q#L0Nam*XY7QX9j)lP&U>GHs$@5=Tz2f_hkJ_vym|1oqGy3XK=mm}
z@PZIRWY?AnHttfg?Ao%rH_A(arfJ^f#}i2*k<aHv_eUqxz1`24F2=TY@RM3X2$4xI
znc8L2OGUDBVSgRZHUcE1_iU&nplRHhTQG%mSENmgCz3)&f@6CZNY9Uc_&ER@!4LrT
z*>sU^XXCT#{?6LpuKj*C@rAA2@eO;9_u9%e2jeBWB5j&XiAv$u_*^>cXrLDyBVcBH
zjGp7Y%#4qr>pEH>z+FQQI~6ly1e61r-)_d+K}JleaDPpKnej285Xw#-x5AnR<v<oZ
zqw(*btp{LpeU;4329thmC`crorFk%<biV!iIbUP>N>abZOH`5uPR4Jpud=zms${uz
z*7U0l1x-5dp2+wb&y#>sjhE<(v}t~)Ju9r!+>5(UarN4605Ufl$fdJ{Cu62xE}d18
zarN46T7Nn&`WnlXfO3tOD2D{A@f*Pq!+oOwiiDlLIacOQDV>$MQ|#=`kxOTl&T!wT
zsv~YFeV*C|Xz93Ussovu4Zb~Yg(Cr#dS9ZFRIu}4du+&bHQt9OW4`(@!f_Vp>}VyP
zND5ii!T&nms2@)xMYX>xejXUMl^aR%3)d8oB!84+KqYO#*>l5vqoyb@-pg813S8F#
z0B;?7z2r_Ms_psb54{7x=`;7Z5F1jF&>kD&^qG6KJbk{GpDZn3a_rNS010DCxaq|c
zNl^)DMjSX)c=2D@4?rrlLH>!LW#10^WAmJU>iz!MJT3cnu=3z{YF^Nwsi0p>L@_)G
z(0>qs^V;8vYURDr_*7~GKp8KIxHPq-<S8~32`LKtH0}2!!Fw9i{4awgDyjTdL?g2_
zHPw@UA~^DB8i4Zy2e|O%LHdrq3c!&^(*+Vz8|uEPsh((L*0cX@xe}BJM+!^Z?mZ*)
z^;`$wjqkq!;Qp}z022ux{PCT-k49$MTz_9B99gyL`Cn|im7o)T8>^)@6y(RZKQ_tl
z9~&S%8KX871W;G`P2fd>uW7K{m#(B1NblD*G*j2mO!Huf+wD>1@$h6!882sp+wD<q
zw@0ZB1ywu1^buu+YZ0tQ1e8mH(St_Fuf>O7U025E(pdodVg+(8O-1Qm9|54Qp?}$x
z0N)W1Pb7=>^t@!{7%vT6`1Nqnv+g}3OxzMo+!8F-JZ5_EB#SkVdHC{QgePNU*OpD2
zr%)hpepYuJ&vP2IuIP-*<HHB`Qd3i7k{R{N4Sy>Me=gir&tBn@ZJX)AlLj4_FSqnq
zcXoA$-CbSRg|6!+nGyMXUI-!7u79%B@fzQ_3tX+8V2Mn6skB{TusJ!weu-<91p)!J
zrzo#}5p3L5v?(k5vHrJSo%E;9_1lj1pX>*eVmuU5U}k(wwKKN2_GL$|^}jUU?m%VB
z3D9-t0_22X<1Vsm%gTes!sZnjQb)F#I@iz9v*#U8lWflhtML_Qe5o5(E;pC7vn)j6
z1jky@CESk2+>X%fj>i7?hog>%8(T5hb~7H}ANaHRZoK~sa{vGU07*qoM6N<$f+dTf
ADF6Tf

delta 1065
zcmV+^1lIe|3cU!BBYy-0Nkl<ZXo1yPL1-IC6n!)FkW=cO0*-ucBnZZYWCf;?Xb-s<
z)dXxzv4}~W#7+st^wd*H4!xB)7*bJ-BCrpx0zn90Lu7{#ZQNjdk()~|l}egJF+SyB
z&-NgVJnNm&&d!d~`hh^2-T80l&7c3j{t`$~t2aE^cwA)DDSx7K--qN63~=&{le9{{
z;qEFQ;=knoNOp6^NrEwktGDiS$DaKBNNN1})*Ar8XBR&WT%(kBZSsc*LsWi|hcOn9
zzgBN}9EXR8-j_FScfZR%qPvQ7Wzcc$sQghN<EJ{R20#cXrFg#e#^+Mmbc$@ayI_n3
zcESW<{Hp6w_<xlGjL*&~xCtmB*l>5H=Q*2B5q>1%AdFwc_EHktOG#9xr%-+2V*TY7
z)?aRE@knC;091+vjL*)YQY?Tm20|$|g)^iIX0>|5lf{Cl5cvVWH&mymfcXXBrw0Il
zAxCb5%}j!p$~}2{9s!Yjv$Ny;qncyO14RDu*}1MqY=18a*<pS`Id}iwcfc2qLpgd1
zz@c(?6>N$Cw1v3-ey_dr68z~7`+m3f_VIbSqGdZ&fT)Y--~rJVemOPZALzJ0<`<A#
zUBk%TU5s7%6=Q#-ar^PIw%wirm@b~fwg?<U&JJ>`Ysif{7+d}kf9>sq%}g5E(mDeF
zC!EQ<7=M0!9&CkxtsL#m+r=XAbi#Kp&4*XiN&({TK8GzYs1ytSV{mM-g9E2QOJ&f!
z2U;p)aNx9-U1b`~I7!s%4KJHc5ne$>{WHVo+N|sUUU7g$_h^B6U=VsKPX?s`z>x@1
z>Uh~)Tc{KZolM~1H+Q&O3k*3szy)B$z-DL+xPN@<oPpUkZ2zMJg4tmI-8%s7*kBR}
zwSyqv(Xjh!^@bNmG#%XA$#k>8SNUfcetq89R;U03?KSHL#cVo7Heda2{6Jx-6bncs
z&H{ih3ji>R0pT7%s8J=@kNnTkY_{6&E@T4cnKhA4OeHAd$-zJEyx##Wm67=5V<TH9
zu745~-Ja+DIOr*WZs1eFb{Z6;{11x{t=K$q9)PD4prtaJ&6X8&+8$7=Hv&DiurZq+
zz-A`#cCqM-^s25=EXW$0;+VL&gM)*>m~4(|Q&hy^wTZyk*WcgoZ&MTiJoqa*?iH6W
zo%6MvkMA~bi`m$v<N2PW*=z;uS6{g8Ie(p|Xc)gnArwT$NrDgpA~YwDyE>(`+tZ6J
zLg(D~0&kV&Mx99fAEY0^dwZr>zxl25S|V{4)#)jW+*JqLUi^I*z{dLl6|TSEL$ldJ
zZgtI=zi$F?x4U}lPHYi!qmHld&zqxs;W8ID=I3e5He@N&7Qaq5Q1L5YZs<#<k0O4(
j9)Ga>5DPcIG2;Ih5asD|_Mxz(00000NkvXXu0mjfpZyS~

diff --git a/graphics/joker_gfx9.png b/graphics/joker_gfx9.png
index d220413453e14c79968a237122309c80bfc9f20d..1cb5010b2d519ed4f07d72ba53a40f852292c715 100644
GIT binary patch
delta 1019
zcmV<X0|flR2ayPnB!AdRL_t(&fz??}NE<;E{&wlXljK&>cxdS*^&q8%6fDHno<k54
zLP<a*O0<+3+DoBOETtzQN}#41B%nx}f`s5jFqj@hgNGoc7D4R6MASnGUh1JtdRS+(
zN%m)Uvm5b)u)DL9_szU{e|g~`gWUFBMQ*%V^gq1IvCL~Fe}BUOC3iU;rjmcp|59AU
zRr24Eo9uErKnTI$=(sqxGWSW9faiG-LS)COOu7gy8081hum&xDUQHk+O(){2#5~W#
z6AFv>(vMN-<*$Ec<yW1dB%q$a6AFu0LWuZj7K$6-IMog6;a5}u-4yep7~iu(iJ#**
z@LX*eDa0Ho#D5&f1pLTs=CQi9gVn7aCLY-s00?I135AhP#6buF$McO5QvpixKo6w+
zR3=3x;0MMcz-$x%(Cw6$L56(blPUGJYAu42vu@r@P<~G+ELub%Cdm$C5ykJGPrd;L
zzG-rpW3O_8O>zZ5P{i;>SvYwa9OZj!o=fF(JV~XQWPdBVfE=WLsTP^7z(Si1!x!c1
zz-&~ofUyYNeS#14+Bo3wE0Fc#q))*w>Yz&jE3VIyr`9S!if-pF?!6FlIvMiexF>;*
zi4ZWLUly|hrgB-Jd%Zf4%Zj&;0^XW=ulo(Ggb_D`d2~#KKo)6K61Y#M6X=*gjo<S@
z?TVU70e@4uEY=S9@wVr&=G+fIHvqtNCD5$!fDUB6HJk0UwF5Nb2Z2sTxw<1&bbdzl
zYBf$5oj93JfKR5t2P@!{DRkP}L56&W<S{8AK3Dbq$jD38E1j=Y$TWj=B95bcFHRSo
zV$qWc_)&;CuzUZ9A(_|C0v6hAHP7c~X8?rQV1L94bY%g6%>t~(<gN?pB_Ruu;D(U)
zg2rU&vVfhx#{iU1pS}mIs}s_RIPCT=0FYz?0a|6R91N9fS9$sXP%M@NbI(@OFR2)7
zBI$C0wZnbjw#NGwVCCPR%e)@~Ae_A2pe)@npjDexf?)Q-$r~~Gdgyk6-|IQed#fOg
z@_!$v&B;2t6>#fmzvjKA$a=viQz#Zorii;X7C?r4Vg*QHMzM9RETGfYF5XMiVKcDY
z0?at2`g~7OES4JNXEyV~cP?9UTKvokpc~Y(0I4EqPp@euT>8BlXse7iM`){Fi=QbC
z9xSJD=b4Y$&kvSs7u#%AxH|F*ZiRPtdvq5v0YBVJ%7413@iW%}^_yY^A;i@FpcKOw
zWh@i{_tF=`{FXIEso4#VjyK&RclSAK`u?;zN;fWN;)eNi+k2JV_FlzoP`Os{KY#b$
pFu!bgy>5SxN9SjlevrxW{|DYda8UZYa9IEV002ovPDHLkV1iiq?u-Bc

delta 939
zcmV;c162Hx2*C%CB!7rWL_t(&f#sP&YZE~f$NwEg2p;?d9$FftTD*9u1WP0KB8ZfN
zMT&<CZHc9%l#S#fh~TBTi&%oLwGdB5dML$<6k6O;2o`UmhO!~O`3*`yaP$yoJDZ)^
z?9ObW;t#^k&Q5mr{rA0@w=+Eu;C%S{Q&g`@_VW3jDDAr0e}ABYbv`mQkZ9+-`&H>f
zi25IX@i1`h#PA#C{++=CVgDyZjYozCKq<xe?3`D(vGP2$140NWrNVl4PbNY;nDONG
zx>rZ1CL;Y;M)vbLPXyod$^JkH@r>SFwWT*Egn$r&vFV&w=6^acqjilBL+AkvnE|c!
zW79eB$a{*a0Dtvj*(>*R=PnumfOI9LbYBrt0mi0t!Z+W}C|M}Pp<o%<T(!MtC|HK?
zx@%Yfk`Y2G0RI4#QuGiK95E&6ieMTRYSklbuG*+ok6`{bn85^b4NF^u&=6oApc~6^
z>07!B0H6T+xOz4VFb^nLhPDVDv#gV%r7J0<D=C<U)qfNr(@?%ws0Xyd20I{pX6P2_
zN(wF$LD3Up39vEpk~{nJ0s#6VL>9nwc7U_n#}&?wSG;oPmaknQdo9*O=%OP+Bmqok
z2V3<6Jh*VRZQI9R-UC3_MNlR7NcHs9v(V$eMkE33mE+i7oLLAxviAIdnFRG>8E&TG
z`|+sG3V*Q%L7@4j7iSiv$0WFM=92GxIX55327zWiz;XrvsArB-=pTEx1MT+)9|h`S
z3lPNvba{92zE^fL4HPURkPQOOM93_beImpq))?@y@eP1H{@HaPnLL3vK5v%*G>y*N
zCFJdr=kol=Q(TnNwNAc$87vG;!@{Yf!^G|zD}MyG>IeShTy#Al__v>~q<jP0_tU*T
zL3BbO_85?)kut7-dIDtTrRPZ*4=9Ad;kMJZoCJJ~FX!fc(;V*^y2SQ?-qCE^a;IP^
zFDvuZi)AIR_-j2t2KyA|Q8gY=5TKhLz=we-`*Sl5E#rYMcz|w7%!|Ma!Dfke#`8<-
zB7Y)}0f*ZTdPlQuJ%AU2ttrYDSfi4+OIYTX!5Az%3^SfiO?XEUkp!r%t)qW(B66J9
z*8Hj`krlGIce#`}T}cUZ{#L^F6(V~;t5H#*lqR}9nB<-S(7{Df7W?C~bK3g^DzMmB
z8UuFstJ<5Rt!^K6Ul0I_lQ*%n_ExL^RwTFIyBGWv1_Zmq!2h*9{tHP!;c;>o&<y|p
N002ovPDHLkV1h+%!La}U

diff --git a/include/def_joker_gfx_table.h b/include/def_joker_gfx_table.h
index 5e22226..a71d523 100644
--- a/include/def_joker_gfx_table.h
+++ b/include/def_joker_gfx_table.h
@@ -22,4 +22,5 @@ DEF_JOKER_GFX(20)
 DEF_JOKER_GFX(21)
 DEF_JOKER_GFX(22)
 DEF_JOKER_GFX(23)
-DEF_JOKER_GFX(24)
\ No newline at end of file
+DEF_JOKER_GFX(24)
+DEF_JOKER_GFX(25)
\ No newline at end of file
diff --git a/include/joker_gfx.h b/include/joker_gfx.h
index 7a3f967..69ebb35 100644
--- a/include/joker_gfx.h
+++ b/include/joker_gfx.h
@@ -26,5 +26,6 @@
 #include "joker_gfx22.h"
 #include "joker_gfx23.h"
 #include "joker_gfx24.h"
+#include "joker_gfx25.h"
 
 #endif
\ No newline at end of file
diff --git a/source/joker_effects.c b/source/joker_effects.c
index 48f334b..82053b6 100644
--- a/source/joker_effects.c
+++ b/source/joker_effects.c
@@ -1011,7 +1011,8 @@ static JokerEffect sock_and_buskin_joker_effect(Joker *joker, Card *scored_card,
  * (and put together in the matching spritesheet) to share a color palette.
  * Otherwise the order is similar to the wiki.
  */
-const JokerInfo joker_registry[] = {
+const JokerInfo joker_registry[] = 
+{
     { COMMON_JOKER,    2, default_joker_effect          }, // DEFAULT_JOKER_ID = 0
     { COMMON_JOKER,    5, greedy_joker_effect           }, // GREEDY_JOKER_ID  = 1
     { COMMON_JOKER,    5, lusty_joker_effect            }, // etc...  2
@@ -1029,9 +1030,9 @@ const JokerInfo joker_registry[] = {
     { COMMON_JOKER,    4, crafty_joker_effect           }, // 14
     { COMMON_JOKER,    5, half_joker_effect             }, // 15
     { UNCOMMON_JOKER,  8, joker_stencil_effect          }, // 16
-    { COMMON_JOKER,    5, banner_joker_effect           }, // 17
+    { COMMON_JOKER,    5, photograph_joker_effect,      }, // 17
     { COMMON_JOKER,    4, walkie_talkie_joker_effect    }, // 18
-    { UNCOMMON_JOKER,  8, fibonnaci_joker_effect        }, // 19
+    { COMMON_JOKER,    5, banner_joker_effect           }, // 19
     { UNCOMMON_JOKER,  6, blackboard_joker_effect       }, // 20
     { COMMON_JOKER,    5, mystic_summit_joker_effect    }, // 21
     { COMMON_JOKER,    4, misprint_joker_effect         }, // 22
@@ -1040,7 +1041,6 @@ const JokerInfo joker_registry[] = {
     { COMMON_JOKER,    4, odd_todd_joker_effect         }, // 25
     { UNCOMMON_JOKER,  7, joker_effect_noop,            }, // 26 Shortcut
     { 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
     { UNCOMMON_JOKER,  7, bootstraps_joker_effect       }, // 29
     { UNCOMMON_JOKER,  5, joker_effect_noop             }, // 30 Pareidolia
@@ -1063,13 +1063,14 @@ const JokerInfo joker_registry[] = {
     { COMMON_JOKER,    4, hanging_chad_joker_effect     }, // 47
     { UNCOMMON_JOKER,  7, joker_effect_noop,            }, // 48 Four Fingers
     { COMMON_JOKER,    4, scholar_joker_effect          }, // 49
-
+    { UNCOMMON_JOKER,  8, fibonnaci_joker_effect        }, // 50
+    
     // The following jokers don't have sprites yet,
     // uncomment them when their sprites are added.
 #if 0
-    { COMMON_JOKER,   5, photograph_joker_effect,       photograph_on_joker_created },
-    { UNCOMMON_JOKER, 6, seltzer_joker_effect,          seltzer_on_joker_created },
-    { COMMON_JOKER,   5, shoot_the_moon_joker_effect,   on_joker_created_noop},
+
+    { UNCOMMON_JOKER, 6, seltzer_joker_effect,          },
+    { COMMON_JOKER,   5, shoot_the_moon_joker_effect,   },
 #endif
 };