Leahnaya/balatro-gba
1
0
Fork 0
mirror of https://github.com/cellos51/balatro-gba.git synced 2026-04-26 01:30:39 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #178 from cellos51/allow_additional_joker_testing

Browse Source 
Added option for a second test joker
This commit is contained in:
MeirGavish 2025-10-25 15:22:52 +03:00 committed by GitHub
commit 5a3e891e43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/game.c
View File

@ -199,8 +199,8 @@ static int hands = 0;
static int discards = 0;
static int round = 0;
static int ante = 1;
static int money = 4;
static int ante = 0;
static int money = 0;
static int score = 0;
static int temp_score = 0; // This is the score that shows in the same spot as the hand type.
static FIXED lerped_score = 0;
@ -2491,10 +2491,18 @@ static void game_shop_create_items()
{
int joker_idx = 0;
intptr_t joker_id = 0;
#ifdef TEST_JOKER_ID // Allow defining an ID for a joker to always appear in shop and be tested
if (int_list_exists(jokers_available_to_shop, TEST_JOKER_ID))
#ifdef TEST_JOKER_ID0 // Allow defining an ID for a joker to always appear in shop and be tested
if (int_list_exists(jokers_available_to_shop, TEST_JOKER_ID0))
{
joker_id = TEST_JOKER_ID;
joker_id = TEST_JOKER_ID0;
int_list_remove_by_value(jokers_available_to_shop, joker_id);
}
else
#endif
#ifdef TEST_JOKER_ID1
if (int_list_exists(jokers_available_to_shop, TEST_JOKER_ID1))
{
joker_id = TEST_JOKER_ID1;
int_list_remove_by_value(jokers_available_to_shop, joker_id);
}
else