diff --git a/graphics/joker_gfx14.grit b/graphics/joker_gfx14.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx14.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx14.png b/graphics/joker_gfx14.png new file mode 100644 index 0000000..e1b6bcd Binary files /dev/null and b/graphics/joker_gfx14.png differ diff --git a/include/joker_gfx.h b/include/joker_gfx.h index ce1c916..bcb1ad2 100644 --- a/include/joker_gfx.h +++ b/include/joker_gfx.h @@ -15,5 +15,6 @@ #include "joker_gfx11.h" #include "joker_gfx12.h" #include "joker_gfx13.h" +#include "joker_gfx14.h" #endif \ No newline at end of file diff --git a/source/joker.c b/source/joker.c index 6ec320b..d8665ea 100644 --- a/source/joker.c +++ b/source/joker.c @@ -132,6 +132,7 @@ void joker_init() joker_gfxTiles[11] = joker_gfx11Tiles; joker_gfxTiles[12] = joker_gfx12Tiles; joker_gfxTiles[13] = joker_gfx13Tiles; + joker_gfxTiles[14] = joker_gfx14Tiles; joker_gfxPal[0] = joker_gfx0Pal; joker_gfxPal[1] = joker_gfx1Pal; @@ -147,6 +148,7 @@ void joker_init() joker_gfxPal[11] = joker_gfx11Pal; joker_gfxPal[12] = joker_gfx12Pal; joker_gfxPal[13] = joker_gfx13Pal; + joker_gfxPal[14] = joker_gfx14Pal; for (int i = 0; i < num_spritesheets; i++) { diff --git a/source/joker_effects.c b/source/joker_effects.c index 155c850..1382ea2 100644 --- a/source/joker_effects.c +++ b/source/joker_effects.c @@ -382,7 +382,6 @@ static JokerEffect scholar_joker_effect(Joker *joker, Card *scored_card) { return effect; } -__attribute__((unused)) static JokerEffect scary_face_joker_effect(Joker *joker, Card *scored_card) { JokerEffect effect = {0}; if (scored_card == NULL) @@ -422,7 +421,6 @@ static JokerEffect bull_joker_effect(Joker *joker, Card *scored_card) { return effect; } -__attribute__((unused)) static JokerEffect smiley_face_joker_effect(Joker *joker, Card *scored_card) { JokerEffect effect = {0}; if (scored_card == NULL) @@ -505,16 +503,17 @@ const JokerInfo joker_registry[] = { { COMMON_JOKER, 4, scholar_joker_effect }, // 26 { 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 + { COMMON_JOKER, 4, smiley_face_joker_effect }, // 29 // 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, scary_face_joker_effect }, + { COMMON_JOKER, 4, abstract_joker_effect }, { UNCOMMON_JOKER, 6, bull_joker_effect}, - { COMMON_JOKER, 4, smiley_face_joker_effect }, #endif };