diff --git a/source/game.c b/source/game.c index 9ecf87d..e772c3d 100644 --- a/source/game.c +++ b/source/game.c @@ -242,9 +242,9 @@ static const Rect HAND_REWARD_RECT = {168, UNDEFINED, UNDEFINED, UN static const Rect CASHOUT_RECT = {88, 72, UNDEFINED, UNDEFINED }; static const Rect SHOP_REROLL_RECT = {88, 96, UNDEFINED, UNDEFINED }; -//TODO: Properly define and use #define MAIN_MENU_BUTTONS 4 +//TODO: Properly define and use #define MENU_POP_OUT_ANIM_FRAMES 20 #define SCORED_CARD_TEXT_Y 48 @@ -938,9 +938,6 @@ void increment_blind(enum BlindState increment_reason) void game_round_init() { - // once we have a main menu, move the seed set there. this is only here now because there isn't a way to set the seed to a psudorandom value unless there is something to wait on - set_seed(rng_seed); - hand_state = HAND_DRAW; cards_drawn = 0; hand_selections = 0; diff --git a/source/main.c b/source/main.c index daa32a7..e1b1643 100644 --- a/source/main.c +++ b/source/main.c @@ -18,8 +18,9 @@ #include "soundbank.h" #include "soundbank_bin.h" -#define FPS (60) -#define SPLASH_DURATION (FPS * 10) // FPS * SECONDS +#define SPLASH_FPS 60 +#define SPLASH_DURATION_SECONDS 10 +#define SPLASH_DURATION_FRAMES (SPLASH_FPS * SPLASH_DURATION_SECONDS) void init() { @@ -74,7 +75,7 @@ void init() tte_printf("#{P:72,8; cx:0xF000}DISCLAIMER"); tte_printf("#{P:8,24; cx:0xF000}This project is NOT endorsed \n by or affiliated with \n Playstack or LocalThunk.\n\n If you have paid for this, \n you have been scammed \n and should request a refund \n IMMEDIATELY. \n\n The only official place \n to obtain this is from: \n\n 'github.com/\n cellos51/balatro-gba'"); tte_printf("#{P:8,144; cx:0xF000}(Press any key to skip)"); - for (int i = 0; i < SPLASH_DURATION; i++) + for (int i = 0; i < SPLASH_DURATION_FRAMES; i++) { VBlankIntrWait(); key_poll(); @@ -83,7 +84,7 @@ void init() break; } tte_erase_rect_wrapper((Rect){208, 144, 240, 152}); - tte_printf("#{P:208,144; cx:0xF000}%d", 1 + (SPLASH_DURATION - i) / FPS); + tte_printf("#{P:208,144; cx:0xF000}%d", 1 + (SPLASH_DURATION_FRAMES - i) / SPLASH_FPS); } tte_erase_screen();