MeirGavish
de672572b1
Updated joker palette swapping system to reuse palettes when jokers are removed
2025-08-04 10:18:33 +03:00
MeirGavish
5cedb08816
Merge pull request #77 from cellos51/move_shop_price_down
...
Fixed bug where shop price would continue displaying after the item was purchased
2025-08-03 18:15:58 +03:00
MeirGavish
ec2aaf245d
Added clarification comment
2025-08-03 18:15:28 +03:00
MeirGavish
bbefff2eb9
Fixed bug where shop price would continue displaying after the item was purchased
2025-08-03 16:51:16 +03:00
MeirGavish
e7b6d24815
Merge pull request #76 from cellos51/move_shop_price_down
...
Moved the price of shop items below the item so it is not obstructed when the card is raised on highlight
2025-08-03 16:10:20 +03:00
MeirGavish
a8f429eca3
Moved the price of shop items below the item so it is not obstructed when the card is raised on highlight
2025-08-03 16:08:41 +03:00
Elliptical
dcff326730
Refactor to make it just change the brightness of a chosen color. I will make a seperate .h/.c file for the affine background when I get home.
2025-08-02 14:54:08 -04:00
theturtlemafia
445ea788a4
fix error from rebase
2025-08-02 13:28:28 -04:00
theturtlemafia
0f3d1b3b77
adds walkie-talkie, fibonnaci, banner, mystic summit, blackboard
2025-08-02 13:25:04 -04:00
theturtlemafia
174050d813
add fist, parking, business card, scholar, scary face, abstact, bull, smiley, even, odd jokers
2025-08-02 13:25:04 -04:00
theturtlemafia
ee0591562f
add blue joker
2025-08-02 13:25:04 -04:00
theturtlemafia
dcaf025e63
allows multiple joker-effect popup texts
2025-08-02 13:25:04 -04:00
MeirGavish
8e22dbf02d
Merge pull request #73 from theturtlemafia/ttm/even-more-jokers
...
Adds XMult, Joker Stencil and Misprint
2025-08-02 20:23:54 +03:00
theturtlemafia
4731fea21b
add joker sprites
2025-08-02 13:08:42 -04:00
MeirGavish
56a211616a
Removed misprint magic number
2025-08-02 19:43:44 +03:00
theturtlemafia
08307d62ad
code review feedback
2025-08-02 12:25:31 -04:00
MeirGavish
9f9b557143
Refactor - extracted game_shop_intro() from game_shop()
2025-08-02 18:56:10 +03:00
Elliptical
8315d6a42c
Switching to a boss blind now changes the background palette
2025-08-02 10:29:26 -04:00
theturtlemafia
dbff88add0
Adds XMult, Joker Stencil and Misprint (rebase)
2025-08-01 18:35:31 -04:00
MeirGavish
da8b3bbc00
Merge pull request #72 from cellos51/audio_refactors
...
Audio refactors
2025-08-01 21:06:56 +03:00
MeirGavish
cb835653f6
card_select and card_deselect were flipped, fixed them back. This only affects the sound displayed when cards are scored, now it's the select instead of the deselect.
2025-08-01 21:06:07 +03:00
MeirGavish
537ceb622f
Added audio_utils.h/.c and refactored calls to mmEffectEx to use wrapper play_sfx() instead
2025-08-01 20:36:07 +03:00
MeirGavish
0407beebf3
Merge pull request #71 from cellos51/small_features
...
B button now deselects all selected cards
2025-08-01 17:51:20 +03:00
MeirGavish
5149e6c23e
B button now deselects all selected cards
2025-08-01 17:49:30 +03:00
MeirGavish
9df458b78f
Added copilot's full house detection code with @theturtlemafia's boolean simplification. Tested.
2025-08-01 03:17:54 +03:00
MeirGavish
fa35ede0f5
Merged main into ttm/bigger-joker-refactor (manual delete of joker_gfx.png for conflict resolution)
2025-08-01 02:11:41 +03:00
MeirGavish
c6115ea5be
Merge pull request #70 from cellos51/new_jokers_graphics
...
Added dynamic palette loading for jokers and added new joker designs by @GreenNinja2525
2025-08-01 02:09:39 +03:00
MeirGavish
305d093042
Added more joker art by for jokers 6-16, missing code implementation so they are not yet displayed.
2025-08-01 02:03:24 +03:00
MeirGavish
0c834d17c2
Added dynamic palette loading for jokers and added new joker designs by @GreenNinja2525
2025-07-30 21:00:29 +03:00
theturtlemafia
fe660d6cb8
fix half joker being incorrect
2025-07-28 18:33:12 -04:00
theturtlemafia
c2e4688498
placeholder jokers
2025-07-28 18:33:08 -04:00
theturtlemafia
a72458c2c3
adds jokers 6-16. Extract hand type detection logic from hand_get_type to be used by jokers as well
2025-07-28 18:27:48 -04:00
MeirGavish
095fb455cc
Merge pull request #64 from theturtlemafia/ttm/joker-struct-refactor
...
Refactor jokers to use struct and function pointer for joker effects and added Lusty, Wrathful, and Gluttonous jokers
2025-07-29 00:56:04 +03:00
MeirGavish
f8d7851c50
Merge branch 'jokers_temp_placeholder_art'
2025-07-29 00:53:55 +03:00
MeirGavish
22a44d4423
Added temporary placeholder art for Lusty, Wrathful, and Gluttonous jokers
2025-07-29 00:52:34 +03:00
theturtlemafia
ed1204db74
remove usage of extern for joker_registry. Add array size macro to util.h
2025-07-28 14:24:33 -04:00
MeirGavish
6ccb14034d
Merge pull request #66 from cellos51/bug_fixes
...
Fixed a bug where selecting discard with 0 discards would toggle card select and extracted function game_playing_process_hand_select_input() from game_playing_process_input_and_state()
2025-07-27 23:20:01 +03:00
MeirGavish
e5602d672f
Fixed a bug where selecting discard with 0 discards would toggle card select and extracted function game_playing_process_hand_select_input()
2025-07-27 23:15:28 +03:00
MeirGavish
5c58b092d7
Extracted sinful jokers effects to single function sinful_joker_effect()
2025-07-27 19:01:26 +03:00
theturtlemafia
47ee3987fd
refactor jokers to use struct and function pointer
2025-07-27 07:06:35 -04:00
MeirGavish
3ed4bdc698
Merge pull request #63 from cellos51/refactors
...
Extracted JokerObject and CardObject common functionalities to SpriteObject, removing duplicate code and dangerous casts.
2025-07-27 13:38:27 +03:00
MeirGavish
4ab7fed2ef
Merge branch 'main' into refactors
2025-07-27 01:25:46 +03:00
MeirGavish
8673856f18
Fixed a pixel error in the 7 of diamonds card sprite
2025-07-27 01:22:48 +03:00
MeirGavish
f6b6e22c33
Merge branch 'main' into refactors
2025-07-27 01:14:24 +03:00
MeirGavish
95565862b0
Extracted JokerObject and CardObject common functionalities to SpriteObject, removing duplicate code and dangerous casts.
2025-07-27 01:13:57 +03:00
MeirGavish
8f49332aa3
Merge pull request #62 from cellos51/ci_changes
...
Added flag to Makefile to treat warnings as errors
2025-07-26 22:58:21 +03:00
MeirGavish
8043a2bad6
Added flag to Makefile to treat warnings as errors that fail build, and commented out code in game.c to be warning free
2025-07-26 20:04:39 +03:00
MeirGavish
942a954d00
Merge pull request #61 from cellos51/graphic_changes
...
Moved the PLAY text of the PLAY HAND button one pixel down so it is separated from the button highlight
2025-07-26 19:56:01 +03:00
MeirGavish
16d327b7f4
Moved the PLAY text of the PLAY HAND button one pixel down so it is separated from the button highlight
2025-07-26 19:54:22 +03:00
MeirGavish
4a630a25d2
Merge pull request #60 from cellos51/refactors
...
Renamed functions updating the display values from set_score, set_money etc...
2025-07-26 19:43:26 +03:00
MeirGavish