Merge branch 'main' into implement_joker_testing

include/card.h

@@ -38,7 +38,7 @@
 #define IMPOSSIBLY_HIGH_CARD_VALUE 100
 
 // Card types
-typedef struct
+typedef struct Card
 {
     u8 suit;
     u8 rank;

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/game.h

@@ -86,6 +86,7 @@ typedef struct List List;
 
 // Utility functions for other files
 typedef struct CardObject CardObject; // forward declaration, actually declared in card.h
+typedef struct Card Card;
 typedef struct JokerObject JokerObject;
 CardObject**    get_hand_array(void);
 int             get_hand_top(void);
@@ -93,9 +94,12 @@ int             hand_get_size(void);
 CardObject**    get_played_array(void);
 int             get_played_top(void);
 List*           get_jokers(void);
+bool            is_joker_owned(int joker_id);
+bool            card_is_face(Card *card);
 
 int get_deck_top(void);
 int get_num_discards_remaining(void);
+int get_num_hands_remaining(void);
 int get_money(void);
 
 #endif // GAME_H

include/joker.h

@@ -36,6 +36,7 @@
 #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
 
 typedef struct 
@@ -92,4 +93,4 @@ bool joker_object_is_selected(JokerObject* joker_object);
 
 Sprite* joker_object_get_sprite(JokerObject* joker_object);
 
-#endif // JOKER_H
+#endif // JOKER_H

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