Commit Graph

445 Commits

Author SHA1 Message Date
Elliptical
06ca593e8a Update source/game.c
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-08-25 18:06:35 -04:00
cellos51
8fafcd1cdf Reduced amount of menu buttons 2025-08-25 17:52:27 -04:00
cellos51
b9b87a7b30 Refactor countdown timer rectangle usage in splash screen for improved readability 2025-08-25 17:50:16 -04:00
cellos51
7b2fc1ac75 Refactor main menu button color definitions for clarity and consistency 2025-08-25 16:59:10 -04:00
Elliptical
94821ffa27 Update source/game.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-08-25 16:15:07 -04:00
Elliptical
21d85f49ab Update source/main.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-08-25 16:14:51 -04:00
cellos51
4f1f7cb347 Add splash screen functionality and update game state management
- Introduced GAME_SPLASH_SCREEN state in game.h
- Implemented splash_screen_init and splash_screen_update functions in splash_screen.c
- Updated game.c to initialize with GAME_SPLASH_SCREEN and handle splash screen updates
- Removed old splash screen code from main.c
2025-08-24 15:44:45 -04:00
cellos51
da6248036c Remove unnecessary joker initialization in game_start and set game state to GAME_BLIND_SELECT 2025-08-24 13:47:59 -04:00
cellos51
53e6156397 Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen 2025-08-24 13:47:41 -04:00
MeirGavish
2d50005e30 Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code 2025-08-22 19:43:27 +03:00
MeirGavish
3be49b1d80 Removed old comment 2025-08-22 02:09:24 +03:00
MeirGavish
854c52464f Small refactor - extracted helper functiosn for main_bg_se_copy_expand_3x3_rect() 2025-08-22 00:37:02 +03:00
MeirGavish
7f5ed5433f Win screen + Game over animation with hand discard 2025-08-21 23:33:51 +03:00
MeirGavish
a707927b2f Refactor - extracted card_in_hand_loop_handle_discard_and_shuffling() from cards_in_hand_update_loop() 2025-08-21 19:07:02 +03:00
MeirGavish
c4b538c009 Basic game over screen + added main_bg_se_copy_expand_3x3_rect() 2025-08-19 21:40:40 +03:00
MeirGavish
5a70b002a9 graphic_utils refactors - renamed functions, optimized some code, used Tonc defines 2025-08-19 18:33:47 +03:00
MeirGavish
065d846ac7 Used text red color for game over background 2025-08-19 17:59:26 +03:00
MeirGavish
42a0e94afd Refactor - Added defines for text colors and used them in all usses of tte_printf 2025-08-19 17:47:24 +03:00
MeirGavish
6d6bb39c97 Affine background now turns red on game over + other WIP changes for game over screen 2025-08-19 16:31:32 +03:00
MeirGavish
46141090a0 Added joker sprites by @GreenNinja2525 for Blue Joker, Even Steven, Odd Todd, Scholar and Business Card. Disabled jokers with no sprites. 2025-08-17 12:36:20 +03:00
MeirGavish
2539954dea Fixed build error from previous merge and applied review comments 2025-08-17 11:10:00 +03:00
MeirGavish
04515839dc (Manual conflict res) merged main into ttm/joker-scope-joker-1 2025-08-17 11:03:27 +03:00
MeirGavish
376309a9ef (Manual conflict res on game.c) Merged main into ttm/joker-scop-1 2025-08-17 10:37:03 +03:00
MeirGavish
947fac7358 Added joker selling animation 2025-08-16 21:33:23 +03:00
MeirGavish
64274ae465 Added joker selling (still no animation) + fixed SpriteObject constructor focused bug 2025-08-16 15:38:34 +03:00
MeirGavish
92fa279059 Refactored jokers stack to be a list (AI used) 2025-08-16 13:18:44 +03:00
MeirGavish
b63559862f renamed int_list.c to list.c 2025-08-16 12:41:11 +03:00
MeirGavish
ae019be190 Fixed shop initial selection to be visible + extracted shop outro 2025-08-16 06:41:33 +03:00
MeirGavish
168e34375d Refactored shop_jokers to use list so purchased jokers can't be selected 2025-08-15 21:32:10 +03:00
MeirGavish
2a4f045db6 Refactored list code to be generic void* list 2025-08-15 20:03:17 +03:00
MeirGavish
d1677e82d2 Added Selection Grid system and refactored shop code to use it 2025-08-15 19:30:07 +03:00
MeirGavish
b218d4ac3e (Manual conflict res) Merge branch 'main' into ttm/joker-scope-joker-1 2025-08-15 10:56:41 +03:00
MeirGavish
06dc4f9c62 Extracted focus to SpriteObject for joker selling - WIP 2025-08-15 10:38:20 +03:00
cellos51
5d0ea3a101 Changed formatting on github link 2025-08-12 21:42:44 -04:00
cellos51
4c5c0f4d40 Removed rng set in game_round_init() and updated defines for splash screen 2025-08-12 20:55:03 -04:00
cellos51
abfcb68f75 Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen 2025-08-12 20:53:31 -04:00
MeirGavish
f66e296989 Merge branch 'main' into hblank_affine_background_effects 2025-08-12 17:24:14 +03:00
MeirGavish
0e080b916e Reverted removals of float2fx() as they're compiler-optimized but kept float optimization 2025-08-12 11:40:22 +03:00
MeirGavish
658b0572d9 Removed all uses of float for optimization 2025-08-12 03:01:02 +03:00
MeirGavish
05af8217ff Small affine background CBB/SBB fix 2025-08-12 01:59:04 +03:00
MeirGavish
b043b82d3f Optimized affine background HBLANK effect - improved but still not good enough 2025-08-12 00:06:04 +03:00
cellos51
f2497a1284 fixed boss blind background being too dark 2025-08-10 16:34:47 -04:00
cellos51
7505d89194 Addec count down timer to splash screen and stopped music playing until at menu 2025-08-10 13:11:05 -04:00
cellos51
7d2be834a3 Splash screen with disclaimer added 2025-08-10 13:00:38 -04:00
cellos51
c5ff984e84 Added copliot's changes 2025-08-10 12:09:59 -04:00
cellos51
dcf892a393 Moved seed calculation into main_menu state 2025-08-10 12:04:06 -04:00
cellos51
d2aee1979b Reverted game over logic 2025-08-10 11:59:35 -04:00
cellos51
d20b5c5ce4 Buggy restarting 2025-08-09 23:18:52 -04:00
cellos51
164f58aa1e Main menu prototype 2025-08-09 21:49:37 -04:00
theturtlemafia
254efd7841 implement feedback 2025-08-09 19:23:47 -04:00