wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moving macro into pool definition

Browse Source
This commit is contained in:
Drew
2025-09-17 15:01:26 -05:00
parent 3dc959c17d
commit c4e804234b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/joker.c
+12 -8
View File
@@ -15,8 +15,18 @@
#define NUM_JOKERS_PER_SPRITESHEET 2 #define NUM_JOKERS_PER_SPRITESHEET 2
#define MAX_JOKERS 15 #define MAX_JOKERS 15
const unsigned int *joker_gfxTiles[MAX_JOKERS]; const unsigned int *joker_gfxTiles[MAX_JOKERS] =
const unsigned short *joker_gfxPal[MAX_JOKERS]; {
#define DEF_JOKER_GFX(idx) joker_gfx##idx##Tiles,
#include "../include/joker_table.h"
#undef DEF_JOKER_GFX
};
const unsigned short *joker_gfxPal[MAX_JOKERS] =
{
#define DEF_JOKER_GFX(idx) joker_gfx##idx##Pal,
#include "../include/joker_table.h"
#undef DEF_JOKER_GFX
};
const static u8 edition_price_lut[MAX_EDITIONS] = const static u8 edition_price_lut[MAX_EDITIONS] =
{ {
@@ -116,12 +126,6 @@ void joker_init()
int num_spritesheets = get_num_spritesheets(); int num_spritesheets = get_num_spritesheets();
joker_spritesheet_pb_map = (int*)malloc(sizeof(int) * num_spritesheets); joker_spritesheet_pb_map = (int*)malloc(sizeof(int) * num_spritesheets);
#define DEF_JOKER_GFX(idx) \
joker_gfxTiles[idx] = joker_gfx##idx##Tiles; \
joker_gfxPal[idx] = joker_gfx##idx##Pal;
#include "../include/joker_table.h"
#undef DEF_JOKER_GFX
for (int i = 0; i < num_spritesheets; i++) for (int i = 0; i < num_spritesheets; i++)
{ {
joker_spritesheet_pb_map[i] = UNDEFINED; joker_spritesheet_pb_map[i] = UNDEFINED;