 cellos51
|
6a1f3bcd7a
|
I hope this works
|
2025-07-23 20:14:22 -04:00 |
|
|
MeirGavish
|
c781807ed8
|
Revert "Sprite vram optimizations"
|
2025-07-24 02:14:04 +03:00 |
|
|
cellos51
|
ea5e4d5d1e
|
refactor: remove commented-out code and simplify joker initialization
|
2025-07-23 17:35:42 -04: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
|
300e725dfe
|
made jokers dynamic and changed memcpy to us 32
|
2025-07-23 17:00:18 -04:00 |
|
|
cellos51
|
d122fde361
|
card layer does something now
|
2025-07-23 16:33:18 -04:00 |
|
|
cellos51
|
011bc64bab
|
huge memory save
|
2025-07-23 16:17:24 -04:00 |
|
|
MeirGavish
|
2ed5922d43
|
merged jokers_refactors into refactors (manual conflict resolution)
|
2025-07-23 19:36:30 +03:00 |
|
|
MeirGavish
|
5e6bc76f5f
|
Merge branch 'main' into jokers_refactors
|
2025-07-23 19:33:39 +03:00 |
|
|
TheBreadPerson
|
b6a8fd4e6a
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into truncating
|
2025-07-23 01:47:25 -04:00 |
|
|
TheBreadPerson
|
b994358ac6
|
Minor number change
|
2025-07-23 01:45:00 -04:00 |
|
|
cellos51
|
c025d35468
|
null check on greedy joker
|
2025-07-22 20:07:51 -04:00 |
|
|
cellos51
|
0e40dc43f7
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-22 20:00:15 -04:00 |
|
|
cellos51
|
1b4267893d
|
Added greedy joker and refactor joker system
|
2025-07-22 20:00:05 -04:00 |
|
|
MeirGavish
|
8ed7ddb127
|
Moved the round end blind sprite and score a bit so they look better on 4 digits
|
2025-07-23 02:14:30 +03:00 |
|
|
cellos51
|
62db2815dd
|
removed another static variable and improved boss blind selection
|
2025-07-22 17:43:52 -04:00 |
|
|
cellos51
|
e51e08322f
|
Fixed compilation error and removed another static variable
|
2025-07-22 17:39:33 -04:00 |
|
|
cellos51
|
c536d78976
|
Minor refactor to avoid the use of variable
|
2025-07-22 17:35:52 -04:00 |
|
|
MeirGavish
|
c48ddee5c4
|
Fixed a bug in text overflow case for update_text_rect_to_right_align_num()
|
2025-07-23 00:32:31 +03:00 |
|
|
MeirGavish
|
c24dcab726
|
Added TODO note and a warning comment
|
2025-07-23 00:02:24 +03:00 |
|
|
cellos51
|
b583755985
|
Refactored background change logic and removed unused static state variables in game functions
|
2025-07-22 15:53:49 -04:00 |
|
|
cellos51
|
793da72465
|
added co-pilot's fixes
|
2025-07-22 15:45:29 -04:00 |
|
|
TheBreadPerson
|
7a86450114
|
Starting to truncate numbers, half-baked
|
2025-07-22 15:34:03 -04:00 |
|
|
MeirGavish
|
087cb47f9d
|
Merge branch 'main' into refactors
|
2025-07-22 16:31:38 +03:00 |
|
|
MeirGavish
|
71d41d7f62
|
Switched all the code in graphic_utils.c to use se_mat instead of se_mem, it's beautiful
|
2025-07-22 16:30:48 +03:00 |
|
|
cellos51
|
9086aa0f59
|
Fixed hands and discards being infinite and palette issue
|
2025-07-22 02:26:22 -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
|
95d032f36b
|
Corrected joker sprite canvas size and fixed money not being erased
|
2025-07-21 20:27:30 -04:00 |
|
|
cellos51
|
1b53a1b077
|
Updated to joker sprite to use the new one by @GreenNinja2525 and changed the way switching backgrounds works to prevent flicker
|
2025-07-21 20:09:35 -04:00 |
|
|
cellos51
|
86cf8896e2
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-21 18:46:48 -04:00 |
|
|
cellos51
|
f9706ef429
|
Added boss blind colors to the blind select screen
|
2025-07-20 22:48:58 -04:00 |
|
|
cellos51
|
99907ec90a
|
Change initial game state from GAME_SHOP to GAME_BLIND_SELECT
|
2025-07-20 22:42:30 -04:00 |
|
|
cellos51
|
7688b5062c
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-20 22:38:45 -04:00 |
|
|
cellos51
|
c848419fdc
|
Added The Wall's background palette
|
2025-07-20 22:24:37 -04:00 |
|
|
cellos51
|
a3a4d065b5
|
Jokers have prices in shop
|
2025-07-20 22:19:57 -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
|
69e8df3de9
|
Merge branch 'main' into refactors
|
2025-07-20 02:28:38 +03:00 |
|
|
MeirGavish
|
708d9a813f
|
Fixed screenblock overflow bug and once again merged up/down versions of POP_MENU_ANIM_RECT
|
2025-07-20 01:55:49 +03: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
|
fac4a3c626
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
|
2025-07-19 15:16:08 -04:00 |
|
|
MeirGavish
|
bef11f9923
|
Fixed blind bottom of rect overwrite on skip bug
|
2025-07-19 17:17:23 +03:00 |
|
|
cellos51
|
52fa45e426
|
Refactor joker selection logic in game shop
|
2025-07-18 20:38:34 -04: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
|
ea2e503222
|
Ante up on boss defeat
|
2025-07-17 18:02:46 -04:00 |
|
|
cellos51
|
54d8aa2ec6
|
Applied most refactors from previous merge by @MeirGavish
|
2025-07-16 21:31:05 -04:00 |
|
|
cellos51
|
a37ba18386
|
Fixed palette issue
|
2025-07-16 15:57:07 -04:00 |
|