Commit Graph
531 Commits
Author SHA1 Message Date
EllipticalandMeirGavish 94821ffa27 Update source/game.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-08-25 16:15:07 -04:00
EllipticalandMeirGavish 21d85f49ab Update source/main.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-08-25 16:14:51 -04:00
MeirGavish 5e4722e27b Merge pull request #109 from GreenNinja2525/main
README.md Rework with Custom Badges
2025-08-25 21:13:00 +03:00
Wheeler cb66b30795 Remove Forks and Stars badges 2025-08-25 12:54:37 -04:00
Wheeler dda6585935 Minor Text Tweak
Fixed some unclear wording and fixed some formatting.
2025-08-25 08:06:29 -04:00
Wheeler ab8a143eeb Minor Text issues
Just had to fix some little things.
2025-08-25 08:00:18 -04:00
Wheeler 5dbc50d755 Scale Gif and Add Balatro Wiki Badge
Makes it easier to find the Wiki (the one I use) and the gif is now properly appearing and scaling. The Gif is a little blurry, but I don't know how to fix that and if it bothers too many people I'll just revert it.
2025-08-25 07:55:59 -04:00
Wheeler ba36679a3b Add New Gameplay Gif
New Gif shows a Joker being used and shows the shop screen as well as a round that is won by a straight.
2025-08-25 07:32:44 -04:00
Wheeler 9ab2fef330 Remove Watchers Badge
I felt it was unnecessary and caused some bloat. I think the others are much more important than how many watchers there are.
2025-08-24 20:27:27 -04:00
Wheeler 387bbbfda0 Add Icons to Badges, Remove Linux Instructions Section
I spaced out some of the steps to be easier to read. The dynamic badges should be dynamic and update periodically. I may have to fix them another time. They should update every few hours. The Common issues part was also adjusted and I removed the Linux part as it took up unnecessary space. Unless someone figures out build instructions for Linux, they won't be featured.
2025-08-24 20:23:08 -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
Wheeler 06087370a1 Add Dynamic Badges and more small tweaks
There is now 6 dynamic badges that will update accordingly when something changes. They may take a few minutes to properly update but are solely aimed to make the README more interesting to look at. I also made some small layout adjustments.
2025-08-22 23:56:25 -04:00
Wheeler 8a50940f48 Add Controls, minor tweaks and shorten Xbox Logo URL
I figured out how to make the Xbox logo use a smaller URL instead of drawing a full SVG, it now fetches a slug (SVG hosted on another site) to draw the button. This is faster and looks better code wise.
2025-08-22 23:05:52 -04:00
Wheeler e86777b4cc Add Cool Link Buttons to README.md
Don't merge yet, I'm still adding stuff to the Readme and tweaking some things. It will all make sense and look much better when I'm done.
2025-08-22 20:30:00 -04:00
MeirGavish ff9c28cbed Merge branch 'main' into hblank_affine_background_effects 2025-08-22 20:16:26 +03:00
MeirGavish 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
MeirGavish ff54bb244f Merge pull request #108 from cellos51/smiley_scary_face
Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code
2025-08-22 19:55:46 +03:00
MeirGavish 1d070b9c3f Fixed Blue Joker shine 2025-08-22 19:47:56 +03: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 c5488fb008 Merge pull request #106 from GreenNinja2525/main
Update Blue Joker and Fix Greedy Joker's Outline
2025-08-22 18:41:43 +03:00
MeirGavish 76f225168a Additional change for Blue Joker 2025-08-22 18:28:00 +03:00
Wheeler 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
Wheeler 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
Wheeler 593901e981 Delete joker_gfx12.png (I messed up whoops) 2025-08-21 21:08:23 -04:00
Wheeler d09d0a2ee8 Update Blue Joker
Add Card Shine and adjust Neck Thing, I think it looks better than before.
2025-08-21 21:06:15 -04:00
MeirGavish 5e93a95d03 Merge pull request #105 from cellos51/game_over_screen
Game over (and win) screen
2025-08-22 02:10:07 +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 7bbaec261b Merge branch 'main' into game_over_screen 2025-08-19 13:33:20 +03:00
MeirGavish 9164fba996 Even Steven card corner fix 2025-08-17 14:51:04 +03:00
MeirGavish 1b9785bc1f Sly Joker card corner fix 2025-08-17 13:42:56 +03:00
MeirGavish c3f9f57e7f Merge pull request #74 from theturtlemafia/ttm/joker-scope-joker-1
Adds Blue Joker, Even Steven, Odd Todd, Scholar, Business Card and unused code for jokers without sprites Raised Fist, Reserved Parking, Scary Face, Abstract Joker, Bull, and Smiley Face
2025-08-17 12:46:46 +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 8524a78271 Merge pull request #102 from cellos51/joker_selling
Joker Selling
2025-08-17 10:57:38 +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 bc8847d2cb Merge branch 'main' into joker_selling 2025-08-16 12:41:38 +03:00