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
7bbaec261b
Merge branch 'main' into game_over_screen
2025-08-19 13:33:20 +03:00
MeirGavish
9164fba996
Even Steven card corner fix
2025-08-17 14:51:04 +03:00
MeirGavish
1b9785bc1f
Sly Joker card corner fix
2025-08-17 13:42:56 +03:00
MeirGavish
c3f9f57e7f
Merge pull request #74 from theturtlemafia/ttm/joker-scope-joker-1
...
Adds Blue Joker, Even Steven, Odd Todd, Scholar, Business Card and unused code for jokers without sprites Raised Fist, Reserved Parking, Scary Face, Abstract Joker, Bull, and Smiley Face
2025-08-17 12:46:46 +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
8524a78271
Merge pull request #102 from cellos51/joker_selling
...
Joker Selling
2025-08-17 10:57:38 +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
bc8847d2cb
Merge branch 'main' into joker_selling
2025-08-16 12:41:38 +03:00
MeirGavish
b63559862f
renamed int_list.c to list.c
2025-08-16 12:41:11 +03:00
MeirGavish
3e775f2ac6
Added game over menu tiles to background_gfx.png and removed dedicated background file
2025-08-16 12:27:31 +03:00
MeirGavish
ff17883b6f
Merge branch 'main' into game_over_screen
2025-08-16 12:00:32 +03:00
MeirGavish
3557e7d34d
Fixed inconsistent joker 'A's and rounded card corners
2025-08-16 10:56:22 +03:00
MeirGavish
eaefc8e522
Merge pull request #101 from cellos51/joker_selling
...
Selection Grid System
2025-08-16 08:27:51 +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
cellos51
5d0ea3a101
Changed formatting on github link
2025-08-12 21:42:44 -04:00
cellos51
4c5c0f4d40
Removed rng set in game_round_init() and updated defines for splash screen
2025-08-12 20:55:03 -04:00
cellos51
abfcb68f75
Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen
2025-08-12 20:53:31 -04:00
MeirGavish
f66e296989
Merge branch 'main' into hblank_affine_background_effects
2025-08-12 17:24:14 +03:00
MeirGavish
5ef7fa49aa
Added more undesired IDE artifacts to .gitignore
2025-08-12 17:22:42 +03:00
MeirGavish
85e0d764ff
Merge pull request #97 from cellos51/optimizations
...
Removed floating point operations to improve performance
2025-08-12 11:44:07 +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
3aa49e8625
Merge pull request #96 from cellos51/hblank_affine_background_effects_optimizations
...
Optimized affine background HBLANK effect (still not good enough)
2025-08-12 02:03:07 +03:00
MeirGavish
05af8217ff
Small affine background CBB/SBB fix
2025-08-12 01:59:04 +03:00
MeirGavish
5ba0b1034b
Comment clarification
2025-08-12 01:07:20 +03:00
MeirGavish
b043b82d3f
Optimized affine background HBLANK effect - improved but still not good enough
2025-08-12 00:06:04 +03:00
cellos51
f2497a1284
fixed boss blind background being too dark
2025-08-10 16:34:47 -04:00
cellos51
7505d89194
Addec count down timer to splash screen and stopped music playing until at menu
2025-08-10 13:11:05 -04:00
cellos51
7d2be834a3
Splash screen with disclaimer added
2025-08-10 13:00:38 -04:00
cellos51
c5ff984e84
Added copliot's changes
2025-08-10 12:09:59 -04:00
cellos51
dcf892a393
Moved seed calculation into main_menu state
2025-08-10 12:04:06 -04:00
cellos51
d2aee1979b
Reverted game over logic
2025-08-10 11:59:35 -04:00
cellos51
d20b5c5ce4
Buggy restarting
2025-08-09 23:18:52 -04:00
cellos51
164f58aa1e
Main menu prototype
2025-08-09 21:49:37 -04:00
theturtlemafia
254efd7841
implement feedback
2025-08-09 19:23:47 -04:00
cellos51
af2358f487
Minor optimization
2025-08-09 17:08:18 -04:00
MeirGavish
8a905907fc
Merge pull request #92 from cellos51/joker_pooling
...
Joker pooling + Shop code refactor
2025-08-09 23:05:40 +03:00
cellos51
0dde0cb6ef
Took Copilot's advice and defined some magic numbers
2025-08-09 15:14:57 -04:00
cellos51
1ef0ce212b
Different animation and fixed top 3 scanlines
2025-08-09 14:58:21 -04:00
MeirGavish