46936c1878
Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10
2025-10-07 21:13:31 +03:00
22ddd83931
Merge pull request #138 from Seafoamm/main
...
Add macOS setup instructions
2025-10-07 16:20:01 +03:00
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
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
0187b5f78e
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-07 20:24:00 +10:30
f579c13ceb
Merge pull request #149 from GreenNinja2525/main
...
Fix Dynamic Badges (Hopefully) [Now Safe to Merge]
2025-09-27 21:44:27 +02:00
8dbcadac59
Merge pull request #153 from ricfehr3/feature/add-version
...
Add git hash baked into ROM for bug reports
2025-09-27 21:41:09 +02:00
46944e5699
Merge branch 'cellos51:main' into main
2025-09-27 15:22:41 -04:00
88726cbb39
Add script to get version
2025-09-24 20:49:01 -07:00
36bcf0fa30
Move version into C file
2025-09-24 20:44:13 -07:00
b8a441f971
Update joker_effects.c
...
updated jokers into joker registry
2025-09-24 22:53:54 +09:30
56bbc2ff9a
Add defaults for GIT_HASH and GIT_DIRTY
2025-09-23 21:41:55 -07:00
ebe789aa52
Add git hash baked into ROM for bug reports
2025-09-23 16:15:50 -07:00
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
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
e620697917
Renamed joker_table.h to def_joker_gfx_table.h. Removed an unnecessary constant
2025-09-22 16:06:45 -05:00
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
26db4e1aa0
Update joker_effects.c
...
fixed triboulet - was triggering for jacks also, rem
2025-09-22 21:42:15 +09:30
66c6b91222
Merge pull request #1 from noctowlhoot/noctowlhoot-patch-1
...
Update joker_effects.c
2025-09-22 20:54:44 +09:30
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
a9f44e74d4
Wrap around hand selection when going out of bounds horizontally
2025-09-21 17:50:51 +09:00
2c2cb17f74
Add macOS setup instructions
2025-09-21 00:25:51 -07:00
9dc5f7ccc3
Merge pull request #116 from HeadedBranch/main
...
Add install instructions for linux
2025-09-18 21:44:30 +02:00
7c377fca94
Making joker_gfxTiles and joker_gfxPal static
2025-09-17 15:35:21 -05:00
c4e804234b
Moving macro into pool definition
2025-09-17 15:01:26 -05:00
3dc959c17d
Converting joker_gfxTiles and joker_gfxPal to pools
2025-09-17 14:35:00 -05:00
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
27e91fb4a4
Merge pull request #121 from drewjohnson2/main
...
Removed redundant copy of shadow buffer into OAM.
2025-09-15 23:50:50 +03:00
a16065439e
Merge pull request #117 from ricfehr3/main
...
Add docker support
2025-09-15 22:30:21 +03:00
5b76cbfad0
Add cache for docker compose container
2025-09-14 15:15:42 -07:00
074f1956aa
Update Github Actions CI to use Docker Compose
2025-09-14 15:15:10 -07:00
e8e945b17d
Removed redundant copy of shadow buffer into OAM.
2025-09-14 13:50:38 -05:00
b27c94e5bd
Add docker support
...
Add docker support via a docker compose file with included instructions.
2025-09-11 12:59:52 -07:00
1562e4f9c7
Add step to activate correct shell variables
2025-09-11 08:36:37 +00:00
c2ef5b15d4
Add install instructions for linux
2025-09-11 08:27:42 +00:00
d1bbba82df
Merge pull request #112 from GreenNinja2525/main
...
Revise Build Instructions
2025-08-30 20:56:32 +03:00
984e77d6c8
Add Missing Instruction and Move Link
...
Fixed some things
2025-08-29 20:12:59 -04:00
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
176accd1a6
Merge branch 'cellos51:main' into main
2025-08-29 19:19:15 -04:00
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
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
cc65fbc5de
Small refactor for the joker lists to have wrapping functions to add and remove jokers
2025-08-30 02:15:00 +03:00
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
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
d0d83eb236
Main menu uses HBLANK and the game uses standard affine background
2025-08-28 23:00:27 -04:00
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
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
c41fcd1a24
Remove unused definition for maximum background palette size
2025-08-28 19:04:51 -04:00
4b7a22baff
made all palettes have their length set in grit
2025-08-28 19:03:48 -04:00
bc32707126
replaced magic numbers for background palette size
2025-08-28 16:09:46 -04:00
MeirGavish