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
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
609e1f19b6
Merge pull request #159 from MathisMartin31/main
...
Add Pareidolia and Acrobat Jokers
2025-10-09 20:43:36 +03: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
Drew
f752793caa
Shop light specific macros for color
2025-10-08 16:16:23 -05:00
Drew
4e0d72ca8a
PR Feedback
2025-10-08 01:27:15 -05:00
MonteCrysto
aa5ebd13fc
Add suggestions from @MeirGavish
2025-10-08 08:14:54 +02:00
MonteCrysto
8cd86f1640
Merge remote-tracking branch 'upstream/main'
...
And add NULL Acrobat Joker effect
2025-10-07 20:18:41 +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
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
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
MeirGavish
cc65fbc5de
Small refactor for the joker lists to have wrapping functions to add and remove jokers
2025-08-30 02:15:00 +03:00
cellos51
4b7a22baff
made all palettes have their length set in grit
2025-08-28 19:03:48 -04:00
cellos51
bc32707126
replaced magic numbers for background palette size
2025-08-28 16:09:46 -04:00
Elliptical and Copilot
06ca593e8a
Update source/game.c
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-08-25 18:06:35 -04:00
cellos51
8fafcd1cdf
Reduced amount of menu buttons
2025-08-25 17:52:27 -04:00
cellos51
7b2fc1ac75
Refactor main menu button color definitions for clarity and consistency
2025-08-25 16:59:10 -04:00
Drew