From 50ec1bcdabc927c59a8aaff8a50f054be627f29d Mon Sep 17 00:00:00 2001 From: MeirGavish Date: Thu, 7 Aug 2025 23:08:35 +0300 Subject: [PATCH] Added art by @GreenNinja2525 for jokers Walkie-Talkie, Fibonacci, Banner, Mystic Summit, and Blackboard --- graphics/joker_gfx10.grit | 1 + graphics/joker_gfx10.png | Bin 0 -> 1297 bytes graphics/joker_gfx11.grit | 1 + graphics/joker_gfx11.png | Bin 0 -> 543 bytes graphics/joker_gfx9.grit | 1 + graphics/joker_gfx9.png | Bin 0 -> 951 bytes include/joker_gfx.h | 3 +++ source/joker.c | 6 ++++++ 8 files changed, 12 insertions(+) create mode 100644 graphics/joker_gfx10.grit create mode 100644 graphics/joker_gfx10.png create mode 100644 graphics/joker_gfx11.grit create mode 100644 graphics/joker_gfx11.png create mode 100644 graphics/joker_gfx9.grit create mode 100644 graphics/joker_gfx9.png diff --git a/graphics/joker_gfx10.grit b/graphics/joker_gfx10.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx10.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx10.png b/graphics/joker_gfx10.png new file mode 100644 index 0000000000000000000000000000000000000000..a87df841486a2e96c128cd632550431600d5a42e GIT binary patch literal 1297 zcmV+s1@8KZP)q~Mdn;uqgJUg11omttT9|(JAc7DF^ zy?JkD)`0{Me){c&th`^m|K6L9$$Kwz{GI|DeB2v3)WLsf{;r&aZ2Z9!1Bu3IH9E-V zQa$DW{JAe3{}ov$s!6!6%ShKME6T~buFFXB&tiEJ5NV$LdTTTC zBSEOn7E%u&C4MbS?dB*l-WGfA?Cs;DY7O{y(4>1KsI18c zKXG}Oc!H4t0C4x%5Y9i}J1AIQ3_ak|99!$7Lk_V06|gad-9Fa8DI(;v(bPwt5C>xc zcx1dSoc=h>=|L%vKi;a~^-pGivq^fBLuNgGlcOUqw$s5nPaQ8dG5X8f2-X|~YX{k2 zcc}twOhr2{Cg0K0Iwm2AFs=1$E`>riba}p9gl_!<79K!Z;aw`&n2H3slS2alMf@Ug z(zN3kkR>V2WphzNy3}{5F@W&bng=X3L&5+f+fT}i1FdJCBrgns_YVFY9jpYPYyf!p znKnJki(v+M2RLohnE^x#s@$CF_-tUh8M2N6caIH4p7)`mP76Mt^XCAW z5EK){fT$AJb@ziz5WF~&OB?`@rZGld0+nDgBs#C&|M%}O z?^7qMRis}#ylt-tem@|>Z~M~nY%axqI#>(9yS=+w?Q64R0$R&_FeK}%$ct@tuv!8^ zDbKdMpD*3S?ee_7L7(8)IDy=rCr^P+ge*RYu#W*7Q*c+S@Vm$3qX1cs$ck%SX8HBj zCeoR7q&}TVM+7|n#;ZN;jF&)A%42t_5{dMaMtRDk#JnSD2AIkrSzV@F7D4i--GXWFmZ2P`HuLd$ObCQ#BTQ^V(!A#*!TXApU3|LOZ|5hB9UtS00000NkvXX Hu0mjfq048x literal 0 HcmV?d00001 diff --git a/graphics/joker_gfx11.grit b/graphics/joker_gfx11.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx11.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx11.png b/graphics/joker_gfx11.png new file mode 100644 index 0000000000000000000000000000000000000000..8dd805ced547cc7b9063fb62113605dbfc180214 GIT binary patch literal 543 zcmV+)0^t3LP)MBQJ*`s)c#D)tLvEl;lC31o6+C}xPshQYL6JXpv z2}N?8!2cf4*k%TW{cX}O+Rj%1?3wVOHB$Uxv-F>_ zOl{~?s0NVr{`lkC$5bZWgQx*H95zerPG{^+=ORt$H6TX}#RI_0^8)Mru{aZY4WO95 z@R#BN_y|Z%7i&DmZiZsy=t}XxcLcCcNhU-Mkc7gt@bBwunXDu@R8UE|AZdUmzHk0Z zN-<$j84Lxvwu5WCXdmlDa{xzQisI-?;jZlf5e2-aDv1S>D?tjN2!?)WioD1E*2M!E zRX`Kq+73=c2KzL1m3-D3*=3Npw!4_;(ukKSe$@>blmx@DmQ$mYkPrD)6=>?p3#Mp> z|DUP?l5ljJy7Eb{sVkosw7!-Zyb^5c$_pm0?R+~>&LRjHxDup53MSH!(oD!IgVF?w z4_AO}lewUTX^<5GTLdUF002ovPDHLkV1h^O{G$K> literal 0 HcmV?d00001 diff --git a/graphics/joker_gfx9.grit b/graphics/joker_gfx9.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx9.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx9.png b/graphics/joker_gfx9.png new file mode 100644 index 0000000000000000000000000000000000000000..298f796ddaa08d29d19db08d202f2b1784d5d5c0 GIT binary patch literal 951 zcmV;o14#UdP)_0* zp_Jf70$q~QOImXhwG>Kw^FJ_x;OZgHb~d}Szh)9Geh_B%&Fsv+Z{BO z*~vu_ja(e@(r=jaTLg6SsfjVElW%VCazDau{>fL5ENv$y-v*w)HNIy%|4F;fQxjv* zbsaPF3x;fc<)z~Ugb?VuZY!r_QWD%il_!;&A=5KSPw(;&{dB<~!SsE+7YHGS()Ci2 zJ1`*xgb*Zhd85w$L_n1mRo)4<7C^yMpkJQI<&BcHl%NEx#S2C~$vjul0RW`B;Xvcs zflELlm$zMcH>G&4;0LN!M!i%-B9}+<&Q+*d+0PCkOwXA}%#sZPy?lV? z41hU>{<(GA(tm6Gu|?*a0529GiuafA8}(|a16307|81UiyR{(tf zr|p28Jb_id((VOURV$;?Zlcm|8Ya)Kyk7)L*9N)zJWw}CD_NZSb|`IJUoOx%*aObF zv`YfJ`l)W%6xe>89yJjn;sU;7fJ`NMxc>1O5Q%Z0WhoB?aDl^(mTO%GSRcLmeUIfgxCc zXiChIz!E`s2{+~0qjfuYjsb@oEsRb_T`hnmf}Sbz4p_aS(rzO2Clh2-VwxQ~DX(Xe zMrj961njFdoKGh``}w|VW?e>BNd3O5m}Pc3e?Oe=6+Bx&zfxYI>$=qQL78^~zyJ?L zsqfFsF9_cg1OfH^Krvu*dsp~!wBPK#-U|Z2gY->2Ro@BC-*5I?_pE<~0h`-l;QzWF Z{|!9h<4@gXzIy-w002ovPDHLkV1g=0un+(M literal 0 HcmV?d00001 diff --git a/include/joker_gfx.h b/include/joker_gfx.h index 92c3edc..75cfbbc 100644 --- a/include/joker_gfx.h +++ b/include/joker_gfx.h @@ -10,5 +10,8 @@ #include "joker_gfx6.h" #include "joker_gfx7.h" #include "joker_gfx8.h" +#include "joker_gfx9.h" +#include "joker_gfx10.h" +#include "joker_gfx11.h" #endif \ No newline at end of file diff --git a/source/joker.c b/source/joker.c index c302faf..41d1fd1 100644 --- a/source/joker.c +++ b/source/joker.c @@ -105,6 +105,9 @@ void joker_init() joker_gfxTiles[6] = joker_gfx6Tiles; joker_gfxTiles[7] = joker_gfx7Tiles; joker_gfxTiles[8] = joker_gfx8Tiles; + joker_gfxTiles[9] = joker_gfx9Tiles; + joker_gfxTiles[10] = joker_gfx10Tiles; + joker_gfxTiles[11] = joker_gfx11Tiles; joker_gfxPal[0] = joker_gfx0Pal; joker_gfxPal[1] = joker_gfx1Pal; @@ -115,6 +118,9 @@ void joker_init() joker_gfxPal[6] = joker_gfx6Pal; joker_gfxPal[7] = joker_gfx7Pal; joker_gfxPal[8] = joker_gfx8Pal; + joker_gfxPal[9] = joker_gfx9Pal; + joker_gfxPal[10] = joker_gfx10Pal; + joker_gfxPal[11] = joker_gfx11Pal; for (int i = 0; i < num_spritesheets; i++) {