Merge pull request #166 from cellos51/integrate_joker_art

Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization)

graphics/joker_gfx21.grit

@@ -0,0 +1 @@
+-gB4 -Mw4 -Mh4 -m! -pn 16

include/def_joker_gfx_table.h

@@ -18,4 +18,5 @@ DEF_JOKER_GFX(16)
 DEF_JOKER_GFX(17)
 DEF_JOKER_GFX(18)
 DEF_JOKER_GFX(19)
-DEF_JOKER_GFX(20)
+DEF_JOKER_GFX(20)
+DEF_JOKER_GFX(21)

include/joker.h

@@ -36,8 +36,8 @@
 #define DEFAULT_JOKER_ID 0
 #define GREEDY_JOKER_ID 1 // This is just an example to show the patern of making joker IDs
 #define JOKER_STENCIL_ID 16
+#define PAREIDOLIA_JOKER_ID 30
 #define JOKER_BRAINSTORM_ID 40
-#define PAREIDOLIA_JOKER_ID 41
 
 typedef struct 
 {

include/joker_gfx.h

@@ -22,5 +22,6 @@
 #include "joker_gfx18.h"
 #include "joker_gfx19.h"
 #include "joker_gfx20.h"
+#include "joker_gfx21.h"
 
 #endif

source/joker_effects.c

@@ -531,10 +531,6 @@ static JokerEffect the_tribe_joker_effect(Joker *joker, Card *scored_card) {
     return effect;
 }
 
-// Using __attribute__((unused)) for jokers with no sprites yet to avoid warning
-// Remove the attribute once they have sprites
-// graphics available from @MathisMartin31
-   __attribute__((unused))
 static JokerEffect bootstraps_joker_effect(Joker *joker, Card *scored_card) {
     JokerEffect effect = {0};
     if (scored_card != NULL)
@@ -545,6 +541,8 @@ static JokerEffect bootstraps_joker_effect(Joker *joker, Card *scored_card) {
     return effect;
 }
 
+// Using __attribute__((unused)) for jokers with no sprites yet to avoid warning
+// Remove the attribute once they have sprites
 // no graphics available but ready to be used if wanted when graphics available
 __attribute__((unused))
 static JokerEffect shoot_the_moon_joker_effect(Joker *joker, Card *scored_card) {
@@ -658,8 +656,8 @@ const JokerInfo joker_registry[] = {
     { 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
-    { COMMON_JOKER, 5, raised_fist_joker_effect },      // 30
+    { UNCOMMON_JOKER, 7, bootstraps_joker_effect},      // 29
+    { UNCOMMON_JOKER, 5, NULL /* Pareidolia */ },       // 30
     { COMMON_JOKER, 6, reserved_parking_joker_effect }, // 31
     { COMMON_JOKER, 4, abstract_joker_effect },         // 32
     { UNCOMMON_JOKER, 6, bull_joker_effect},            // 33
@@ -670,13 +668,14 @@ const JokerInfo joker_registry[] = {
     { RARE_JOKER, 8, the_tribe_joker_effect},           // 38
     { RARE_JOKER, 10, blueprint_joker_effect },         // 39
     { RARE_JOKER, 10, brainstorm_joker_effect },        // 40
+    { COMMON_JOKER, 5, raised_fist_joker_effect },      // 41
+    { COMMON_JOKER, 4, smiley_face_joker_effect },      // 42
 
     // The following jokers don't have sprites yet, 
     // uncomment them when their sprites are added.
 #if 0
-    { UNCOMMON_JOKER, 5, NULL /* Pareidolia */ },       // 41
+
     { UNCOMMON_JOKER, 6, acrobat_joker_effect },
-    { UNCOMMON_JOKER, 7, bootstraps_joker_effect},   
     { COMMON_JOKER, 5, shoot_the_moon_joker_effect},
 #endif
 };