Nan
35c0d383c5
Add blueprint and brainstorm jokers
...
Implements blueprint and brainstorm to the game, but leaves the implementations commented out as they are still missing assets.
2025-09-13 22:18:31 +02:00
cellos51
f4d8fc9097
Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects and changed parameters on affine source to be updated from experimental branch
2025-08-28 22:39:48 -04:00
cellos51
c41fcd1a24
Remove unused definition for maximum background palette size
2025-08-28 19:04:51 -04:00
cellos51
bc32707126
replaced magic numbers for background palette size
2025-08-28 16:09:46 -04:00
cellos51
6e2d3ee499
Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects
2025-08-25 19:34:25 -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
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
7f5ed5433f
Win screen + Game over animation with hand discard
2025-08-21 23:33:51 +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
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
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
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
MeirGavish
f66e296989
Merge branch 'main' into hblank_affine_background_effects
2025-08-12 17:24:14 +03:00
MeirGavish
5ba0b1034b
Comment clarification
2025-08-12 01:07:20 +03:00
MeirGavish
b043b82d3f
Optimized affine background HBLANK effect - improved but still not good enough
2025-08-12 00:06:04 +03: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
cellos51
521b373bd2
Added new background visuals
2025-08-09 13:52:24 -04:00
MeirGavish
3441a1dae8
Joker pooling - Existing or owned jokers can't appear in shop + shop code refactor
2025-08-09 20:48:18 +03:00
MeirGavish
9d4b6a04b8
Merge branch 'main' into joker_pooling
2025-08-09 06:19:16 +03:00
TheBreadPerson
6007071b7d
Complete refactor of naming conventions for memcpy
2025-08-08 14:04:09 -04:00
cellos51
6363613f15
Added & back to the tile8_mem in affine_background_init() and changed memcpy16 to 32
2025-08-08 10:44:55 -04:00
cellos51
650c09af28
Converted void to u16 in functions
2025-08-08 09:54:24 -04:00
MeirGavish
31ba1f166c
Added some documentation for affine_background_load_palette()
2025-08-08 15:03:18 +03:00
MeirGavish
ecbfd97de1
Added some documentation to memcpy16_tile8_with_palette_offset()
2025-08-08 14:47:45 +03:00
cellos51
12ca27e27b
Removed default color for affine background and changed to load palette from image instead
2025-08-08 00:32:30 -04:00
cellos51
3c79a35b92
Redefined affinge background default color to use RGB15 and reverted grayscale of background image
2025-08-08 00:22:04 -04:00
cellos51
bebe2237e4
Add memcpy16_tile8_with_palette_offset function and update affine_background_init to use it
2025-08-08 00:00:20 -04:00
cellos51
01d7ed8e91
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
2025-08-07 21:34:46 -04:00
MeirGavish
fd8e52d48a
Removed magic numbers for card score length and intmax buffer sizes
2025-08-08 01:59:21 +03:00
MeirGavish
2ce3acbe1c
Merge branch 'main' into jokers_with_graphics
2025-08-08 00:32:10 +03:00
MeirGavish
5e6d28c663
Fixed stack top bugs in joker_effects.c - e.g. Blackboard activated if just the first card in hand was not spades/clubs
2025-08-08 00:01:36 +03:00
MeirGavish
50ec1bcdab
Added art by @GreenNinja2525 for jokers Walkie-Talkie, Fibonacci, Banner, Mystic Summit, and Blackboard
2025-08-07 23:08:35 +03:00
MeirGavish
f84268c14d
Added int list for joker pooling
2025-08-07 19:47:55 +03:00
cellos51
592d7ae8bc
Add affine background color functionality and integrate into game loop
2025-08-05 14:35:52 -04:00
MeirGavish
8956501591
Merge branch 'main' into jokers_palette_swapping
2025-08-04 10:21:19 +03:00
MeirGavish
de672572b1
Updated joker palette swapping system to reuse palettes when jokers are removed
2025-08-04 10:18:33 +03:00
MeirGavish
e7b6d24815
Merge pull request #76 from cellos51/move_shop_price_down
...
Moved the price of shop items below the item so it is not obstructed when the card is raised on highlight
2025-08-03 16:10:20 +03:00
MeirGavish
a8f429eca3
Moved the price of shop items below the item so it is not obstructed when the card is raised on highlight
2025-08-03 16:08:41 +03:00
Nan