438df88316
Add download button ( #196 )
...
* Add download button
* Update README.md
2025-11-02 08:29:40 +02:00
03273de829
Adds Shortcut and Four Fingers ( #95 )
...
* adds shortcut joker
* adds Four Fingers joker, and combination support for Four Fingers + Shortcut
---------
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-11-01 16:28:40 +02:00
eb815b7820
Refactor of scoring flow, Joker Callbacks and Card Retriggers ( #160 )
...
* Remove Baseball Card for now, will have to wait a future PR
* Removed cards held in hand joker scoring stage - should be in another PR
---------
Co-authored-by: MonteCrysto <mathis.martin31@gmail.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-11-01 15:50:52 +02:00
2c532b5bd8
Merge pull request #197 from ricfehr3/hotfix/fix-nightly-permissions
...
Fix permissions issue for nightly workflow
2025-10-31 23:37:11 -07:00
fa52350146
Fix permissions issue for nightly workflow
2025-10-31 23:22:33 -07:00
dfe6edad88
Refactor - Replaced magic number copies with main_bg_se_copy_rect() ( #192 )
2025-11-01 08:12:20 +02:00
9dc0905c93
Merge pull request #195 from ricfehr3/update-issue-template
...
Update issue template for bug reports
2025-10-31 22:30:37 -07:00
d32d567c2b
Add nightly rom releases ( #182 )
...
* Add nightly rom releases
* Begin testing CI
* Add tests workflow
* Move release tag workflow
* Fix upload logic for intermediate artifact
* Fix variable add names
* Update build CI
* Update nightly upload location
* Add git hash to output
* Update upload location again
* Update name to have a date
* Adjust date format for consistency
2025-10-31 22:00:15 -07:00
4af345c567
Update issue template for bug reports
2025-10-31 20:53:54 -07:00
8c00fbdeb1
Update issue templates
2025-10-31 21:53:52 -04:00
b472ce2bad
Changed the order of suits to match the original Balatro ( #189 )
2025-10-30 11:18:36 +02:00
c510e78704
Implement Interest ( #144 )
...
* Implemented Interest
* Very carefully applied changes from PR #144 to implement interest and fixed magic numbers
---------
Co-authored-by: JustinL-12 <jlong30@uic.edu >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-29 20:43:26 +02:00
b38433d191
Weight jokers by rarity in the shop ( #152 )
...
* Added weight for the rarity of jokers in the shop
* Includes manual conflict resolution
---------
Co-authored-by: JustinL-12 <jlong30@uic.edu >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-27 19:18:48 +02:00
5a3e891e43
Merge pull request #178 from cellos51/allow_additional_joker_testing
...
Added option for a second test joker
2025-10-25 15:22:52 +03:00
b01e9e5f01
Added option for a second test joker
2025-10-25 15:18:23 +03:00
a083d3de74
Moved pool file out of external definition and replaced it with a flag ( #176 )
...
* Moved pool file out of external definition and replaced it with a flag
2025-10-22 22:43:02 +03:00
e45c1eeb22
Merge pull request #172 from cellos51/start_music_after_splashscreen
...
Changed music to start after Splash Screen
2025-10-22 06:41:29 +03:00
9b568e8e1a
Moved undefined game state to enum end (more xmacro idiomatic)
2025-10-21 12:50:18 +03:00
9c78094399
Fixed invalid access to game state array
2025-10-21 12:49:02 +03:00
0b848cd72e
Merge branch 'main' into start_music_after_splashscreen
2025-10-21 12:25:07 +03:00
8a4242e81e
Merge pull request #132 from ricfehr3/feature/replace-malloc-with-pools
...
Feature/replace malloc with pools
2025-10-21 12:03:52 +03:00
52b1af576f
Update source/pool.c
...
Update for PR fix magic number
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-20 18:07:48 -07:00
517d40c294
Cleanup for PR, return old sprite tracker
2025-10-19 15:52:36 -07:00
462c040e9a
Changed the check in game_change_state() to full bounds checking
2025-10-19 11:45:48 +03:00
e40f3c989f
Fix memory map script
2025-10-18 17:35:53 -07:00
af3d69bcfb
Rename def files
2025-10-18 17:28:35 -07:00
a5c5f9cb15
Add timings to memory test
2025-10-18 17:23:59 -07:00
ab07c9af04
Hotfix going out of bounds
2025-10-18 17:09:22 -07:00
09f6c35496
Fix slight bug with false positives on pool test
2025-10-17 18:08:20 -07:00
138792df48
Add memory pool test, fix bugs
2025-10-17 18:05:36 -07:00
16059ab632
Update for PR
...
Readd sprite tracker to not reuse indices
check for capacity when returning pool entries
Update script for printing memory map
2025-10-17 16:55:09 -07:00
d499abe2c4
Cleanup for PR
2025-10-17 16:55:09 -07:00
d78e04c6b5
Fix style, tiny error, and typo
2025-10-17 16:55:09 -07:00
5e2bd9a59a
Update memory map script and cleanup
2025-10-17 16:55:09 -07:00
a1e73be3fc
Update github actions to print the memory map
2025-10-17 16:55:09 -07:00
06cd13a17f
Centralize location of memory pools
...
This commit centralizes the location of memory pools and adds an
associated script (scripts/get_memory_map.sh) to read the memory map.
2025-10-17 16:55:09 -07:00
72c0a6c4a9
Optimize bit operations, style fix, cleanup
2025-10-17 16:55:07 -07:00
e00c51502b
Replace Malloc With Pools
...
This commit introduces an object pool and replaces instances of malloc with pools where sensible.
2025-10-17 16:54:09 -07:00
53d2e53d78
Changed music to start after Splash Screen
2025-10-17 13:43:21 +03:00
f725c5e1b8
Merge pull request #155 from drewjohnson2/stateRefactor
...
State refactor
2025-10-17 11:51:24 +03:00
d6ebda657a
Additional PR feedback
2025-10-16 14:48:59 -05:00
f77a715845
Some PR feedback
2025-10-14 23:08:42 -05:00
3a6e004fc6
Rebase and some PR feedback
2025-10-14 10:44:21 -05:00
b9af95d770
Fixing some constant names after a rebase.
2025-10-14 10:26:09 -05:00
597dc62e24
Rebasing onto main. Switching to KEY_ANY to restart after a game over
2025-10-14 10:26:09 -05:00
0f154741ed
Renaming a function, fixing a call to memcpy16. Replacing magic numbers with enum values
2025-10-14 10:26:09 -05:00
3071e512c4
Just some cleanup
2025-10-14 10:26:09 -05:00
dbef1dacdc
Added the ability to restart the game after a game over.
...
The function that handles this is the on_exit of the game lost state. This function is not meant to
be permanent, but is just a placeholder while we decide what we actually want to do when game over is
reached.
2025-10-14 10:26:05 -05:00
6d66ccbb61
Replaced the substate switch statements with function tables.
2025-10-14 10:24:42 -05:00
4e1f418a8d
Preparing for rebase
2025-10-14 10:20:43 -05:00
Rickey