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

Merge branch 'main' into graphic_changes

Browse Source
This commit is contained in:
MeirGavish
2025-06-30 13:26:10 +03:00
parent b04b69e117 f476b5efe9
commit 3ead483367
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/game.h
+1
View File
@@ -4,6 +4,7 @@
#define MAX_HAND_SIZE 16
#define MAX_DECK_SIZE 52
#define MAX_SELECTION_SIZE 5
#define FRAMES(x) (((x) + game_speed - 1) / game_speed)
// TODO: Turn into enum?
#define BG_ID_CARD_SELECTING 1
source/game.c
+11 -10
View File
@@ -15,6 +15,7 @@
#include "soundbank.h"
static int timer = 1; // This might already exist in libtonc but idk so i'm just making my own
static int game_speed = 1;
static int background = 0;
static enum GameState game_state = GAME_PLAYING;
@@ -679,7 +680,7 @@ static void game_playing_process_card_draw()
{
if (hand_state == HAND_DRAW && cards_drawn < hand_size)
{
if (timer % 10 == 0) // Draw a card every 10 frames
if (timer % FRAMES(10) == 0) // Draw a card every 10 frames
{
cards_drawn++;
card_draw();
@@ -695,7 +696,7 @@ static void game_playing_process_card_draw()
static void game_playing_discarded_cards_loop()
{
if (hand_get_size() == 0 && hand_state == HAND_SHUFFLING && discard_top >= -1 && timer > 10)
if (hand_get_size() == 0 && hand_state == HAND_SHUFFLING && discard_top >= -1 && timer > FRAMES(10))
{
// We take each discarded card and put it back into the deck with a short animation
static CardObject* discarded_card_object = NULL;
@@ -833,7 +834,7 @@ static void cards_in_hand_update_loop(bool* discarded_card, int* played_selectio
hand_x = hand_x + (int2fx(i) - int2fx(hand_top) / 2) * -spacing_lut[hand_top];
}
if (i == 0 && *discarded_card == false && timer % 10 == 0)
if (i == 0 && *discarded_card == false && timer % FRAMES(10) == 0)
{
hand_state = HAND_DRAW;
*sound_played = false;
@@ -848,7 +849,7 @@ static void cards_in_hand_update_loop(bool* discarded_card, int* played_selectio
hand_x = hand_x + (int2fx(i) - int2fx(hand_top) / 2) * -spacing_lut[hand_top];
hand_y += (24 << FIX_SHIFT);
if (hand[i]->selected && timer % 10 == 0)
if (hand[i]->selected && timer % FRAMES(10) == 0)
{
hand[i]->selected = false;
played_push(hand[i]);
@@ -867,7 +868,7 @@ static void cards_in_hand_update_loop(bool* discarded_card, int* played_selectio
timer = 1;
}
if (i == 0 && timer % 10 == 0)
if (i == 0 && timer % FRAMES(10) == 0)
{
hand_state = HAND_PLAYING;
cards_drawn = 0;
@@ -1056,7 +1057,7 @@ static void played_cards_update_loop(bool* discarded_card, int* played_selection
switch (play_state)
{
case PLAY_PLAYING:
if (i == 0 && (timer % 10 == 0 || played[played_top - *played_selections]->selected == false) && timer > 40)
if (i == 0 && (timer % FRAMES(10) == 0 || played[played_top - *played_selections]->selected == false) && timer > FRAMES(40))
{
(*played_selections)--;
@@ -1073,7 +1074,7 @@ static void played_cards_update_loop(bool* discarded_card, int* played_selection
}
break;
case PLAY_SCORING:
if (i == 0 && (timer % 30 == 0) && timer > 40)
if (i == 0 && (timer % FRAMES(30) == 0) && timer > FRAMES(40))
{
// So pretend "played_selections" is now called "scored_cards" and it counts the number of cards that have been scored
int scored_cards = 0;
@@ -1125,7 +1126,7 @@ static void played_cards_update_loop(bool* discarded_card, int* played_selection
}
break;
case PLAY_ENDING: // This is the reverse of PLAY_PLAYING. The cards get reset back to their neutral position sequentially
if (i == 0 && (timer % 10 == 0 || played[played_top - *played_selections]->selected == false) && timer > 40)
if (i == 0 && (timer % FRAMES(10) == 0 || played[played_top - *played_selections]->selected == false) && timer > FRAMES(40))
{
(*played_selections)--;
@@ -1142,7 +1143,7 @@ static void played_cards_update_loop(bool* discarded_card, int* played_selection
}
break;
case PLAY_ENDED: // Basically a copy of HAND_DISCARD
if (!*discarded_card && played[i] != NULL && timer > 40)
if (!*discarded_card && played[i] != NULL && timer > FRAMES(40))
{
played_x = int2fx(240);
played_y = int2fx(70);
@@ -1255,7 +1256,7 @@ void game_playing()
void game_round_end()
{
const int timer_delay = 30; // 30 frames = 500ms
const int timer_delay = FRAMES(30); // 30 frames = 500ms
if (timer > timer_delay)
{