MeirGavish
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
MeirGavish
9c78094399
Fixed invalid access to game state array
2025-10-21 12:49:02 +03:00
MeirGavish
0b848cd72e
Merge branch 'main' into start_music_after_splashscreen
2025-10-21 12:25:07 +03:00
Rickey
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
Rickey Fehr
517d40c294
Cleanup for PR, return old sprite tracker
2025-10-19 15:52:36 -07:00
MeirGavish
462c040e9a
Changed the check in game_change_state() to full bounds checking
2025-10-19 11:45:48 +03:00
Rickey Fehr
138792df48
Add memory pool test, fix bugs
2025-10-17 18:05:36 -07:00
Rickey Fehr
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
Rickey Fehr
d499abe2c4
Cleanup for PR
2025-10-17 16:55:09 -07:00
Rickey Fehr
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
Rickey Fehr
72c0a6c4a9
Optimize bit operations, style fix, cleanup
2025-10-17 16:55:07 -07:00
Rickey Fehr
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
MeirGavish
53d2e53d78
Changed music to start after Splash Screen
2025-10-17 13:43:21 +03:00
Drew
d6ebda657a
Additional PR feedback
2025-10-16 14:48:59 -05:00
Drew
f77a715845
Some PR feedback
2025-10-14 23:08:42 -05:00
Drew
3a6e004fc6
Rebase and some PR feedback
2025-10-14 10:44:21 -05:00
Drew
b9af95d770
Fixing some constant names after a rebase.
2025-10-14 10:26:09 -05:00
Drew
597dc62e24
Rebasing onto main. Switching to KEY_ANY to restart after a game over
2025-10-14 10:26:09 -05:00
Drew
0f154741ed
Renaming a function, fixing a call to memcpy16. Replacing magic numbers with enum values
2025-10-14 10:26:09 -05:00
Drew
3071e512c4
Just some cleanup
2025-10-14 10:26:09 -05:00
Drew
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
Drew
6d66ccbb61
Replaced the substate switch statements with function tables.
2025-10-14 10:24:42 -05:00
Drew
4e1f418a8d
Preparing for rebase
2025-10-14 10:20:43 -05:00
Drew
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
Drew
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
MeirGavish
6dce57e197
Merge pull request #145 from pansythoughts/main
...
kind of fixed how game_speed behaves
2025-10-14 13:57:40 +03:00
Rickey Fehr
ef048791c1
Separate out graphics and add ability change boss
2025-10-13 23:36:27 -07:00
Rickey Fehr
f885fa9164
Fix Iterating over every blind instead of 3 max
2025-10-13 23:36:27 -07:00
Rickey Fehr
54d955d1e7
Update for PR
2025-10-13 23:36:27 -07:00
Rickey Fehr
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
Rickey Fehr
7ee07bb34c
Refactor blind into a map
2025-10-13 23:36:27 -07:00
alex
f463ba99a0
changed how game_speed affects hand score animations
2025-10-13 20:28:52 -07:00
alex
767e21d5fa
made the lerped temp score expression clearer
2025-10-13 20:26:20 -07:00
alex
d108836b6a
changed how game_speed affects hand score animations
2025-10-13 20:24:20 -07:00
MeirGavish
71de180871
Merge branch 'main' into implement_joker_testing
2025-10-13 20:59:17 +03:00
MeirGavish
8c25089966
Allow defining an ID for a joker to always appear in shop and be tested
2025-10-13 20:58:44 +03:00
alex
56c33b2eef
made the lerped temp score expression clearer
2025-10-11 23:45:02 -07:00
alex
cf7c9dc7c3
fixed typo
2025-10-11 13:36:43 -07:00
MeirGavish
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
MeirGavish
609e1f19b6
Merge pull request #159 from MathisMartin31/main
...
Add Pareidolia and Acrobat Jokers
2025-10-09 20:43:36 +03:00
Geralt
ce5150bffb
Update joker_effects.c
...
Temporarily remove Pareidolia from shop until @MeirGavish can add the artwork for it
2025-10-09 18:57:10 +02:00
Geralt
f14f200cb0
Update joker_effects.c
...
Remove the "unused" attribute from joker effect functions that was added by mistake during merge
2025-10-09 14:50:18 +02:00
MeirGavish
30638b65e2
Merge pull request #164 from ricfehr3/hotfix/hand-input-order
...
Fix softlock related to #163
2025-10-09 15:16:56 +03:00
MeirGavish
94cb898bb9
Merge pull request #134 from drewjohnson2/magic_numbers
...
Magic numbers
2025-10-09 11:18:02 +03:00
Rickey Fehr
73ec9a40d3
Fix softlock related to #163
2025-10-08 20:29:11 -07:00
Geralt
6787fab0c2
Merge branch 'main' into main
2025-10-08 23:25:24 +02:00
Drew
f752793caa
Shop light specific macros for color
2025-10-08 16:16:23 -05:00
MeirGavish
4b35b2f7d8
Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525
2025-10-08 22:40:15 +03:00
Nan
23a14cb76e
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 20:41:09 +02:00
Nan
8ae4968539
Remove duplicated entries
2025-10-08 18:52:10 +02:00
