Commit Graph

445 Commits

Author SHA1 Message Date
cellos51
af2358f487 Minor optimization 2025-08-09 17:08:18 -04:00
cellos51
0dde0cb6ef Took Copilot's advice and defined some magic numbers 2025-08-09 15:14:57 -04:00
cellos51
1ef0ce212b Different animation and fixed top 3 scanlines 2025-08-09 14:58:21 -04:00
MeirGavish
38282d0f2a Small refactors 2025-08-09 21:31:41 +03:00
cellos51
521b373bd2 Added new background visuals 2025-08-09 13:52:24 -04:00
MeirGavish
3441a1dae8 Joker pooling - Existing or owned jokers can't appear in shop + shop code refactor 2025-08-09 20:48:18 +03:00
MeirGavish
9d4b6a04b8 Merge branch 'main' into joker_pooling 2025-08-09 06:19:16 +03:00
TheBreadPerson
6007071b7d Complete refactor of naming conventions for memcpy 2025-08-08 14:04:09 -04:00
cellos51
6363613f15 Added & back to the tile8_mem in affine_background_init() and changed memcpy16 to 32 2025-08-08 10:44:55 -04:00
cellos51
650c09af28 Converted void to u16 in functions 2025-08-08 09:54:24 -04:00
cellos51
12ca27e27b Removed default color for affine background and changed to load palette from image instead 2025-08-08 00:32:30 -04:00
cellos51
dbe8585c0a Refactor affine_background_set_color to simplify brightness adjustment logic 2025-08-08 00:08:28 -04:00
cellos51
bebe2237e4 Add memcpy16_tile8_with_palette_offset function and update affine_background_init to use it 2025-08-08 00:00:20 -04:00
cellos51
9be6a31dce Use tonc defines for getting colors 2025-08-07 23:31:23 -04:00
cellos51
01d7ed8e91 Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds 2025-08-07 21:34:46 -04:00
MeirGavish
039c5771e1 Grouped Banner with Stencil to optimize palettes (Swapped with Misprint) 2025-08-08 02:22:02 +03:00
MeirGavish
fd8e52d48a Removed magic numbers for card score length and intmax buffer sizes 2025-08-08 01:59:21 +03:00
MeirGavish
2ce3acbe1c Merge branch 'main' into jokers_with_graphics 2025-08-08 00:32:10 +03:00
MeirGavish
863e3a34ae Rearranged jokers for palette optimization (Banner and Mystic Summit don't go well together) 2025-08-08 00:31:10 +03:00
MeirGavish
5e6d28c663 Fixed stack top bugs in joker_effects.c - e.g. Blackboard activated if just the first card in hand was not spades/clubs 2025-08-08 00:01:36 +03:00
theturtlemafia
4492176df2 allows multiple joker-effect popup texts 2025-08-07 23:08:41 +03:00
MeirGavish
50ec1bcdab Added art by @GreenNinja2525 for jokers Walkie-Talkie, Fibonacci, Banner, Mystic Summit, and Blackboard 2025-08-07 23:08:35 +03:00
MeirGavish
b0a4fc968c Removed duplicate declarations to fix build 2025-08-07 22:48:06 +03:00
MeirGavish
f84268c14d Added int list for joker pooling 2025-08-07 19:47:55 +03:00
cellos51
d0ca4a483d Fix indentation in affine_background.c for consistency 2025-08-05 14:42:37 -04:00
cellos51
592d7ae8bc Add affine background color functionality and integrate into game loop 2025-08-05 14:35:52 -04:00
cellos51
c7f6708555 Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds 2025-08-04 14:57:45 -04:00
MeirGavish
742114792d Fixed game starting at shop 2025-08-04 20:27:03 +03:00
cellos51
95b1937eac Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds 2025-08-04 11:41:48 -04:00
MeirGavish
8956501591 Merge branch 'main' into jokers_palette_swapping 2025-08-04 10:21:19 +03:00
MeirGavish
de672572b1 Updated joker palette swapping system to reuse palettes when jokers are removed 2025-08-04 10:18:33 +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
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
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