 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
|
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
|
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 |
|
|
theturtlemafia
|
254efd7841
|
implement feedback
|
2025-08-09 19:23:47 -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 |
|
|
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 |
|
|
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
|
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
|
01d7ed8e91
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
|
2025-08-07 21:34:46 -04: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
|
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 |
|
|
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
|
f84268c14d
|
Added int list for joker pooling
|
2025-08-07 19:47:55 +03:00 |
|
|
cellos51
|
592d7ae8bc
|
Add affine background color functionality and integrate into game loop
|
2025-08-05 14:35:52 -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
|
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
|
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
|
4731fea21b
|
add joker sprites
|
2025-08-02 13:08:42 -04: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
|
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
|
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
|
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 |
|
|
theturtlemafia
|
ed1204db74
|
remove usage of extern for joker_registry. Add array size macro to util.h
|
2025-07-28 14:24:33 -04:00 |
|
|
theturtlemafia
|
47ee3987fd
|
refactor jokers to use struct and function pointer
|
2025-07-27 07:06:35 -04: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 |
|
|
cellos51
|
6a1f3bcd7a
|
I hope this works
|
2025-07-23 20:14:22 -04:00 |
|
|
Elliptical
|
f23f1293b6
|
Merge branch 'main' into fixed-sprite-vram-optimizations
|
2025-07-23 19:52:17 -04:00 |
|
|
cellos51
|
dda145a907
|
Fixed blind sprites
|
2025-07-23 19:28:36 -04:00 |
|