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

[Enhancement] Game Over screen rework (#548)

Browse Source 
* WIP

* getting somewhere

* clean up everything real good

* doc

* clang format

* Fix round.c after merge

* Remove extra deck_pop declaration

* Remove unnecessary comment

* address MeirGavish's review

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
This commit is contained in:
Geralt
2026-07-08 03:48:31 +03:00
committed by GitHub
co-authored by MathisMartin31
parent da16e6a486
commit 369c680cb7
10 changed files with 359 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/run_setup.c
+29 -9
View File
@@ -18,6 +18,7 @@
#include "state_machine.h"
#include "util.h"
#include <string.h>
#include <tonc.h>
// Palette Indices
@@ -29,13 +30,13 @@
#define BLUE_DISABLED_BTN_MAIN_COLOR_PAL_IDX 13
#define BACK_BTN_MAIN_COLOR_PAL_IDX 14
#define NEW_RUN_BTN_OUTLINE_COLOR_PAL_IDX 30
#define RESUME_BTN_OUTLINE_COLOR_PAL_IDX 31
#define CHANGE_DECK_BTN_OUTINE_COLOR_PAL_IDX 32
#define SEED_CHECK_BTN_OUTLINE_COLOR_PAL_IDX 33
#define SEED_DECK_BTN_OUTLINE_COLOR_PAL_IDX 34
#define PLAY_BTN_OUTLINE_COLOR_PAL_IDX 35
#define BACK_BTN_OUTLINE_COLOR_PAL_IDX 36
#define NEW_RUN_BTN_OUTLINE_COLOR_PAL_IDX 30
#define RESUME_BTN_OUTLINE_COLOR_PAL_IDX 31
#define CHANGE_DECK_BTN_OUTLINE_COLOR_PAL_IDX 32
#define SEED_CHECK_BTN_OUTLINE_COLOR_PAL_IDX 33
#define SEED_DECK_BTN_OUTLINE_COLOR_PAL_IDX 34
#define PLAY_BTN_OUTLINE_COLOR_PAL_IDX 35
#define BACK_BTN_OUTLINE_COLOR_PAL_IDX 36
#define KEYBOARD_1_BTN_OUTLINE_COLOR_PAL_IDX 40
#define KEYBOARD_2_BTN_OUTLINE_COLOR_PAL_IDX 41
@@ -292,7 +293,7 @@ static SelectionGrid choose_deck_selection_grid = {
static void change_deck_on_pressed(void);
static Button change_deck_button = {
CHANGE_DECK_BTN_OUTINE_COLOR_PAL_IDX,
CHANGE_DECK_BTN_OUTLINE_COLOR_PAL_IDX,
CHANGE_DECK_BTN_MAIN_COLOR_PAL_IDX,
change_deck_on_pressed,
NULL
@@ -566,6 +567,7 @@ enum RunSetupResumeRows
void game_run_setup_change_background(void)
{
tte_erase_screen();
GRIT_CPY(pal_bg_mem, background_run_setup_gfxPal);
GRIT_CPY(&tile_mem[MAIN_BG_CBB], background_run_setup_gfxTiles);
GRIT_CPY(&se_mem[MAIN_BG_SBB], background_run_setup_gfxMap);
@@ -576,6 +578,22 @@ void game_run_setup_on_init(void)
state_machine_register(&run_setup_sm);
game_run_setup_change_background();
// Apply the current use_seed value if seed is UNDEFINED
if (g_game_vars.rng_info.seed == UNDEFINED)
{
// Make the string empty instead of showing all zeroes
memset(seed_str, '\0', BASE36_MAX_DIGITS + 1);
seed_cursor_pos = 0;
}
// Or use previous Run's seed if it hasn't been reset
else
{
u32_to_base36(g_game_vars.rng_info.seed, seed_str);
seed_cursor_pos = BASE36_MAX_DIGITS;
use_seed = true;
}
toggle_seed_enabled(use_seed);
// Rank doesn't matter, won't see it
run_setup_deck = card_object_new(card_new(SPADES, ACE));
@@ -660,9 +678,9 @@ static void choose_deck_substate_init(void)
// Set button highlights
button_set_highlight(&change_deck_button, true);
button_set_highlight(&choose_deck_bottom_buttons[RUN_SETUP_DECK_BB_USE_SEED], false);
toggle_seed_enabled(use_seed); // This just re-applies the current value
button_set_highlight(&choose_deck_bottom_buttons[RUN_SETUP_DECK_BB_PLAY], false);
button_set_highlight(&back_button, false);
toggle_seed_enabled(use_seed);
// Print button text
tte_printf(
@@ -1161,6 +1179,8 @@ static void play_on_pressed(void)
else
rng_shuffle_seed();
use_seed = false;
game_change_state(GAME_STATE_GAME_START);
}