 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
|
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
|
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
|
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
|
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 |
|
|
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
|
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
|
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
|
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
|
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
|
2025-07-26 19:40:38 +03:00 |
|
|
cellos51
|
6a1f3bcd7a
|
I hope this works
|
2025-07-23 20:14:22 -04:00 |
|
|
MeirGavish
|
c781807ed8
|
Revert "Sprite vram optimizations"
|
2025-07-24 02:14:04 +03:00 |
|
|
cellos51
|
ea5e4d5d1e
|
refactor: remove commented-out code and simplify joker initialization
|
2025-07-23 17:35:42 -04:00 |
|
|
cellos51
|
6a326e27fe
|
refactor: update blind and joker definitions; change game state to GAME_BLIND_SELECT
|
2025-07-23 17:31:21 -04:00 |
|
|
cellos51
|
300e725dfe
|
made jokers dynamic and changed memcpy to us 32
|
2025-07-23 17:00:18 -04:00 |
|
|
cellos51
|
d122fde361
|
card layer does something now
|
2025-07-23 16:33:18 -04:00 |
|
|
cellos51
|
011bc64bab
|
huge memory save
|
2025-07-23 16:17:24 -04:00 |
|
|
MeirGavish
|
2ed5922d43
|
merged jokers_refactors into refactors (manual conflict resolution)
|
2025-07-23 19:36:30 +03:00 |
|
|
MeirGavish
|
5e6bc76f5f
|
Merge branch 'main' into jokers_refactors
|
2025-07-23 19:33:39 +03:00 |
|
|
TheBreadPerson
|
b6a8fd4e6a
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into truncating
|
2025-07-23 01:47:25 -04:00 |
|
|
TheBreadPerson
|
b994358ac6
|
Minor number change
|
2025-07-23 01:45:00 -04:00 |
|
|
cellos51
|
c025d35468
|
null check on greedy joker
|
2025-07-22 20:07:51 -04:00 |
|
|
cellos51
|
0e40dc43f7
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-22 20:00:15 -04:00 |
|
|
cellos51
|
1b4267893d
|
Added greedy joker and refactor joker system
|
2025-07-22 20:00:05 -04:00 |
|
|
MeirGavish
|
8ed7ddb127
|
Moved the round end blind sprite and score a bit so they look better on 4 digits
|
2025-07-23 02:14:30 +03:00 |
|
|
cellos51
|
62db2815dd
|
removed another static variable and improved boss blind selection
|
2025-07-22 17:43:52 -04:00 |
|
|
cellos51
|
e51e08322f
|
Fixed compilation error and removed another static variable
|
2025-07-22 17:39:33 -04:00 |
|
|
cellos51
|
c536d78976
|
Minor refactor to avoid the use of variable
|
2025-07-22 17:35:52 -04:00 |
|
|
MeirGavish
|
c48ddee5c4
|
Fixed a bug in text overflow case for update_text_rect_to_right_align_num()
|
2025-07-23 00:32:31 +03:00 |
|
|
MeirGavish
|
c24dcab726
|
Added TODO note and a warning comment
|
2025-07-23 00:02:24 +03:00 |
|
|
cellos51
|
b583755985
|
Refactored background change logic and removed unused static state variables in game functions
|
2025-07-22 15:53:49 -04:00 |
|
|
cellos51
|
793da72465
|
added co-pilot's fixes
|
2025-07-22 15:45:29 -04:00 |
|
|
TheBreadPerson
|
7a86450114
|
Starting to truncate numbers, half-baked
|
2025-07-22 15:34:03 -04:00 |
|
|
MeirGavish
|
087cb47f9d
|
Merge branch 'main' into refactors
|
2025-07-22 16:31:38 +03:00 |
|
|
MeirGavish
|
71d41d7f62
|
Switched all the code in graphic_utils.c to use se_mat instead of se_mem, it's beautiful
|
2025-07-22 16:30:48 +03:00 |
|
|
cellos51
|
9086aa0f59
|
Fixed hands and discards being infinite and palette issue
|
2025-07-22 02:26:22 -04:00 |
|
|
cellos51
|
c8893c806c
|
Added @GreenNinja2525's replacement deck icon. Added play hand and discard buttons and changed keybindings.
|
2025-07-22 01:42:31 -04:00 |
|