 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 |
|
|
MeirGavish
|
c781807ed8
|
Revert "Sprite vram optimizations"
|
2025-07-24 02:14:04 +03:00 |
|
|
cellos51
|
6a326e27fe
|
refactor: update blind and joker definitions; change game state to GAME_BLIND_SELECT
|
2025-07-23 17:31:21 -04:00 |
|
|
cellos51
|
011bc64bab
|
huge memory save
|
2025-07-23 16:17:24 -04:00 |
|
|
MeirGavish
|
5e6bc76f5f
|
Merge branch 'main' into jokers_refactors
|
2025-07-23 19:33:39 +03:00 |
|
|
cellos51
|
1b4267893d
|
Added greedy joker and refactor joker system
|
2025-07-22 20:00:05 -04:00 |
|
|
MeirGavish
|
c24dcab726
|
Added TODO note and a warning comment
|
2025-07-23 00:02:24 +03:00 |
|
|
cellos51
|
793da72465
|
added co-pilot's fixes
|
2025-07-22 15:45:29 -04:00 |
|
|
cellos51
|
c8893c806c
|
Added @GreenNinja2525's replacement deck icon. Added play hand and discard buttons and changed keybindings.
|
2025-07-22 01:42:31 -04:00 |
|
|
cellos51
|
e7c5536cc2
|
added shop rerolling and edition pricing for jokers
|
2025-07-21 22:05:31 -04:00 |
|
|
cellos51
|
414bfa2a32
|
Semi functional jokers
|
2025-07-20 20:55:11 -04:00 |
|
|
cellos51
|
bdb0d7eee2
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-20 16:18:24 -04:00 |
|
|
MeirGavish
|
0e231328ec
|
Added right align text rect function and fixed blind requirement overflow when it's 4 digits (will still overflow for more)
|
2025-07-19 22:25:46 +03:00 |
|
|
cellos51
|
c06b179764
|
really bad purchasing system for jokers
|
2025-07-18 20:25:12 -04:00 |
|
|
cellos51
|
176910c483
|
Jokers appear in the shop but don't do anything yet
|
2025-07-18 19:29:17 -04:00 |
|
|
cellos51
|
4a5644eddb
|
Defining a basic system for jokers
|
2025-07-17 21:47:50 -04:00 |
|
|
cellos51
|
54d8aa2ec6
|
Applied most refactors from previous merge by @MeirGavish
|
2025-07-16 21:31:05 -04:00 |
|
|
cellos51
|
ed484d6557
|
temporary overwrite of previous merge. I've been working on this for 10 hours today and really do not have the patience to resolve the conflicts right now. I'll do it later 😭
|
2025-07-16 01:20:50 -04:00 |
|
|
cellos51
|
309ebf281a
|
Major refactor, too much else to list, check the git changes.
|
2025-07-16 00:55:27 -04:00 |
|
|
MeirGavish
|
8cbfa70590
|
Switched hand background playing/selecting switch to use small moves instead of big copies
|
2025-07-13 23:17:37 +03:00 |
|
|
MeirGavish
|
e7589f27dc
|
Added move version (...)se_move_rect_1_tile_vert(), switched to use it in down pop-out animations, updated copy version, and removed my POP_MENU_ANIM_RECT UP/DOWN hack
|
2025-07-13 21:20:57 +03:00 |
|
|
MeirGavish
|
f34444b3db
|
Fixed main_bg_se_copy_rect(), exposed it, and used it in a few places
|
2025-07-13 20:41:40 +03:00 |
|
|
cellos51
|
847f602c9e
|
Changed the way the selecting/played background works and added logic for changing the background depending on blind type
|
2025-07-12 23:39:13 -04:00 |
|