Commit Graph

698 Commits

Author SHA1 Message Date
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
MeirGavish f579c13ceb Merge pull request #149 from GreenNinja2525/main
Fix Dynamic Badges (Hopefully) [Now Safe to Merge]
2025-09-27 21:44:27 +02:00
MeirGavish 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
Wheeler 46944e5699 Merge branch 'cellos51:main' into main 2025-09-27 15:22:41 -04:00
Rickey Fehr 88726cbb39 Add script to get version 2025-09-24 20:49:01 -07: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 56bbc2ff9a Add defaults for GIT_HASH and GIT_DIRTY 2025-09-23 21:41:55 -07:00
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
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