 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
|
38282d0f2a
|
Small refactors
|
2025-08-09 21:31:41 +03:00 |
|
|
cellos51
|
521b373bd2
|
Added new background visuals
|
2025-08-09 13:52:24 -04:00 |
|
|
MeirGavish
|
f77a58a07c
|
Merge branch 'main' into joker_pooling
|
2025-08-09 20:51:59 +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 |
|
|
MeirGavish
|
fc81c04fbc
|
Merge pull request #89 from cellos51/graphic_fixes
Card corner fixes
|
2025-08-09 17:39:07 +03:00 |
|
|
MeirGavish
|
3260769023
|
Card corner fixes
|
2025-08-09 17:35:17 +03:00 |
|
|
MeirGavish
|
a87929d9f2
|
Merge pull request #87 from cellos51/revert-85-main
Revert "Fix "A" in Zany and Wily Joker for consistency" due to messing of palette data
|
2025-08-09 08:33:18 +03:00 |
|
|
MeirGavish
|
08689d41ea
|
Revert "Fix "A" in Zany and Wily Joker for consistency"
|
2025-08-09 08:32:11 +03:00 |
|
|
MeirGavish
|
9d4b6a04b8
|
Merge branch 'main' into joker_pooling
|
2025-08-09 06:19:16 +03:00 |
|
|
MeirGavish
|
d60a6bf9ff
|
Merge pull request #86 from TheBreadPerson/word
Complete refactor of naming conventions for memcpy
|
2025-08-08 22:59:58 +03:00 |
|
|
TheBreadPerson
|
6007071b7d
|
Complete refactor of naming conventions for memcpy
|
2025-08-08 14:04:09 -04:00 |
|
|
MeirGavish
|
b98025619f
|
Merge pull request #75 from cellos51/boss_backgrounds
Switching to a boss blind now changes the background palette
|
2025-08-08 18:18:04 +03: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
|
ed3e5f695a
|
Merge pull request #85 from GreenNinja2525/main
Fix "A" in Zany and Wily Joker for consistency
|
2025-08-08 16:14:35 +03:00 |
|
|
Wheeler
|
ab91438a0d
|
Change "A" in Zany and Wily Joker for consistency
|
2025-08-08 08:32:12 -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 |
|
|
MeirGavish
|
c750d48bfa
|
Merge pull request #84 from cellos51/jokers_with_graphics
Added Joker art updates by @GreenNinja2525 with some minor tweaks
|
2025-08-08 11:46:22 +03:00 |
|
|
MeirGavish
|
e615588e29
|
Changed Fibonacci spiral border color to be more like the original
|
2025-08-08 11:44:16 +03:00 |
|
|
MeirGavish
|
c938310bf7
|
Transparency fix for joker_gfx6.png
|
2025-08-08 11:29:19 +03:00 |
|
|
MeirGavish
|
a1c64ef5a6
|
Added sprite improvements by @GreenNinja2525 for Blackboard, Mystic Summit, and Fibonacci with minor tweaks
|
2025-08-08 11:24:18 +03:00 |
|
|
MeirGavish
|
54edefdc12
|
Added recolors to hand type jokers by @GreenNinja2525
|
2025-08-08 10:22:28 +03:00 |
|