Commit Graph
333 Commits
Author SHA1 Message Date
MeirGavish 46936c1878 Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10 2025-10-07 21:13:31 +03:00
MeirGavish f7c68934f7 Merge pull request #146 from noctowlhoot/main
Added more Jokers all outside of scope, some with art available already from MathisMartin31
2025-10-07 13:01:48 +03:00
MeirGavish 4fc0fbf5a8 Merge pull request #139 from mannodermaus/wrap-hand-input-on-oob-movement
Wrap around hand selection when going out of bounds horizontally
2025-10-07 12:56:53 +03:00
noctowlhootandMeirGavish 0187b5f78e Update source/joker_effects.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-10-07 20:24:00 +10:30
MonteCrysto 0cfe0e5126 Added forgotten base price for the Acrobat Joker 2025-09-30 23:51:46 +02:00
MonteCrysto b7a94fa085 Fix some issues (I actually forgot to compile) 2025-09-30 23:34:11 +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
Rickey Fehr 36bcf0fa30 Move version into C file 2025-09-24 20:44:13 -07:00
noctowlhoot b8a441f971 Update joker_effects.c
updated jokers into joker registry
2025-09-24 22:53:54 +09:30
Rickey Fehr ebe789aa52 Add git hash baked into ROM for bug reports 2025-09-23 16:15:50 -07:00
alex daba462575 fixed a division thingy 2025-09-23 12:45:09 -07:00
alex ad9358547d main 2025-09-23 12:44:03 -07:00
alex f57c37b900 fixed a divison thingy 2025-09-23 12:40:26 -07:00
alex 7bafc260dd fixed game_speed, now using fixed point and keeping game_speed static 2025-09-22 22:04:51 -07:00
Drew e620697917 Renamed joker_table.h to def_joker_gfx_table.h. Removed an unnecessary constant 2025-09-22 16:06:45 -05:00
noctowlhoot 26db4e1aa0 Update joker_effects.c
fixed triboulet - was triggering for jacks also, rem
2025-09-22 21:42:15 +09:30
noctowlhoot 591485a5ac Update joker_effects.c
I was unsure of the significance of the number immediately after joker rarity in the joker registry, so I haven't put the joker effects in there. If anyone can tell me what the significance of that number is I can add them in :)
2025-09-22 20:49:35 +09:30
alex 301f5a2a53 kind of fixed how game_speed behaves 2025-09-21 23:49:24 -07:00
alex 6e60cf5970 kind of fixed how game_speed behaves 2025-09-21 23:16:50 -07:00
Marcel Schnelle a9f44e74d4 Wrap around hand selection when going out of bounds horizontally 2025-09-21 17:50:51 +09:00
Drew 7c377fca94 Making joker_gfxTiles and joker_gfxPal static 2025-09-17 15:35:21 -05:00
Drew c4e804234b Moving macro into pool definition 2025-09-17 15:01:26 -05:00
Drew 3dc959c17d Converting joker_gfxTiles and joker_gfxPal to pools 2025-09-17 14:35:00 -05:00
Drew 2c5bc3b5dd Adding an x macro to cut down on some boilerplate.
This should make adding additional jokers require a little less
typing. Additional jokers will need an entry in /include/joker_table.h
2025-09-15 21:36:20 -05:00
Drew e8e945b17d Removed redundant copy of shadow buffer into OAM. 2025-09-14 13:50:38 -05:00
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
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 d0d83eb236 Main menu uses HBLANK and the game uses standard affine background 2025-08-28 23:00:27 -04: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 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
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
EllipticalandCopilot 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
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
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