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

added co-pilot's fixes

Browse Source
This commit is contained in:
cellos51
2025-07-22 15:45:29 -04:00
parent 9086aa0f59
commit 793da72465
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/joker.h
+1 -1
View File
@@ -36,7 +36,7 @@ typedef struct
u8 modifier; // base, foil, holo, poly, negative u8 modifier; // base, foil, holo, poly, negative
u8 value; u8 value;
u8 rarity; u8 rarity;
bool proccessed; bool processed;
} Joker; } Joker;
typedef struct // copy of CardObject in card.h typedef struct // copy of CardObject in card.h
source/game.c
+5 -6
View File
@@ -30,6 +30,7 @@ static int background = 0;
static enum GameState game_state = GAME_BLIND_SELECT; // The current game state, this is used to determine what the game is doing at any given time static enum GameState game_state = GAME_BLIND_SELECT; // The current game state, this is used to determine what the game is doing at any given time
static enum HandState hand_state = HAND_DRAW; static enum HandState hand_state = HAND_DRAW;
static enum PlayState play_state = PLAY_PLAYING; static enum PlayState play_state = PLAY_PLAYING;
static int state = 0; // General state variable, used for switch statements in each game state related function
static enum HandType hand_type = NONE; static enum HandType hand_type = NONE;
@@ -480,7 +481,7 @@ void change_background(int id)
} }
else if (id == BG_ID_ROUND_END) else if (id == BG_ID_ROUND_END)
{ {
if (background != BG_ID_CARD_SELECTING || background != BG_ID_CARD_PLAYING) if (background != BG_ID_CARD_SELECTING && background != BG_ID_CARD_PLAYING)
{ {
change_background(BG_ID_CARD_SELECTING); change_background(BG_ID_CARD_SELECTING);
background = BG_ID_ROUND_END; background = BG_ID_ROUND_END;
@@ -1579,7 +1580,7 @@ static void played_cards_update_loop(bool* discarded_card, int* played_selection
for (int k = 0; k <= jokers_top; k++) for (int k = 0; k <= jokers_top; k++)
{ {
if (jokers[k]->joker->proccessed == false) if (jokers[k]->joker->processed == false)
{ {
IndependentEffect joker_effect = joker_independent_effect(jokers[k]->joker); IndependentEffect joker_effect = joker_independent_effect(jokers[k]->joker);
IndependentEffect zero_effect = {0}; IndependentEffect zero_effect = {0};
@@ -1618,7 +1619,7 @@ static void played_cards_update_loop(bool* discarded_card, int* played_selection
tte_write(score_buffer); tte_write(score_buffer);
jokers[k]->joker->proccessed = true; // Mark the joker as processed jokers[k]->joker->processed = true; // Mark the joker as processed
joker_object_score(jokers[k], SFX_CARD_SELECT); joker_object_score(jokers[k], SFX_CARD_SELECT);
return; // Returning was just the easiest way to break out of the loop return; // Returning was just the easiest way to break out of the loop
@@ -1630,7 +1631,7 @@ static void played_cards_update_loop(bool* discarded_card, int* played_selection
{ {
if (jokers[k] != NULL) if (jokers[k] != NULL)
{ {
jokers[k]->joker->proccessed = false; // Reset the joker's processed state for the next round jokers[k]->joker->processed = false; // Reset the joker's processed state for the next round
} }
} }
@@ -1871,8 +1872,6 @@ void game_round_end_cleanup()
void game_round_end() void game_round_end()
{ {
static int state = 0;
static int blind_reward = 0; static int blind_reward = 0;
static int hand_reward = 0; static int hand_reward = 0;
static int interest_reward = 0; static int interest_reward = 0;
source/joker.c
+1 -1
View File
@@ -46,7 +46,7 @@ Joker *joker_new(u8 id)
joker->modifier = BASE_EDITION; // TODO: Make this random later joker->modifier = BASE_EDITION; // TODO: Make this random later
joker->value = joker_data_lut[id][1] + edition_price_lut[joker->modifier]; // Base value + edition price joker->value = joker_data_lut[id][1] + edition_price_lut[joker->modifier]; // Base value + edition price
joker->rarity = joker_data_lut[id][0]; joker->rarity = joker_data_lut[id][0];
joker->proccessed = false; joker->processed = false;
return joker; return joker;
} }