Merge branch 'main' into jokers_palette_swapping

include/game.h

@@ -74,9 +74,12 @@ void game_update();
 
 // Utility functions for other files
 typedef struct CardObject CardObject; // forward declaration, actually declared in card.h
-CardObject **get_hand_array(void);
-CardObject **get_played_array(void);
-int get_hand_top(void);
-int get_played_top(void);
+typedef struct JokerObject JokerObject;
+CardObject**    get_hand_array(void);
+int             get_hand_top(void);
+CardObject**    get_played_array(void);
+int             get_played_top(void);
+JokerObject**   get_jokers(void);
+int             get_jokers_top(void);
 
 #endif // GAME_H

include/joker.h

@@ -35,6 +35,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
 
 typedef struct 
 {
@@ -45,7 +46,7 @@ typedef struct
     bool processed;
 } Joker;
 
-typedef struct // copy of CardObject in card.h
+typedef struct JokerObject
 {
     Joker *joker;
     SpriteObject* sprite_object;

include/joker_gfx.h

@@ -9,5 +9,6 @@
 #include "joker_gfx5.h"
 #include "joker_gfx6.h"
 #include "joker_gfx7.h"
+#include "joker_gfx8.h"
 
 #endif

include/sprite.h

@@ -4,6 +4,8 @@
 #include <tonc.h>
 #include <maxmod.h>
 
+#define CARD_SPRITE_SIZE 32
+
 typedef struct 
 {
     OBJ_ATTR *obj;