diff --git a/graphics/joker_gfx16.grit b/graphics/joker_gfx16.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx16.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx16.png b/graphics/joker_gfx16.png new file mode 100644 index 0000000..ed5ae2a Binary files /dev/null and b/graphics/joker_gfx16.png differ diff --git a/include/def_joker_gfx_table.h b/include/def_joker_gfx_table.h index dd1e762..796940f 100644 --- a/include/def_joker_gfx_table.h +++ b/include/def_joker_gfx_table.h @@ -13,4 +13,5 @@ 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 +DEF_JOKER_GFX(15) +DEF_JOKER_GFX(16) \ No newline at end of file diff --git a/include/joker_gfx.h b/include/joker_gfx.h index f1202ba..bab5633 100644 --- a/include/joker_gfx.h +++ b/include/joker_gfx.h @@ -17,5 +17,6 @@ #include "joker_gfx13.h" #include "joker_gfx14.h" #include "joker_gfx15.h" +#include "joker_gfx16.h" #endif \ No newline at end of file diff --git a/source/joker_effects.c b/source/joker_effects.c index 84d36f2..3f1bb9e 100644 --- a/source/joker_effects.c +++ b/source/joker_effects.c @@ -641,12 +641,12 @@ const JokerInfo joker_registry[] = { { COMMON_JOKER, 4, smiley_face_joker_effect }, // 29 { COMMON_JOKER, 5, raised_fist_joker_effect }, // 30 { COMMON_JOKER, 6, reserved_parking_joker_effect }, // 31 + { COMMON_JOKER, 4, abstract_joker_effect }, // 32 + { UNCOMMON_JOKER, 6, bull_joker_effect}, // 33 // The following jokers don't have sprites yet, // uncomment them when their sprites are added. #if 0 - { COMMON_JOKER, 4, abstract_joker_effect }, - { UNCOMMON_JOKER, 6, bull_joker_effect}, { RARE_JOKER, 8, the_duo_joker_effect}, { RARE_JOKER, 8, the_trio_joker_effect}, { RARE_JOKER, 8, the_family_joker_effect},