card_select and card_deselect were flipped, fixed them back. This only affects the sound displayed when cards are scored, now it's the select instead of the deselect.
This commit is contained in:
Binary file not shown.
Binary file not shown.
+5
-5
@@ -805,13 +805,13 @@ void hand_toggle_card_selection()
|
|||||||
{
|
{
|
||||||
card_object_set_selected(hand[selection_x], false);
|
card_object_set_selected(hand[selection_x], false);
|
||||||
hand_selections--;
|
hand_selections--;
|
||||||
play_sfx(SFX_CARD_SELECT, MM_BASE_PITCH_RATE);
|
play_sfx(SFX_CARD_DESELECT, MM_BASE_PITCH_RATE);
|
||||||
}
|
}
|
||||||
else if (hand_selections < MAX_SELECTION_SIZE)
|
else if (hand_selections < MAX_SELECTION_SIZE)
|
||||||
{
|
{
|
||||||
card_object_set_selected(hand[selection_x], true);
|
card_object_set_selected(hand[selection_x], true);
|
||||||
hand_selections++;
|
hand_selections++;
|
||||||
play_sfx(SFX_CARD_DESELECT, MM_BASE_PITCH_RATE);
|
play_sfx(SFX_CARD_SELECT, MM_BASE_PITCH_RATE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -830,9 +830,7 @@ void hand_deselect_all_cards()
|
|||||||
|
|
||||||
if (any_cards_deselected)
|
if (any_cards_deselected)
|
||||||
{
|
{
|
||||||
// The sound effects are currently flipped
|
play_sfx(SFX_CARD_DESELECT, MM_BASE_PITCH_RATE);
|
||||||
// TODO: Fix
|
|
||||||
play_sfx(SFX_CARD_SELECT, MM_BASE_PITCH_RATE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -927,6 +925,8 @@ void game_round_init()
|
|||||||
Rect blind_req_text_rect = BLIND_REQ_TEXT_RECT;
|
Rect blind_req_text_rect = BLIND_REQ_TEXT_RECT;
|
||||||
int blind_requirement = blind_get_requirement(current_blind, ante);
|
int blind_requirement = blind_get_requirement(current_blind, ante);
|
||||||
|
|
||||||
|
// TODO: Address Copilot review at
|
||||||
|
// https://github.com/cellos51/balatro-gba/pull/46#pullrequestreview-3045772903
|
||||||
char score_suffix = ' ';
|
char score_suffix = ' ';
|
||||||
if(blind_requirement >= 10000)
|
if(blind_requirement >= 10000)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user