From 46936c1878dc9acaa26a49a3fa4ab0e4d96d15c5 Mon Sep 17 00:00:00 2001 From: MeirGavish Date: Tue, 7 Oct 2025 21:13:31 +0300 Subject: [PATCH] Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10 --- graphics/joker_gfx15.grit | 1 + graphics/joker_gfx15.png | Bin 0 -> 877 bytes include/def_joker_gfx_table.h | 1 + include/joker_gfx.h | 1 + source/joker_effects.c | 6 ++---- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 graphics/joker_gfx15.grit create mode 100644 graphics/joker_gfx15.png diff --git a/graphics/joker_gfx15.grit b/graphics/joker_gfx15.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx15.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx15.png b/graphics/joker_gfx15.png new file mode 100644 index 0000000000000000000000000000000000000000..56dcc60c3ff4774b2dc057cb26e4192c7456a599 GIT binary patch literal 877 zcmV-z1CsoSP)Ws(|xO*;Yd0K=p>{LJHUhMxokwm*NJsPC6z`SC;IB6rLFM<00S_rJgPA2!*z zrLv`aFv#xip0$G@`+s>fiFsqUej@u%DPgXBx@1T731SHF#zP*k1+G9 za#TKaNf<}hca#kZ)yb5UV{HQfXA&xaJ-pr2>_g!+!n|4xN&-NQnVpPk0fvT@@qupk zUH@$`Mgib#`XX4{pq|Wze4R`OLUhFZtDp(cczsbhl?0uft#m)pa7E zPNpbMhyK?dkZ1F=@~6X4F3QJ%Zd>cyhKU5403m!a^l`sv&kAx=FS`9md0jgIfVJPi zW5Gm%H41Quvs#=EU~My4g(@fcfI!4NfB0K~0>1l0*XLDp=lR$n&~+W_;8NGw0@%ab z5cbrVFYN;+vnbAwBlM)_N}QblA&hYnRI{g+LX7ao5gG+t;JgpOCL1|5C+8QDh--lM z0Wr?}vB z2z57LtD7#_O>UKKOGSsP-dSp*I@yLAk`U&?hk5Qc`e;idozSRCt&*Ogpen02PdRz?s00000NkvXXu0mjf DUL}{| literal 0 HcmV?d00001 diff --git a/include/def_joker_gfx_table.h b/include/def_joker_gfx_table.h index 480f7ed..dd1e762 100644 --- a/include/def_joker_gfx_table.h +++ b/include/def_joker_gfx_table.h @@ -13,3 +13,4 @@ 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 diff --git a/include/joker_gfx.h b/include/joker_gfx.h index bcb1ad2..f1202ba 100644 --- a/include/joker_gfx.h +++ b/include/joker_gfx.h @@ -16,5 +16,6 @@ #include "joker_gfx12.h" #include "joker_gfx13.h" #include "joker_gfx14.h" +#include "joker_gfx15.h" #endif \ No newline at end of file diff --git a/source/joker_effects.c b/source/joker_effects.c index fec1273..84d36f2 100644 --- a/source/joker_effects.c +++ b/source/joker_effects.c @@ -639,14 +639,12 @@ const JokerInfo joker_registry[] = { // 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 + { COMMON_JOKER, 5, raised_fist_joker_effect }, // 30 + { COMMON_JOKER, 6, reserved_parking_joker_effect }, // 31 // 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, abstract_joker_effect }, { UNCOMMON_JOKER, 6, bull_joker_effect}, { RARE_JOKER, 8, the_duo_joker_effect},