 MeirGavish
|
42a0e94afd
|
Refactor - Added defines for text colors and used them in all usses of tte_printf
|
2025-08-19 17:47:24 +03:00 |
|
|
MeirGavish
|
6d6bb39c97
|
Affine background now turns red on game over + other WIP changes for game over screen
|
2025-08-19 16:31:32 +03:00 |
|
|
MeirGavish
|
46141090a0
|
Added joker sprites by @GreenNinja2525 for Blue Joker, Even Steven, Odd Todd, Scholar and Business Card. Disabled jokers with no sprites.
|
2025-08-17 12:36:20 +03:00 |
|
|
MeirGavish
|
2539954dea
|
Fixed build error from previous merge and applied review comments
|
2025-08-17 11:10:00 +03:00 |
|
|
MeirGavish
|
04515839dc
|
(Manual conflict res) merged main into ttm/joker-scope-joker-1
|
2025-08-17 11:03:27 +03:00 |
|
|
MeirGavish
|
376309a9ef
|
(Manual conflict res on game.c) Merged main into ttm/joker-scop-1
|
2025-08-17 10:37:03 +03:00 |
|
|
MeirGavish
|
947fac7358
|
Added joker selling animation
|
2025-08-16 21:33:23 +03:00 |
|
|
MeirGavish
|
64274ae465
|
Added joker selling (still no animation) + fixed SpriteObject constructor focused bug
|
2025-08-16 15:38:34 +03:00 |
|
|
MeirGavish
|
92fa279059
|
Refactored jokers stack to be a list (AI used)
|
2025-08-16 13:18:44 +03:00 |
|
|
MeirGavish
|
b63559862f
|
renamed int_list.c to list.c
|
2025-08-16 12:41:11 +03:00 |
|
|
MeirGavish
|
ae019be190
|
Fixed shop initial selection to be visible + extracted shop outro
|
2025-08-16 06:41:33 +03:00 |
|
|
MeirGavish
|
168e34375d
|
Refactored shop_jokers to use list so purchased jokers can't be selected
|
2025-08-15 21:32:10 +03:00 |
|
|
MeirGavish
|
2a4f045db6
|
Refactored list code to be generic void* list
|
2025-08-15 20:03:17 +03:00 |
|
|
MeirGavish
|
d1677e82d2
|
Added Selection Grid system and refactored shop code to use it
|
2025-08-15 19:30:07 +03:00 |
|
|
MeirGavish
|
b218d4ac3e
|
(Manual conflict res) Merge branch 'main' into ttm/joker-scope-joker-1
|
2025-08-15 10:56:41 +03:00 |
|
|
MeirGavish
|
06dc4f9c62
|
Extracted focus to SpriteObject for joker selling - WIP
|
2025-08-15 10:38:20 +03:00 |
|
|
MeirGavish
|
0e080b916e
|
Reverted removals of float2fx() as they're compiler-optimized but kept float optimization
|
2025-08-12 11:40:22 +03:00 |
|
|
MeirGavish
|
658b0572d9
|
Removed all uses of float for optimization
|
2025-08-12 03:01:02 +03:00 |
|
|
MeirGavish
|
05af8217ff
|
Small affine background CBB/SBB fix
|
2025-08-12 01:59:04 +03:00 |
|
|
theturtlemafia
|
254efd7841
|
implement feedback
|
2025-08-09 19:23:47 -04:00 |
|
|
MeirGavish
|
38282d0f2a
|
Small refactors
|
2025-08-09 21:31:41 +03: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 |
|