Commit Graph
678 Commits
Author SHA1 Message Date
Wheeler 3888a198c8 Change to Shields.io Badges
Hopefully this allows them to update properly. Shields.io is way more reliable and updates on its own. Hopefully this works!
2025-09-22 22:38:57 -04:00
Rickey Fehr e58208e13d Add uploading ROM on tag push 2025-09-22 14:27:50 -07:00
MeirGavish 74739d87ed Merge pull request #123 from drewjohnson2/main
Adding an x macro to cut down on some boilerplate.
2025-09-22 23:15:56 +02: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
Wheeler 8d278b0c19 Fix Dynamic Badges (hopefully)
I think I fixed the dynamic badges, it just needed a maxAge parameter to properly tell GitHub to recache the data. I can't really test this as it is set to refresh each badge every 2 hours. I also fixed some minor formatting in the build instructions. I also added a discussions badge so people can read through them before contributing.
2025-09-22 12:44:20 -04:00
noctowlhoot 26db4e1aa0 Update joker_effects.c
fixed triboulet - was triggering for jacks also, rem
2025-09-22 21:42:15 +09:30
noctowlhoot 66c6b91222 Merge pull request #1 from noctowlhoot/noctowlhoot-patch-1
Update joker_effects.c
2025-09-22 20:54:44 +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
Seafoamm 2c2cb17f74 Add macOS setup instructions 2025-09-21 00:25:51 -07:00
MeirGavish 9dc5f7ccc3 Merge pull request #116 from HeadedBranch/main
Add install instructions for linux
2025-09-18 21:44:30 +02: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
MeirGavish 27e91fb4a4 Merge pull request #121 from drewjohnson2/main
Removed redundant copy of shadow buffer into OAM.
2025-09-15 23:50:50 +03:00
Nan 2669afbae2 Merge branch 'main' of https://github.com/cellos51/balatro-gba 2025-09-15 21:46:48 +02:00
MeirGavish a16065439e Merge pull request #117 from ricfehr3/main
Add docker support
2025-09-15 22:30:21 +03:00
Rickey Fehr 5b76cbfad0 Add cache for docker compose container 2025-09-14 15:15:42 -07:00
Rickey Fehr 074f1956aa Update Github Actions CI to use Docker Compose 2025-09-14 15:15:10 -07: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
Rickey Fehr b27c94e5bd Add docker support
Add docker support via a docker compose file with included instructions.
2025-09-11 12:59:52 -07:00
Isaac Hesslegrave 1562e4f9c7 Add step to activate correct shell variables 2025-09-11 08:36:37 +00:00
Isaac Hesslegrave c2ef5b15d4 Add install instructions for linux 2025-09-11 08:27:42 +00:00
MeirGavish d1bbba82df Merge pull request #112 from GreenNinja2525/main
Revise Build Instructions
2025-08-30 20:56:32 +03:00
Wheeler 984e77d6c8 Add Missing Instruction and Move Link
Fixed some things
2025-08-29 20:12:59 -04:00
Wheeler 2bd253f451 Formatting Error
I did that merge into main thing again, that's my bad, misclicked. This just fixes a small error I made.
2025-08-29 19:25:22 -04:00
Wheeler 176accd1a6 Merge branch 'cellos51:main' into main 2025-08-29 19:19:15 -04:00
Wheeler 3c09d6fb79 Revise Build Instructions
I added the link to the video @cellos51 made about compiling the project. I updated the build instructions to reflect the steps made in the video and condensed the information to be more readable. I also tried fixing the dynamic badges, but I don't think it completely worked. They update automatically but it takes a really long time (couple hours) because of GitHub API Caching Issues. This is a small pull request, I'll open requests in the future for larger scale commits. @MeirGavish can merge if they want if cellos51 is busy. Let me know if I made an error, thanks! 👍
2025-08-29 19:18:35 -04:00
MeirGavish aec53ced91 Merge pull request #111 from cellos51/held_jokers_refactor
Small refactor for the joker lists to have wrapping functions to add and remove jokers
2025-08-30 02:16:15 +03: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
Elliptical ff62b12ac9 Merge pull request #91 from cellos51/hblank_affine_background_effects
HBlank based visual effects for affine background
2025-08-29 15:18:49 -04:00
MeirGavish c15c2821e8 Merge branch 'hblank_affine_background_effects' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects 2025-08-29 16:26:41 +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
Elliptical a478701deb Merge pull request #93 from cellos51/main_menu_and_splash_screen
Main menu and splash screen
2025-08-28 19:35:55 -04:00
cellos51 c41fcd1a24 Remove unused definition for maximum background palette size 2025-08-28 19:04:51 -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
MeirGavish 5e4722e27b Merge pull request #109 from GreenNinja2525/main
README.md Rework with Custom Badges
2025-08-25 21:13:00 +03:00