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

changed how game_speed affects hand score animations

Browse Source
This commit is contained in:
alex
2025-10-13 20:24:20 -07:00
parent 56c33b2eef
commit d108836b6a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game.c
+6 -6
View File
@@ -32,7 +32,7 @@
static uint rng_seed = 0; 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 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 game_speed = 3; // 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 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 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
@@ -188,9 +188,9 @@ int get_game_speed(void)
} }
// for the future when a menu actually lets this variable be changed. // for the future when a menu actually lets this variable be changed.
void set_game_speed(int game_speed_) void set_game_speed(int new_game_speed)
{ {
game_speed = game_speed_; game_speed = new_game_speed;
} }
@@ -1279,7 +1279,7 @@ static void game_playing_process_input_and_state()
if (mult > 0) if (mult > 0)
{ {
temp_score = chips * mult; temp_score = chips * mult;
lerped_temp_score = fxdiv(FIX_ONE, int2fx(game_speed)) * temp_score;; // game speed affects how fast the score text increases. lerped_temp_score = int2fx(temp_score); // game speed affects how fast the score text increases.
lerped_score = int2fx(score); lerped_score = int2fx(score);
display_temp_score(temp_score); display_temp_score(temp_score);
@@ -1292,8 +1292,8 @@ static void game_playing_process_input_and_state()
} }
else if (play_state == PLAY_ENDED) else if (play_state == PLAY_ENDED)
{ {
lerped_temp_score -= int2fx(temp_score) / 40; lerped_temp_score -= int2fx(temp_score * get_game_speed())/ 40;
lerped_score += int2fx(temp_score) / 40; lerped_score += int2fx(temp_score* get_game_speed()) / 40;
if (lerped_temp_score > 0) if (lerped_temp_score > 0)
{ {
source/joker.c
+1 -1
View File
@@ -83,7 +83,7 @@ static int get_unused_joker_pb()
} }
static int allocate_pb_if_needed(u8 joker_id) static int allocate_pb_if_needed(u8 joker_id)
{ {
int joker_spritesheet_idx = joker_get_spritesheet_idx(joker_id); int joker_spritesheet_idx = joker_get_spritesheet_idx(joker_id);
int joker_pb = joker_spritesheet_pb_map[joker_spritesheet_idx]; int joker_pb = joker_spritesheet_pb_map[joker_spritesheet_idx];
if (joker_pb != UNDEFINED) if (joker_pb != UNDEFINED)
source/sprite.c
+2 -2
View File
@@ -158,8 +158,8 @@ void sprite_object_reset_transform(SpriteObject* sprite_object)
void sprite_object_update(SpriteObject* sprite_object) void sprite_object_update(SpriteObject* sprite_object)
{ {
sprite_object->vx += ((sprite_object->tx - sprite_object->x) * get_game_speed()) / 8; // SPEED sprite_object->vx += ((sprite_object->tx - sprite_object->x) * get_game_speed()) / 8;
sprite_object->vy += ((sprite_object->ty - sprite_object->y) * get_game_speed()) / 8; sprite_object->vy += ((sprite_object->ty - sprite_object->y) * get_game_speed()) / 8;
sprite_object->vscale += (sprite_object->tscale - sprite_object->scale) / 8; // Scale up the card when it's played sprite_object->vscale += (sprite_object->tscale - sprite_object->scale) / 8; // Scale up the card when it's played