MeirGavish
71de180871
Merge branch 'main' into implement_joker_testing
2025-10-13 20:59:17 +03:00
MeirGavish
8c25089966
Allow defining an ID for a joker to always appear in shop and be tested
2025-10-13 20:58:44 +03:00
MeirGavish
609e1f19b6
Merge pull request #159 from MathisMartin31/main
...
Add Pareidolia and Acrobat Jokers
2025-10-09 20:43:36 +03:00
MeirGavish
30638b65e2
Merge pull request #164 from ricfehr3/hotfix/hand-input-order
...
Fix softlock related to #163
2025-10-09 15:16:56 +03:00
MeirGavish
94cb898bb9
Merge pull request #134 from drewjohnson2/magic_numbers
...
Magic numbers
2025-10-09 11:18:02 +03:00
Rickey Fehr
73ec9a40d3
Fix softlock related to #163
2025-10-08 20:29:11 -07:00
Drew
f752793caa
Shop light specific macros for color
2025-10-08 16:16:23 -05:00
Drew
4e0d72ca8a
PR Feedback
2025-10-08 01:27:15 -05:00
MonteCrysto
aa5ebd13fc
Add suggestions from @MeirGavish
2025-10-08 08:14:54 +02:00
MonteCrysto
8cd86f1640
Merge remote-tracking branch 'upstream/main'
...
And add NULL Acrobat Joker effect
2025-10-07 20:18:41 +02:00
MonteCrysto
de7c9d4d60
Add a "get_num_hands_remaining" function and implement the Acrobat Joker
2025-09-30 23:06:13 +02:00
MonteCrysto
c781ee9666
Add a "is_card_face" function to take into account if Pareidolia is present
2025-09-30 22:47:00 +02:00
Drew
1f40279a36
Created a define for a screen entry horizontal flip.
2025-09-30 00:09:53 -05:00
Drew
a6dd95ab0a
Added a few more defines
2025-09-28 16:03:04 -05:00
Drew
cc95554db7
Added constants for timer values. The names on these might be bad.
2025-09-28 16:03:04 -05:00
Drew
34d885674c
Finished adding palette memory indexs to an enum
2025-09-28 16:03:04 -05:00
Drew
99ecd424f4
Added enum values for some of the palette bank indexes
2025-09-28 16:03:04 -05:00
Marcel Schnelle
a9f44e74d4
Wrap around hand selection when going out of bounds horizontally
2025-09-21 17:50:51 +09:00
MeirGavish
cc65fbc5de
Small refactor for the joker lists to have wrapping functions to add and remove jokers
2025-08-30 02:15:00 +03:00
cellos51
4b7a22baff
made all palettes have their length set in grit
2025-08-28 19:03:48 -04:00
cellos51
bc32707126
replaced magic numbers for background palette size
2025-08-28 16:09:46 -04:00
Elliptical and Copilot
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
7b2fc1ac75
Refactor main menu button color definitions for clarity and consistency
2025-08-25 16:59:10 -04:00
Elliptical and MeirGavish
94821ffa27
Update source/game.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-08-25 16:15:07 -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
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
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
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
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
658b0572d9
Removed all uses of float for optimization
2025-08-12 03:01:02 +03:00
cellos51
c5ff984e84
Added copliot's changes
2025-08-10 12:09:59 -04:00
MeirGavish