 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 |
|
|
theturtlemafia
|
08307d62ad
|
code review feedback
|
2025-08-02 12:25:31 -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 |
|
|
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 |
|
|
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 |
|
|
MeirGavish
|
2ed5922d43
|
merged jokers_refactors into refactors (manual conflict resolution)
|
2025-07-23 19:36:30 +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
|
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 |
|
|
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 |
|
|
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 |
|
|
cellos51
|
e7c5536cc2
|
added shop rerolling and edition pricing for jokers
|
2025-07-21 22:05:31 -04:00 |
|
|
cellos51
|
95d032f36b
|
Corrected joker sprite canvas size and fixed money not being erased
|
2025-07-21 20:27:30 -04:00 |
|
|
cellos51
|
1b53a1b077
|
Updated to joker sprite to use the new one by @GreenNinja2525 and changed the way switching backgrounds works to prevent flicker
|
2025-07-21 20:09:35 -04:00 |
|
|
cellos51
|
86cf8896e2
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-21 18:46:48 -04:00 |
|
|
cellos51
|
f9706ef429
|
Added boss blind colors to the blind select screen
|
2025-07-20 22:48:58 -04:00 |
|
|
cellos51
|
99907ec90a
|
Change initial game state from GAME_SHOP to GAME_BLIND_SELECT
|
2025-07-20 22:42:30 -04:00 |
|
|
cellos51
|
a3a4d065b5
|
Jokers have prices in shop
|
2025-07-20 22:19:57 -04:00 |
|
|
cellos51
|
414bfa2a32
|
Semi functional jokers
|
2025-07-20 20:55:11 -04:00 |
|
|
cellos51
|
bdb0d7eee2
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-20 16:18:24 -04:00 |
|
|
MeirGavish
|
69e8df3de9
|
Merge branch 'main' into refactors
|
2025-07-20 02:28:38 +03:00 |
|
|
MeirGavish
|
708d9a813f
|
Fixed screenblock overflow bug and once again merged up/down versions of POP_MENU_ANIM_RECT
|
2025-07-20 01:55:49 +03:00 |
|
|
MeirGavish
|
0e231328ec
|
Added right align text rect function and fixed blind requirement overflow when it's 4 digits (will still overflow for more)
|
2025-07-19 22:25:46 +03:00 |
|
|
cellos51
|
fac4a3c626
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-19 15:16:08 -04:00 |
|
|
MeirGavish
|
bef11f9923
|
Fixed blind bottom of rect overwrite on skip bug
|
2025-07-19 17:17:23 +03:00 |
|
|
cellos51
|
52fa45e426
|
Refactor joker selection logic in game shop
|
2025-07-18 20:38:34 -04:00 |
|
|
cellos51
|
c06b179764
|
really bad purchasing system for jokers
|
2025-07-18 20:25:12 -04:00 |
|
|
cellos51
|
176910c483
|
Jokers appear in the shop but don't do anything yet
|
2025-07-18 19:29:17 -04:00 |
|
|
cellos51
|
4a5644eddb
|
Defining a basic system for jokers
|
2025-07-17 21:47:50 -04:00 |
|
|
cellos51
|
ea2e503222
|
Ante up on boss defeat
|
2025-07-17 18:02:46 -04:00 |
|
|
cellos51
|
54d8aa2ec6
|
Applied most refactors from previous merge by @MeirGavish
|
2025-07-16 21:31:05 -04:00 |
|
|
cellos51
|
a37ba18386
|
Fixed palette issue
|
2025-07-16 15:57:07 -04:00 |
|