da8b3bbc00
Merge pull request #72 from cellos51/audio_refactors
MeirGavish2025-08-01 21:06:56 +03:00
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.
MeirGavish2025-08-01 21:06:07 +03:00
537ceb622f
Added audio_utils.h/.c and refactored calls to mmEffectEx to use wrapper play_sfx() instead
MeirGavish2025-08-01 19:29:11 +03:00
0407beebf3
Merge pull request #71 from cellos51/small_features
MeirGavish2025-08-01 17:51:20 +03:00
5149e6c23e
B button now deselects all selected cards
MeirGavish2025-08-01 17:49:30 +03:00
9df458b78f
Added copilot's full house detection code with @theturtlemafia's boolean simplification. Tested.
MeirGavish2025-08-01 03:17:54 +03:00
fa35ede0f5
Merged main into ttm/bigger-joker-refactor (manual delete of joker_gfx.png for conflict resolution)
MeirGavish2025-08-01 02:11:41 +03:00
c6115ea5be
Merge pull request #70 from cellos51/new_jokers_graphics
MeirGavish2025-08-01 02:09:39 +03:00
305d093042
Added more joker art by for jokers 6-16, missing code implementation so they are not yet displayed.
MeirGavish2025-08-01 02:03:24 +03:00
0c834d17c2
Added dynamic palette loading for jokers and added new joker designs by @GreenNinja2525
MeirGavish2025-07-30 15:49:35 +03:00
a72458c2c3
adds jokers 6-16. Extract hand type detection logic from hand_get_type to be used by jokers as well
theturtlemafia2025-07-27 12:51:30 -04:00
095fb455cc
Merge pull request #64 from theturtlemafia/ttm/joker-struct-refactor
MeirGavish2025-07-29 00:56:04 +03:00
22a44d4423
Added temporary placeholder art for Lusty, Wrathful, and Gluttonous jokers
MeirGavish2025-07-29 00:52:34 +03:00
ed1204db74
remove usage of extern for joker_registry. Add array size macro to util.h
theturtlemafia2025-07-28 14:24:33 -04:00
6ccb14034d
Merge pull request #66 from cellos51/bug_fixes
MeirGavish2025-07-27 23:20:01 +03:00
e5602d672f
Fixed a bug where selecting discard with 0 discards would toggle card select and extracted function game_playing_process_hand_select_input()
MeirGavish2025-07-27 23:10:37 +03:00
5c58b092d7
Extracted sinful jokers effects to single function sinful_joker_effect()
MeirGavish2025-07-27 19:01:26 +03:00
47ee3987fd
refactor jokers to use struct and function pointer
theturtlemafia2025-07-27 06:40:11 -04:00
3ed4bdc698
Merge pull request #63 from cellos51/refactors
MeirGavish2025-07-27 13:38:27 +03:00
4ab7fed2ef
Merge branch 'main' into refactors
MeirGavish2025-07-27 01:25:46 +03:00
8673856f18
Fixed a pixel error in the 7 of diamonds card sprite
MeirGavish2025-07-27 01:22:48 +03:00
f6b6e22c33
Merge branch 'main' into refactors
MeirGavish2025-07-27 01:14:24 +03:00
95565862b0
Extracted JokerObject and CardObject common functionalities to SpriteObject, removing duplicate code and dangerous casts.
MeirGavish2025-07-27 01:13:57 +03:00
8f49332aa3
Merge pull request #62 from cellos51/ci_changes
MeirGavish2025-07-26 22:58:21 +03:00
8043a2bad6
Added flag to Makefile to treat warnings as errors that fail build, and commented out code in game.c to be warning free
MeirGavish2025-07-26 20:04:39 +03:00
942a954d00
Merge pull request #61 from cellos51/graphic_changes
MeirGavish2025-07-26 19:56:01 +03:00
16d327b7f4
Moved the PLAY text of the PLAY HAND button one pixel down so it is separated from the button highlight
MeirGavish2025-07-26 19:54:22 +03:00
4a630a25d2
Merge pull request #60 from cellos51/refactors
MeirGavish2025-07-26 19:43:26 +03:00
1c036482a1
Renamed functions updating the display values from set_score, set_money etc. to display_score, display_money etc. to remove implication they are setting an actual value
MeirGavish2025-07-26 19:40:38 +03:00
d62509aff3
Changed the build CI workflow to be triggered for pushes only to the main branch
MeirGavish2025-07-26 12:54:37 +03:00
c49dbbab64
Merge pull request #58 from MeirGavish/create_ci_github_actions
MeirGavish2025-07-26 11:48:03 +03:00
03e3d31e38
Fixed build_ci_workflow.yml to trigger on pull requests to main
MeirGavish2025-07-26 11:21:24 +03:00
b39d95ae2d
Reset cache key version to v1 and added more comments in build_ci_workflow.yml
MeirGavish2025-07-26 01:46:10 +03:00
c745d776d0
Created Github Actions Build CI Test build_ci_workflow.yml
MeirGavish2025-07-26 01:40:33 +03:00
8bbf97ea65
Merge pull request #53 from cellos51/fixed-sprite-vram-optimizations (Re-applied sprite vram optimizations after blind sprite fix)
MeirGavish2025-07-24 11:27:33 +03:00
087cb47f9d
Merge branch 'main' into refactors
MeirGavish2025-07-22 16:31:38 +03:00
71d41d7f62
Switched all the code in graphic_utils.c to use se_mat instead of se_mem, it's beautiful
MeirGavish2025-07-22 16:30:48 +03:00
9086aa0f59
Fixed hands and discards being infinite and palette issue
cellos512025-07-22 02:26:22 -04:00
c8893c806c
Added @GreenNinja2525's replacement deck icon. Added play hand and discard buttons and changed keybindings.
cellos512025-07-22 01:42:31 -04:00
e7c5536cc2
added shop rerolling and edition pricing for jokers
cellos512025-07-21 22:05:31 -04:00
95d032f36b
Corrected joker sprite canvas size and fixed money not being erased
cellos512025-07-21 20:27:30 -04:00
1b53a1b077
Updated to joker sprite to use the new one by @GreenNinja2525 and changed the way switching backgrounds works to prevent flicker
cellos512025-07-21 20:09:35 -04:00
b73a5068bc
Merge pull request #38 from MeirGavish/refactors
Gordie2025-07-19 23:20:29 -04:00
69e8df3de9
Merge branch 'main' into refactors
MeirGavish2025-07-20 02:28:38 +03:00
708d9a813f
Fixed screenblock overflow bug and once again merged up/down versions of POP_MENU_ANIM_RECT
MeirGavish2025-07-20 01:55:49 +03:00
55f107d491
Merge pull request #37 from MeirGavish/bug_fixes
Gordie2025-07-19 17:56:29 -04:00
a484d8cd44
Merge branch 'main' into bug_fixes
MeirGavish2025-07-19 22:31:35 +03:00
0e231328ec
Added right align text rect function and fixed blind requirement overflow when it's 4 digits (will still overflow for more)
MeirGavish2025-07-19 22:25:46 +03:00
theturtlemafia