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

Refactored state machine.

Browse Source 
Added a state info map which keeps track of a particular state's on_init, on_update and on_exit functions.
A few of the on_update functions have sub-states, which create extremely long switch statements.
Not sure if perhaps the best route would be to keep the switch statements but break the cases into individual
functions or if we should keep track of substates. The latter sounds like it could get complicated and really
messy quick. Problem for another day.
This commit is contained in:
Drew 2025-09-23 01:47:25 -05:00
parent 6dce57e197
commit 121bbc01d5
6 changed files with 149 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/game.h
View File

@ -28,14 +28,15 @@
enum GameState
{
GAME_SPLASH_SCREEN,
GAME_MAIN_MENU,
GAME_PLAYING,
GAME_ROUND_END,
GAME_SHOP,
GAME_BLIND_SELECT,
GAME_LOSE,
GAME_WIN
GAME_STATE_SPLASH_SCREEN,
GAME_STATE_MAIN_MENU,
GAME_STATE_PLAYING,
GAME_STATE_ROUND_END,
GAME_STATE_SHOP,
GAME_STATE_BLIND_SELECT,
GAME_STATE_LOSE,
GAME_STATE_WIN,
GAME_STATE_MAX
};
enum HandState
@ -75,10 +76,30 @@ enum HandType
FLUSH_FIVE
};
typedef struct
{
int round;
int ante;
int money;
int score;
int temp_score;
int chips;
int mult;
int current_blind;
} RunState;
typedef struct
{
enum GameState state;
void (*on_init)();
void (*on_update)();
void (*on_exit)();
} StateInfo;
// Game functions
void game_init();
void game_update();
void game_set_state(enum GameState new_game_state);
void game_change_state(enum GameState new_game_state);
// Forward declaration
struct List;
@ -88,6 +109,7 @@ typedef struct List List;
typedef struct CardObject CardObject; // forward declaration, actually declared in card.h
typedef struct Card Card;
typedef struct JokerObject JokerObject;
CardObject** get_hand_array(void);
int get_hand_top(void);
int hand_get_size(void);

9
include/game_state_table.h Normal file
View File

@ -0,0 +1,9 @@
// (stateEnum, on_init, on_update, on_exit)
DEF_STATE_INFO(GAME_STATE_SPLASH_SCREEN, splash_screen_init, splash_screen_update, _noop)
DEF_STATE_INFO(GAME_STATE_MAIN_MENU, game_main_menu_init, game_main_menu_update, _noop)
DEF_STATE_INFO(GAME_STATE_PLAYING, game_round_init, game_playing_update, _noop)
DEF_STATE_INFO(GAME_STATE_ROUND_END, _noop, game_round_end_update, game_round_end_exit)
DEF_STATE_INFO(GAME_STATE_SHOP, _noop, game_shop_update, game_state_shop_exit)
DEF_STATE_INFO(GAME_STATE_BLIND_SELECT, _noop, game_blind_select_update, game_blind_select_exit)
DEF_STATE_INFO(GAME_STATE_LOSE, game_lose_init, game_lose_update, _noop)
DEF_STATE_INFO(GAME_STATE_WIN, game_win_init, game_win_update, _noop)

15
include/joker_table.h Normal file
View File

@ -0,0 +1,15 @@
DEF_JOKER_GFX(0)
DEF_JOKER_GFX(1)
DEF_JOKER_GFX(2)
DEF_JOKER_GFX(3)
DEF_JOKER_GFX(4)
DEF_JOKER_GFX(5)
DEF_JOKER_GFX(6)
DEF_JOKER_GFX(7)
DEF_JOKER_GFX(8)
DEF_JOKER_GFX(9)
DEF_JOKER_GFX(10)
DEF_JOKER_GFX(11)
DEF_JOKER_GFX(12)
DEF_JOKER_GFX(13)
DEF_JOKER_GFX(14)

4
include/splash_screen.h
View File

@ -8,6 +8,6 @@
#define SPLASH_DURATION_FRAMES (SPLASH_FPS * SPLASH_DURATION_SECONDS)
void splash_screen_init();
void splash_screen_update(uint timer);
void splash_screen_update();
#endif // SPLASH_SCREEN_H
#endif // SPLASH_SCREEN_H

190
source/game.c
View File

@ -2,7 +2,6 @@
#include <maxmod.h>
#include <tonc.h>
#include <string.h>
#include <stdlib.h>
#include "tonc_memdef.h"
@ -15,7 +14,6 @@
#include "joker.h"
#include "affine_background.h"
#include "graphic_utils.h"
#include "tonc_video.h"
#include "audio_utils.h"
#include "selection_grid.h"
#include "splash_screen.h"
@ -25,7 +23,6 @@
#include "background_blind_select_gfx.h"
#include "affine_background_gfx.h"
#include "background_main_menu_gfx.h"
#include "affine_main_menu_background_gfx.h"
#include "soundbank.h"
@ -60,13 +57,42 @@ typedef enum
DISPLAY_BLIND_PANEL
} _BlindSelectStates;
// Used as a No Operation for game states that have no init and/or exit function.
// ricfehr3 did the work of determining whether a noop or a NULL check was more
// efficient. Well, this is the answer.
// Thanks!
static void _noop() {}
static void game_main_menu_init();
static void game_main_menu_update();
static void game_lose_init();
static void game_win_init();
static void game_playing_update();
static void game_round_end_update();
static void game_shop_update();
static void game_blind_select_update();
static void game_lose_update();
static void game_win_update();
static void game_round_init();
static void game_state_shop_exit();
static void game_blind_select_exit();
static void game_round_end_exit();
static uint rng_seed = 0;
static uint timer = 0; // This might already exist in libtonc but idk so i'm just making my own
static int game_speed = 1; // BY DEFAULT IS SET TO 1, but if changed to 2 or more, should speed up all (or most) of the game aspects that should be sped up by speed, as in the original game.
static int background = 0;
static enum GameState game_state = GAME_SPLASH_SCREEN; // The current game state, this is used to determine what the game is doing at any given time
StateInfo states[GAME_STATE_MAX] =
{
#define DEF_STATE_INFO(stateEnum, init_fn, update_fn, exit_fn) \
{ .state = stateEnum, .on_init = init_fn, .on_update = update_fn, .on_exit = exit_fn },
#include "../include/game_state_table.h"
#undef DEF_STATE_INFO
};
static enum GameState game_state = GAME_STATE_SPLASH_SCREEN; // 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 PlayState play_state = PLAY_PLAYING;
static int state = 0; // General state variable, used for switch statements in each game state related function
@ -1210,42 +1236,14 @@ static void game_win_init()
affine_background_set_color(TEXT_CLR_BLUE);
}
static void init_game_state(enum GameState game_state_to_init)
{
// Switch written out, add init for states as needed
switch (game_state_to_init)
{
case GAME_SPLASH_SCREEN:
splash_screen_init();
break;
case GAME_MAIN_MENU:
game_main_menu_init();
break;
case GAME_PLAYING:
game_round_init();
break;
case GAME_ROUND_END:
break;
case GAME_SHOP:
break;
case GAME_BLIND_SELECT:
break;
case GAME_LOSE:
game_lose_init();
break;
case GAME_WIN:
game_win_init();
break;
default:
break;
}
}
// Game functions
void game_set_state(enum GameState new_game_state)
void game_change_state(enum GameState new_game_state)
{
timer = TM_ZERO; // Reset the timer
init_game_state(new_game_state);
states[game_state].on_exit();
states[new_game_state].on_init();
game_state = new_game_state;
}
@ -1282,7 +1280,7 @@ void game_init()
obj_hide(blind_select_tokens[BLIND_TYPE_BIG]->obj);
obj_hide(blind_select_tokens[BLIND_TYPE_BOSS]->obj);
game_set_state(game_state);
game_change_state(game_state);
}
void game_start()
@ -1325,7 +1323,7 @@ void game_start()
tte_printf("#{P:%d,%d; cx:0x%X000}%d#{cx:0x%X000}/%d", ANTE_TEXT_RECT.left, ANTE_TEXT_RECT.top, TTE_YELLOW_PB, ante, TTE_WHITE_PB, MAX_ANTE); // Ante
game_set_state(GAME_BLIND_SELECT);
game_change_state(GAME_STATE_BLIND_SELECT);
}
static void game_playing_process_hand_select_input()
@ -1505,7 +1503,7 @@ static bool game_round_is_over()
static void game_playing_handle_round_over()
{
enum GameState next_state = GAME_ROUND_END;
enum GameState next_state = GAME_STATE_ROUND_END;
if (score >= blind_get_requirement(current_blind, ante))
{
@ -1517,16 +1515,16 @@ static void game_playing_handle_round_over()
}
else
{
next_state = GAME_WIN;
next_state = GAME_STATE_WIN;
}
}
}
else if (hands == 0)
{
next_state = GAME_LOSE;
next_state = GAME_STATE_LOSE;
}
game_set_state(next_state);
game_change_state(next_state);
}
static void game_playing_discarded_cards_loop()
@ -1568,6 +1566,8 @@ static void game_playing_discarded_cards_loop()
if (discard_top == -1 && discarded_card_object == NULL) // If there are no more discarded cards, stop shuffling
{
// After HAND_SHUFFLING the round is over
// TODO: Add call to change state here
// after adding on_exit
game_playing_handle_round_over();
}
}
@ -2124,7 +2124,7 @@ static void game_round_end_cashout()
display_score(score); // Set the score display
}
void game_playing()
static void game_playing_update()
{
// Background logic (thissss might be moved to the card'ssss logic later. I'm a sssssnake)
if (hand_state == HAND_DRAW || hand_state == HAND_DISCARD || hand_state == HAND_SELECT)
@ -2154,20 +2154,22 @@ void game_playing()
game_playing_ui_text_update();
}
void game_round_end_cleanup()
static void game_round_end_exit()
{
// Cleanup blind tokens from this round to avoid accumulating
// allocated blind sprites each round
timer = 0;
state = 0;
sprite_destroy(&playing_blind_token);
sprite_destroy(&round_end_blind_token);
// TODO: Reuse sprites for blind selection?
}
void game_round_end()
static void game_round_end_update()
{
static int blind_reward = 0;
static int hand_reward = 0;
static int interest_reward = 0;
static int interest_reward = 0;
switch (state)
{
@ -2416,8 +2418,7 @@ void game_round_end()
blind_reward = 0;
hand_reward = 0;
interest_reward = 0;
game_round_end_cleanup();
game_set_state(GAME_SHOP);
game_change_state(GAME_STATE_SHOP);
break;
}
}
@ -2841,7 +2842,7 @@ static void game_shop_outro()
}
}
void game_shop()
static void game_shop_update()
{
change_background(BG_ID_SHOP);
@ -2880,29 +2881,32 @@ void game_shop()
break;
}
default:
state = 0; // Reset the state
for (int i = 0; i < list_get_size(shop_jokers); i++)
{
JokerObject* joker_object = list_get(shop_jokers, i);
if (joker_object != NULL)
{
// Make the joker available back to shop
int_list_append(jokers_available_to_shop, (intptr_t)joker_object->joker->id);
}
joker_object_destroy(&joker_object); // Destroy the joker objects
}
list_destroy(&shop_jokers);
increment_blind(BLIND_STATE_DEFEATED); // TODO: Move to game_round_end()?
game_set_state(GAME_BLIND_SELECT); // If we reach here, we should go to the blind select state
game_change_state(GAME_STATE_BLIND_SELECT); // If we reach here, we should go to the blind select state
break;
}
}
void game_blind_select()
static void game_state_shop_exit()
{
state = 0; // Reset the state
for (int i = 0; i < list_get_size(shop_jokers); i++)
{
JokerObject* joker_object = list_get(shop_jokers, i);
if (joker_object != NULL)
{
// Make the joker available back to shop
int_list_append(jokers_available_to_shop, (intptr_t)joker_object->joker->id);
}
joker_object_destroy(&joker_object); // Destroy the joker objects
}
list_destroy(&shop_jokers);
increment_blind(BLIND_DEFEATED); // TODO: Move to game_round_end()?
}
static void game_blind_select_update()
{
switch (state) // I'm only using magic numbers here for the sake of simplicity since it's just sequential, but you can replace them with named constants or enums if it makes it clearer
{
@ -3057,16 +3061,20 @@ void game_blind_select()
break;
}
default:
state = 0;
timer = TM_ZERO;
selection_y = 0;
background = UNDEFINED;
game_set_state(GAME_PLAYING);
game_change_state(GAME_STATE_PLAYING);
break;
}
}
void game_main_menu()
static void game_blind_select_exit()
{
state = 0;
timer = 0;
selection_y = 0;
background = UNDEFINED;
}
static void game_main_menu_update()
{
change_background(BG_ID_MAIN_MENU);
@ -3167,7 +3175,7 @@ static void game_over_anim_frame()
main_bg_se_move_rect_1_tile_vert(GAME_OVER_ANIM_RECT, SE_UP);
}
static void game_lose()
static void game_lose_update()
{
if (timer < GAME_OVER_ANIM_FRAMES)
{
@ -3179,7 +3187,7 @@ static void game_lose()
}
}
static void game_win()
static void game_win_update()
{
if (timer < GAME_OVER_ANIM_FRAMES)
{
@ -3197,31 +3205,5 @@ void game_update()
jokers_update_loop();
switch (game_state)
{
case GAME_SPLASH_SCREEN:
splash_screen_update(timer);
break;
case GAME_MAIN_MENU:
game_main_menu();
break;
case GAME_PLAYING:
game_playing();
break;
case GAME_ROUND_END:
game_round_end();
break;
case GAME_SHOP:
game_shop();
break;
case GAME_BLIND_SELECT:
game_blind_select();
break;
case GAME_LOSE:
game_lose();
break;
case GAME_WIN:
game_win();
break;
}
states[game_state].on_update();
}

9
source/splash_screen.c
View File

@ -6,6 +6,7 @@
#include "game.h"
static const Rect COUNTDOWN_TIMER_RECT = {208, 144, 240, 152};
static uint timer = 0;
void splash_screen_init()
{
@ -14,8 +15,10 @@ void splash_screen_init()
tte_printf("#{P:8,144; cx:0xF000}(Press any key to skip)");
}
void splash_screen_update(uint timer)
void splash_screen_update()
{
timer++;
if (timer < SPLASH_DURATION_FRAMES)
{
tte_erase_rect_wrapper(COUNTDOWN_TIMER_RECT);
@ -27,6 +30,6 @@ void splash_screen_update(uint timer)
}
}
game_set_state(GAME_MAIN_MENU);
game_change_state(GAME_STATE_MAIN_MENU);
tte_erase_screen();
}
}