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

Update for PR

Browse Source
This commit is contained in:
Rickey Fehr
2025-10-13 23:36:27 -07:00
parent 3c2dd0edba
commit 54d955d1e7
3 changed files with 103 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blind.c
+18 -35
View File
@@ -16,41 +16,23 @@ static const u16 small_blind_token_palette[PAL_ROW_LEN] = {0x0000, 0x7FFF, 0x34A
static const u16 big_blind_token_palette[PAL_ROW_LEN] = {0x0000, 0x2527, 0x15F5, 0x36FC, 0x1E9C, 0x01B4, 0x0D0A, 0x010E};
static const u16 boss_blind_token_palette[PAL_ROW_LEN] = {0x0000, 0x2CC9, 0x3D0D, 0x5E14, 0x5171, 0x4D0F, 0x2CC8, 0x3089}; // This variable is temporary, each boss blind will have its own unique palette
static const Blind blindMap[BLIND_TYPE_MAX] =
{
{
.type = BLIND_TYPE_SMALL,
.pal_info =
{
.palette = small_blind_token_palette,
.tid = SMALL_BLIND_TID,
.pb = SMALL_BLIND_PB,
},
.multiplier = FIX_ONE,
.reward = SMALL_BLIND_REWARD,
},
{
.type = BLIND_TYPE_BIG,
.pal_info =
{
.palette = big_blind_token_palette,
.tid = BIG_BLIND_TID,
.pb = BIG_BLIND_PB,
},
.multiplier = (FIX_ONE * 3) / 2,
.reward = BIG_BLIND_REWARD,
},
{
.type = BLIND_TYPE_BOSS,
.pal_info =
{
.palette = boss_blind_token_palette,
.tid = BOSS_BLIND_TID,
.pb = BOSS_BLIND_PB,
},
.multiplier = FIX_ONE * 2,
.reward = BOSS_BLIND_REWARD,
#define BLIND_INFO(NAME, name, multi) \
{ \
.type = BLIND_TYPE_##NAME , \
.pal_info = \
{ \
.palette = name##_blind_token_palette, \
.tid = NAME##_BLIND_TID, \
.pb = NAME##_BLIND_PB, \
}, \
.score_req_multipler = multi , \
.reward = NAME##_BLIND_REWARD, \
},
BLIND_INFO_TABLE
#undef BLIND_INFO
};
void blind_init()
@@ -59,7 +41,8 @@ void blind_init()
GRIT_CPY(&tile_mem[4][SMALL_BLIND_TID], blinds_gfxTiles);
for(int i = 0; i < BLIND_TYPE_MAX; i++)
{const u16* pal = blindMap[i].pal_info.palette;
{
const u16* pal = blindMap[i].pal_info.palette;
u32 pb = blindMap[i].pal_info.pb;
u32 pal_offset = PAL_ROW_LEN * pb;
@@ -72,7 +55,7 @@ int blind_get_requirement(enum BlindType type, int ante)
{
if (ante < 0 || ante > MAX_ANTE) ante = 0; // Ensure ante is within valid range
return fx2int(blindMap[type].multiplier * ante_lut[ante]);
return fx2int(blindMap[type].score_req_multipler * ante_lut[ante]);
}
int blind_get_reward(enum BlindType type)
@@ -80,7 +63,7 @@ int blind_get_reward(enum BlindType type)
return blindMap[type].reward;
}
u16 blind_get_color(enum BlindType type, int index)
u16 blind_get_color(enum BlindType type, enum BlindColorIndex index)
{
return blindMap[type].pal_info.palette[index];
}