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

[Feature] Implement options menu and reading/writing values from/to the SRAM (#449)

Browse Source 
* background

* Implement Options button

* Update main menu artwork

* add options menu tiles

* prepare options menu handling

* incorporate main menu refactor

* toto

* add all menu interactions

* do not reset selection_x in main_menu

* options struct

* fix rebase from ricfehr3's repo

* Implement high contrast cards

* Save/Load options values to SRAM

* load options on game_init and validate data within the load_options function

* Get changes from ricfehr3's PR

* recover fix for glitched ace

* clang format

* clang format

* clang format

* Save 500B of image data by using only minimal set of tiles instead of keeping final window in source file

* clang format

* clang format

* Implement Options button

* Update main menu artwork

* progress, leaving it alone for now until discussion

* make game_vars an extern

* Move options vars into their own struct

* rollback previous commit

* Implement save validation. Version check to come

* implement data validity + version check for game saves

* clang format

* Save position in rng sequence for consistent run after load

* fix rebase issues

* fix rebase issue

* remove unused/duplicate define

* Oops, made a mistake when testing PR #424

* encode high contrast palette into an image, and load it at game_start

* document save.c/h and correct typos

* correct alignment

* game speed and high contrast buttons working

* small cleanup

* sliders also work again now

* clang format

* Moved balatro_version extern declaration to version.h file

* removed unsused variable

* make showing ROM version a toggle

* move ante, round and money to the GameVariables struct

* Rename SaveCheckInfo struct to SaveHeader for clarity

* Add SaveHeader struct explanation

* clang format

* Revert unnecessary tileset optimization

* SFX now follows the sound volume slider

* clang format

* Music now follows volume slider

* Changed volume slider increment from 5 to 20 to avoid having the music sound too rough under 20% volume

* refactor main_menu.c to use SelectionGrid and Button structs

* clang format

* make a "new" save button so we don't save during the state transition

* clang format

* Reduced state transition flicker by only changing affine background to a different one

* Fix loading game too late in game init sequence

* First batch of suggestions from @MeirGavish

* Remove unnecessary intermediary buffers for high contrast palette swapping

* comment row warp hack for button input

* Add some of Copilot's suggestions

* rename balatro_version into gbalatro_version for rebranding reasons + version display erase screen fix

* remove unnecessary NULL check on `on_selection_changed` method

* implement small game speed arrow buttons animation

* factorize some code

* remove unnecessary data validation in load_game(), since we already checked the header

* Implement @MeirGavish 's suggestion regarding splitting the huge `on_update` function

* clang format

* implement @ricfehr3 's suggestion about keeping last selected button instead of using an obscure `on_boot` boolean

* Apply @ricfehr3's suggestions

* fix clang-format flags

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
This commit is contained in:
Geralt
2026-05-02 14:28:52 -07:00
committed by GitHub
co-authored by MathisMartin31
parent da988ba7f5
commit e7f550ce22
38 changed files with 1231 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/main_menu.c
+152 -41
View File
@@ -9,29 +9,79 @@
#include "game/common_ui.h"
#include "game_variables.h"
#include "graphic_utils.h"
#include "selection_grid.h"
#include "soundbank.h"
#include "sprite.h"
#include "version.h"
#include <stdint.h>
#include <tonc.h>
#include <tonc_math.h>
#include <tonc_memdef.h>
static const u32 PLAY_BUTTON_OUTLINE_PID = 2;
static const u32 PLAY_BUTTON_MAIN_COLOR_PID = 5;
#define PLAY_BUTTON_MAIN_COLOR_PID 5
#define PLAY_BUTTON_OUTLINE_PID 6
#define OPTIONS_BUTTON_MAIN_COLOR_PID 7
#define OPTIONS_BUTTON_OUTLINE_PID 1
static const u32 IMPLEMENTED_BUTTONS = 1; // Remove this once all buttons are implemented
static const u32 PLAY_BTN_IDX = 0;
enum MainButtons
{
PLAY_BTN_IDX,
OPTIONS_BTN_IDX,
MAIN_MENU_NB_BTN
};
// Pixel sizes
#define MAIN_MENU_ACE_T_X 88
#define MAIN_MENU_ACE_T_Y 26
// clang-format off
static const BG_POINT GBALATRO_VERSION_TEXT_POS = {0, 152};
static const Rect GBALATRO_VERSION_TEXT_RECT = {0, 152, 240, 160};
// clang-format on
// Define SelectionGrid for the main menu buttons
static int main_menu_return_row_size(void);
static bool main_menu_on_selection_changed(
SelectionGrid* selection_grid,
int row_idx,
const Selection* prev_selection,
const Selection* new_selection
);
static void main_menu_on_key_transit(SelectionGrid* selection_grid, Selection* selection);
static void play_on_pressed(void);
static void options_on_pressed(void);
// clang-format off
static SelectionGridRow main_menu_selection_rows[] = {
{
0,
main_menu_return_row_size,
main_menu_on_selection_changed,
main_menu_on_key_transit,
{.wrap = false}
},
};
static Button main_menu_buttons[] = {
{PLAY_BUTTON_OUTLINE_PID, PLAY_BUTTON_MAIN_COLOR_PID, play_on_pressed, NULL},
{OPTIONS_BUTTON_OUTLINE_PID, OPTIONS_BUTTON_MAIN_COLOR_PID, options_on_pressed, NULL},
};
static SelectionGrid main_menu_selection_grid = {
main_menu_selection_rows,
1,
{0, 0}
};
// clang-format on
// Main menu sprite - the ace of spades
static CardObject* main_menu_ace = NULL;
// Current selected button index
static int selection_x = 0;
// Keep track of last highlighted button
static enum MainButtons last_highlighted_button = PLAY_BTN_IDX;
void game_main_menu_change_background(void)
{
@@ -42,11 +92,14 @@ void game_main_menu_change_background(void)
GRIT_CPY(&tile_mem[MAIN_BG_CBB], background_main_menu_gfxTiles);
GRIT_CPY(&se_mem[MAIN_BG_SBB], background_main_menu_gfxMap);
// Disable the button highlight colors
memcpy16(&pal_bg_mem[PLAY_BUTTON_OUTLINE_PID], &pal_bg_mem[PLAY_BUTTON_MAIN_COLOR_PID], 1);
// Disable all button highlight colors
for (int i = 0; i < MAIN_MENU_NB_BTN; i++)
{
button_set_highlight(&main_menu_buttons[i], false);
}
}
void game_main_menu_on_init()
void game_main_menu_on_init(void)
{
affine_background_change_background(AFFINE_BG_MAIN_MENU);
change_background(BG_MAIN_MENU);
@@ -58,10 +111,18 @@ void game_main_menu_on_init()
main_menu_ace->sprite_object->ty = int2fx(MAIN_MENU_ACE_T_Y);
main_menu_ace->sprite_object->y = main_menu_ace->sprite_object->ty;
main_menu_ace->sprite_object->tscale = float2fx(0.8f);
selection_x = 0;
card_object_update(main_menu_ace);
// Select last highlighted button, Play button by default.
// e.g. if we return from the options menu, we want the Options button to be highlighted.
Selection sel_init = {last_highlighted_button, 0};
main_menu_selection_grid.selection = sel_init;
// Highlight current button
button_set_highlight(&main_menu_buttons[main_menu_selection_grid.selection.x], true);
}
void game_main_menu_on_update()
void game_main_menu_on_update(void)
{
card_object_update(main_menu_ace);
main_menu_ace->sprite_object->trotation = lu_sin((g_game_vars.timer << 8) / 2) / 3;
@@ -75,41 +136,91 @@ void game_main_menu_on_update()
g_game_vars.rng_seed *= 2;
}
if (key_hit(KEY_LEFT))
{
if (selection_x > 0)
{
selection_x--;
}
}
else if (key_hit(KEY_RIGHT))
{
if (selection_x < IMPLEMENTED_BUTTONS - 1)
{
selection_x++;
}
}
if (selection_x == PLAY_BTN_IDX)
{
memset16(&pal_bg_mem[PLAY_BUTTON_OUTLINE_PID], BTN_HIGHLIGHT_COLOR, 1);
if (key_hit(SELECT_CARD))
{
play_sfx(SFX_BUTTON, MM_BASE_PITCH_RATE, BUTTON_SFX_VOLUME);
game_change_state(GAME_STATE_GAME_START);
}
}
else
{
memcpy16(&pal_bg_mem[PLAY_BUTTON_OUTLINE_PID], &pal_bg_mem[PLAY_BUTTON_MAIN_COLOR_PID], 1);
}
selection_grid_process_input(&main_menu_selection_grid);
}
void game_main_menu_on_exit()
void game_main_menu_on_exit(void)
{
// Save selected button
last_highlighted_button = main_menu_selection_grid.selection.x;
// Normally I would just cache these and hide/unhide but I didn't feel like dealing with
// defining a layer for it
card_destroy(&main_menu_ace->card);
card_object_destroy(&main_menu_ace);
}
// Implement SelectionGrid handler functions
static int main_menu_return_row_size(void)
{
return MAIN_MENU_NB_BTN;
}
static bool main_menu_on_selection_changed(
SelectionGrid* selection_grid,
int row_idx,
const Selection* prev_selection,
const Selection* new_selection
)
{
if (prev_selection->x >= 0 && prev_selection->x < MAIN_MENU_NB_BTN)
{
button_set_highlight(&main_menu_buttons[prev_selection->x], false);
}
play_sfx(SFX_BUTTON, MM_BASE_PITCH_RATE, BUTTON_SFX_VOLUME);
button_set_highlight(&main_menu_buttons[new_selection->x], true);
return true;
}
static void main_menu_on_key_transit(SelectionGrid* selection_grid, Selection* selection)
{
// DEBUG: toggle git hash display by pressing L+R+START+SELECT
static bool combo_pressed = false;
static bool show_version = false;
if (key_is_down(KEY_START) && key_is_down(KEY_SELECT) && key_is_down(KEY_L) &&
key_is_down(KEY_R))
{
if (!combo_pressed)
{
show_version = !show_version;
if (show_version)
{
tte_printf(
"#{P:%d,%d; cx:0x%X000}%s",
GBALATRO_VERSION_TEXT_POS.x,
GBALATRO_VERSION_TEXT_POS.y,
TTE_WHITE_PB,
gbalatro_version
);
}
else
{
tte_erase_rect_wrapper(GBALATRO_VERSION_TEXT_RECT);
}
}
combo_pressed = true;
}
else
{
combo_pressed = false;
}
if (key_hit(SELECT_CARD))
{
button_press(&main_menu_buttons[selection->x]);
}
}
static void play_on_pressed(void)
{
game_change_state(GAME_STATE_GAME_START);
}
static void options_on_pressed(void)
{
game_change_state(GAME_STATE_OPTIONS_MENU);
}