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
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
0f154741ed
Renaming a function, fixing a call to memcpy16. Replacing magic numbers with enum values
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
fb35397238
Cleanup
2025-10-14 10:20:43 -05:00
04ffb0d4dd
A little bit of scope creep here.
...
Renamed some of the state functions to include the word 'on'. Also
replaced the switch statement in set_hand() with a lookup table
access. This lookup table contains the chips, mult and display name
for a given hand. Some may not like these changes, so we can easily
roll back if need be.
2025-10-14 10:20:43 -05:00
121bbc01d5
Refactored state machine.
...
Added a state info map which keeps track of a particular state's on_init, on_update and on_exit functions.
A few of the on_update functions have sub-states, which create extremely long switch statements.
Not sure if perhaps the best route would be to keep the switch statements but break the cases into individual
functions or if we should keep track of substates. The latter sounds like it could get complicated and really
messy quick. Problem for another day.
2025-10-14 10:20:40 -05:00
6dce57e197
Merge pull request #145 from pansythoughts/main
...
kind of fixed how game_speed behaves
2025-10-14 13:57:40 +03:00
ef048791c1
Separate out graphics and add ability change boss
2025-10-13 23:36:27 -07:00
f885fa9164
Fix Iterating over every blind instead of 3 max
2025-10-13 23:36:27 -07:00
54d955d1e7
Update for PR
2025-10-13 23:36:27 -07:00
3c2dd0edba
Rename blind enums to represent their type
...
This commit prefixes the enums `BlindType` and `BlindState` with their
types for clarity
2025-10-13 23:36:27 -07:00
7ee07bb34c
Refactor blind into a map
2025-10-13 23:36:27 -07:00
767e21d5fa
made the lerped temp score expression clearer
2025-10-13 20:26:20 -07:00
71de180871
Merge branch 'main' into implement_joker_testing
2025-10-13 20:59:17 +03:00
8c25089966
Allow defining an ID for a joker to always appear in shop and be tested
2025-10-13 20:58:44 +03:00
9d1a51884f
Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization)
2025-10-09 23:42:07 +03:00
ce6d2049f8
Update game.h
...
Fix missing `is_joker_present` rename into `is_joker_owned`
2025-10-09 14:52:41 +02:00
c4f22be9b9
Update joker.h
...
Restoring the Brainstorm Joker ID, deleted by mistake while adding the Pareidolia Joker ID
2025-10-09 14:46:57 +02:00
6787fab0c2
Merge branch 'main' into main
2025-10-08 23:25:24 +02:00
4b35b2f7d8
Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525
2025-10-08 22:40:15 +03:00
7e17419811
Merge branch 'main' into pr-fix
2025-10-08 18:11:20 +02:00
bc44de0493
Update include/joker.h
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-08 17:57:20 +02:00
aa5ebd13fc
Add suggestions from @MeirGavish
2025-10-08 08:14:54 +02:00
a0f1ef7780
Added art for xmult hand jokers The Duo The Trio, The Family, The Order, and The Tribe by @MathisMartin31
2025-10-07 23:52:49 +03:00
c529c4be69
Added art for jokers Abstract Joker by @MathisMartin31 and Bull by @NoWhammies10 and @GreenNinja2525
2025-10-07 21:26:43 +03:00
46936c1878
Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10
2025-10-07 21:13:31 +03:00
b7a94fa085
Fix some issues (I actually forgot to compile)
2025-09-30 23:34:11 +02:00
de7c9d4d60
Add a "get_num_hands_remaining" function and implement the Acrobat Joker
2025-09-30 23:06:13 +02:00
c781ee9666
Add a "is_card_face" function to take into account if Pareidolia is present
2025-09-30 22:47:00 +02:00
7bafc260dd
fixed game_speed, now using fixed point and keeping game_speed static
2025-09-22 22:04:51 -07:00
e620697917
Renamed joker_table.h to def_joker_gfx_table.h. Removed an unnecessary constant
2025-09-22 16:06:45 -05:00
301f5a2a53
kind of fixed how game_speed behaves
2025-09-21 23:49:24 -07:00
6e60cf5970
kind of fixed how game_speed behaves
2025-09-21 23:16:50 -07: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
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
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
c41fcd1a24
Remove unused definition for maximum background palette size
2025-08-28 19:04:51 -04:00
bc32707126
replaced magic numbers for background palette size
2025-08-28 16:09:46 -04:00
6e2d3ee499
Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects
2025-08-25 19:34:25 -04:00
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
Rickey Fehr