 MeirGavish
|
c4b538c009
|
Basic game over screen + added main_bg_se_copy_expand_3x3_rect()
|
2025-08-19 21:40:40 +03:00 |
|
|
MeirGavish
|
5a70b002a9
|
graphic_utils refactors - renamed functions, optimized some code, used Tonc defines
|
2025-08-19 18:33:47 +03:00 |
|
|
MeirGavish
|
065d846ac7
|
Used text red color for game over background
|
2025-08-19 17:59:26 +03:00 |
|
|
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
|
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
|
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
|
658b0572d9
|
Removed all uses of float for optimization
|
2025-08-12 03:01:02 +03: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 |
|
|
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
|
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
|
b0a4fc968c
|
Removed duplicate declarations to fix build
|
2025-08-07 22:48:06 +03: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
|
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 |
|
|
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 |
|