Merged main into ttm/bigger-joker-refactor (manual delete of joker_gfx.png for conflict resolution)

include/graphic_utils.h

@@ -22,6 +22,7 @@
 #define AFFINE_BG_SBB 2
 #define AFFINE_BG_CBB 2
 #define PAL_ROW_LEN 16
+#define NUM_PALETTES 16
 
 /* Dimensions for a screenblock.
  * A 1024 size screenblock is arranged in a grid of 32x32 screen entries

include/joker.h

@@ -9,7 +9,7 @@
 
 #define JOKER_TID (MAX_HAND_SIZE + MAX_SELECTION_SIZE) * JOKER_SPRITE_OFFSET // Tile ID for the starting index in the tile memory
 #define JOKER_SPRITE_OFFSET 16 // Offset for the joker sprites
-#define JOKER_PB 4 // Palette bank for the default jokers
+#define JOKER_BASE_PB 4 // Palette bank for the default jokers
 #define JOKER_STARTING_LAYER 27
 
 #define BASE_EDITION 0

include/joker_gfx.h

@@ -0,0 +1,13 @@
+#ifndef JOKER_GFX_H
+#define JOKER_GFX_H
+
+#include "joker_gfx0.h"
+#include "joker_gfx1.h"
+#include "joker_gfx2.h"
+#include "joker_gfx3.h"
+#include "joker_gfx4.h"
+#include "joker_gfx5.h"
+#include "joker_gfx6.h"
+#include "joker_gfx7.h"
+
+#endif

include/util.h

@@ -37,4 +37,6 @@ static inline int get_digits_even(int n)
 
 #define NUM_ELEM_IN_ARR(arr) (sizeof(arr) / sizeof((arr)[0]))
 
+int int_arr_max(int int_arr[], int size);
+
 #endif // UTIL_H