5cf9e2674d
Implement arbitrary-sized joker spritesheets ( #285 )
...
* Convert static joker sprites indexes to maps for dynamic spritesheets size
* tmp commit
* reorder Joker spritesheets
* more reordering
* Joker maps, will test later
* More reorders and palette optimizations. Sprites now work
* Fix Joker gfx
* Format joker.c
* Fix rebase error
* Integrate Shoot the Moon art
* format
* format
* removing useless GBAL_UNUSED from photograph Joker effect func
* Tidy up joker.c variables formatting
* Fix magic number
* Add context for map in joker.c
Co-authored-by: Rickey <ric@rf3.xyz >
* Update source/joker.c
Co-authored-by: Rickey <ric@rf3.xyz >
* Apply suggestion from @ricfehr3
Co-authored-by: Rickey <ric@rf3.xyz >
* format
* reduce clutter in joker_effects.c file by defining a macro for forward static declarations of joker effect funcs
* refactored some maps in joker.c to make it more concise
* clang format
* adding back how to mark functions as unused when Jokers don't have a sprite yet
* format
* Remove comment about unused functions for Jokers without art
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
Co-authored-by: Rickey <ric@rf3.xyz >
2026-03-28 17:58:05 -07:00
b292d227f9
Fix round start top left blind panel animation background ( #377 )
...
* Refactored helper sides copying code in expand 3x3 code
* Implemented main_bg_se_copy_expand_3w_row()
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2026-01-31 08:13:54 +02:00
97bf8b3efd
Added sort by rank/suit buttons ( #351 )
...
* Added definitions for sorting buttons (cherry pick, does not compile)
* Re-applied changes lost in merge
* Added sort buttons functionality (cherry-pick, has issues)
* Fixed sort buttons issue
* Removed stray code from merge
* clang-format
* Removed code from merge error
* Removed unused function from merge error
* Removed "E" typo from "SUIT" button
* Changed all the 2x5 S's in the UI to be 1 pixel wider at 3x5
* Revert "Changed all the 2x5 S's in the UI to be 1 pixel wider at 3x5"
This reverts commit f70e0d5ab76dd851c564672c01ab60cd25c28b63.
* Changed the width of the "SUIT" button to be consistent with the "RANK" button
2026-01-24 10:06:51 +02:00
bb82ab69af
Encoded palette indexing in background pngs ( #350 )
2026-01-15 17:09:04 -08:00
687d77e18a
Improve Face Cards sprite art ( #284 )
...
* Tweaks by @MeirGavish
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-12-06 16:33:23 +02:00
43d837571e
Truncate Scores ( #269 )
...
* Fixed score truncation erasure, and centering for chips, mult, score and "temp score
* Added centering for money
* Added tests for truncate_uint_to_suffixed_str()
* Fixed u32 bug with get_digits
* Fixed score flames for large numbers
* Small change to update documentation
* Added 1 pixel on to score rect on the left to make room for full character tile + reset_top_left_panel_bottom_row() refactor
* Replaced directional defines with enums
* Updated ante_lut comment
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-12-02 08:28:36 +02:00
07cab81ba1
Fix Wrathful Joker missing pixel ( #272 )
...
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-12-01 09:34:30 +02:00
2d7394f03e
Fixed corners for Banner joker ( #271 )
2025-11-30 17:57:05 +02:00
0953a430c4
Implement Seltzer and Joker Expiration effect ( #252 )
...
* Add Seltzer art
* Implement Joker expiration
* Add exception to copying Jokers + Seltzer message fix
* Move all scoring logic to joker_object_score away from check_and_score_joker_for_event
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-30 08:52:42 +02:00
f3f375cef1
Banner Joker art update by @GreenNinja2525 ( #242 )
2025-11-16 20:18:14 +02:00
28043bd7ca
Integrated Photograph joker art by @MathisMartin31
2025-11-12 14:11:16 +02:00
e7eaa82c9d
Add flaming effect when exceeding score requirements ( #210 )
...
* Fix grit palette swapping
* Add suggestions from @MeirGavish
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-04 12:31:09 +02:00
df674a73a6
Iterate over Hanging Chad"s art by @MeirGavish ( #209 )
...
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-03 09:34:18 +02:00
247d1339c0
Update Hanging Chad art ( #207 )
2025-11-03 08:42:10 +02:00
ada2650c50
New Run Button ( #206 )
...
* New Run Button
* Refactor - replaced cashout copies with main_bg_se_copy_expand_3x3_rect() - WIP (Palette still messed)
2025-11-03 07:34:46 +02:00
03273de829
Adds Shortcut and Four Fingers ( #95 )
...
* adds shortcut joker
* adds Four Fingers joker, and combination support for Four Fingers + Shortcut
---------
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-11-01 16:28:40 +02:00
eb815b7820
Refactor of scoring flow, Joker Callbacks and Card Retriggers ( #160 )
...
* Remove Baseball Card for now, will have to wait a future PR
* Removed cards held in hand joker scoring stage - should be in another PR
---------
Co-authored-by: MonteCrysto <mathis.martin31@gmail.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-11-01 15:50:52 +02:00
b472ce2bad
Changed the order of suits to match the original Balatro ( #189 )
2025-10-30 11:18:36 +02:00
ef048791c1
Separate out graphics and add ability change boss
2025-10-13 23:36:27 -07:00
9d1a51884f
Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization)
2025-10-09 23:42:07 +03:00
4b35b2f7d8
Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525
2025-10-08 22:40:15 +03:00
ae40949008
Fixed Bull border corner transparency
2025-10-08 00:18:30 +03:00
a0f1ef7780
Added art for xmult hand jokers The Duo The Trio, The Family, The Order, and The Tribe by @MathisMartin31
2025-10-07 23:52:49 +03:00
c529c4be69
Added art for jokers Abstract Joker by @MathisMartin31 and Bull by @NoWhammies10 and @GreenNinja2525
2025-10-07 21:26:43 +03:00
46936c1878
Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10
2025-10-07 21:13:31 +03:00
4b7a22baff
made all palettes have their length set in grit
2025-08-28 19:03:48 -04:00
8fafcd1cdf
Reduced amount of menu buttons
2025-08-25 17:52:27 -04:00
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
3d3d7198b8
Merge pull request #107 from cellos51/blue_joker_fixes_additional_proposed_changes
...
Additional change for Blue Joker
2025-08-22 19:58:09 +03:00
1d070b9c3f
Fixed Blue Joker shine
2025-08-22 19:47:56 +03:00
2d50005e30
Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code
2025-08-22 19:43:27 +03:00
76f225168a
Additional change for Blue Joker
2025-08-22 18:28:00 +03:00
9d213662b7
Fix Outline of Greedy Joker
...
His outline didn't match the other Sinful Jokers, so I fixed it.
2025-08-21 21:23:22 -04:00
0a47b19493
Update Blue Joker
...
I fixed Blue Joker, it now has the card shine, and more rounded neck thing.
2025-08-21 21:09:15 -04:00
6d6bb39c97
Affine background now turns red on game over + other WIP changes for game over screen
2025-08-19 16:31:32 +03:00
7bbaec261b
Merge branch 'main' into game_over_screen
2025-08-19 13:33:20 +03:00
9164fba996
Even Steven card corner fix
2025-08-17 14:51:04 +03:00
1b9785bc1f
Sly Joker card corner fix
2025-08-17 13:42:56 +03:00
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
3e775f2ac6
Added game over menu tiles to background_gfx.png and removed dedicated background file
2025-08-16 12:27:31 +03:00
ff17883b6f
Merge branch 'main' into game_over_screen
2025-08-16 12:00:32 +03:00
3557e7d34d
Fixed inconsistent joker 'A's and rounded card corners
2025-08-16 10:56:22 +03:00
164f58aa1e
Main menu prototype
2025-08-09 21:49:37 -04:00
fc81c04fbc
Merge pull request #89 from cellos51/graphic_fixes
...
Card corner fixes
2025-08-09 17:39:07 +03:00
3260769023
Card corner fixes
2025-08-09 17:35:17 +03:00
08689d41ea
Revert "Fix "A" in Zany and Wily Joker for consistency"
2025-08-09 08:32:11 +03:00
ab91438a0d
Change "A" in Zany and Wily Joker for consistency
2025-08-08 08:32:12 -04:00
e615588e29
Changed Fibonacci spiral border color to be more like the original
2025-08-08 11:44:16 +03:00
c938310bf7
Transparency fix for joker_gfx6.png
2025-08-08 11:29:19 +03:00
a1c64ef5a6
Added sprite improvements by @GreenNinja2525 for Blackboard, Mystic Summit, and Fibonacci with minor tweaks
2025-08-08 11:24:18 +03:00
Geralt