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 0000000..56dcc60 Binary files /dev/null and b/graphics/joker_gfx15.png differ 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},