MeirGavish
9d4b6a04b8
Merge branch 'main' into joker_pooling
2025-08-09 06:19:16 +03:00
MeirGavish
d60a6bf9ff
Merge pull request #86 from TheBreadPerson/word
...
Complete refactor of naming conventions for memcpy
2025-08-08 22:59:58 +03:00
TheBreadPerson
6007071b7d
Complete refactor of naming conventions for memcpy
2025-08-08 14:04:09 -04:00
MeirGavish
b98025619f
Merge pull request #75 from cellos51/boss_backgrounds
...
Switching to a boss blind now changes the background palette
2025-08-08 18:18:04 +03: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
MeirGavish
ed3e5f695a
Merge pull request #85 from GreenNinja2525/main
...
Fix "A" in Zany and Wily Joker for consistency
2025-08-08 16:14:35 +03:00
Wheeler
ab91438a0d
Change "A" in Zany and Wily Joker for consistency
2025-08-08 08:32:12 -04:00
MeirGavish
31ba1f166c
Added some documentation for affine_background_load_palette()
2025-08-08 15:03:18 +03:00
MeirGavish
ecbfd97de1
Added some documentation to memcpy16_tile8_with_palette_offset()
2025-08-08 14:47:45 +03:00
MeirGavish
c750d48bfa
Merge pull request #84 from cellos51/jokers_with_graphics
...
Added Joker art updates by @GreenNinja2525 with some minor tweaks
2025-08-08 11:46:22 +03:00
MeirGavish
e615588e29
Changed Fibonacci spiral border color to be more like the original
2025-08-08 11:44:16 +03:00
MeirGavish
c938310bf7
Transparency fix for joker_gfx6.png
2025-08-08 11:29:19 +03:00
MeirGavish
a1c64ef5a6
Added sprite improvements by @GreenNinja2525 for Blackboard, Mystic Summit, and Fibonacci with minor tweaks
2025-08-08 11:24:18 +03:00
MeirGavish
54edefdc12
Added recolors to hand type jokers by @GreenNinja2525
2025-08-08 10:22:28 +03: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
3c79a35b92
Redefined affinge background default color to use RGB15 and reverted grayscale of background image
2025-08-08 00:22:04 -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
69a7bd3a79
Merge pull request #83 from cellos51/jokers_with_graphics
...
Extracted changes from PR #74 and integrated joker graphics into them (+ a few bug fixes)
2025-08-08 02:23:26 +03: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
cellos51
7e6cc02869
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
2025-08-07 17:44:58 -04: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
MeirGavish
d83b324b4f
Merge pull request #82 from cellos51/club_symbol_change
...
Changed Clubs corner symbol to improve card readability
2025-08-07 15:29:36 +03:00
MeirGavish
fe4b8e081d
Changed clubs symbol to improve card readability
2025-08-05 22:03:54 +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
46b53db8a0
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
2025-08-04 20:13:02 -04:00
MeirGavish
54d8c780e7
Merge pull request #81 from cellos51/readme_update
...
Update README.md
2025-08-04 23:24:23 +03: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
d41503e673
Created game over background image
2025-08-04 21:47:28 +03:00
MeirGavish
742114792d
Fixed game starting at shop
2025-08-04 20:27:03 +03:00
MeirGavish
607a175426
Update README.md
...
Reworded the readme and added links to the official version of Balatro on all platforms
2025-08-04 18:56:38 +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
38eac4c01c
Merge pull request #79 from cellos51/debug_symbols
...
Added -g compile flag to allow debug symbols for IDE debugging
2025-08-04 10:26:52 +03:00
MeirGavish
d4bef1e55c
Merge pull request #78 from cellos51/jokers_palette_swapping
...
Updated joker palette swapping system to reuse palettes when jokers are removed
Also includes some refactoring in game.c for the shop intro
And also in sprite.c/.h I removed the unused pb and tid fields and provided a sprite_get_pb() function to access the actual parameter from the object
2025-08-04 10:25:54 +03:00
MeirGavish
8956501591
Merge branch 'main' into jokers_palette_swapping
2025-08-04 10:21:19 +03:00
MeirGavish
7364c64527
Merge branch 'main' into debug_symbols
2025-08-04 10:21:09 +03:00
MeirGavish
7c6aa7371f
Added -g compile flag to allow debug symbols for IDE debugging
2025-08-04 10:20:49 +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
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