Commit Graph
372 Commits
Author SHA1 Message Date
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 b63559862f renamed int_list.c to list.c 2025-08-16 12:41:11 +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 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 05af8217ff Small affine background CBB/SBB fix 2025-08-12 01:59:04 +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
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 3441a1dae8 Joker pooling - Existing or owned jokers can't appear in shop + shop code refactor 2025-08-09 20:48:18 +03:00
MeirGavish 9d4b6a04b8 Merge branch 'main' into joker_pooling 2025-08-09 06:19:16 +03:00
TheBreadPerson 6007071b7d Complete refactor of naming conventions for memcpy 2025-08-08 14:04:09 -04: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
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 dbe8585c0a Refactor affine_background_set_color to simplify brightness adjustment logic 2025-08-08 00:08:28 -04:00
cellos51 bebe2237e4 Add memcpy16_tile8_with_palette_offset function and update affine_background_init to use it 2025-08-08 00:00:20 -04:00
cellos51 9be6a31dce Use tonc defines for getting colors 2025-08-07 23:31:23 -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 039c5771e1 Grouped Banner with Stencil to optimize palettes (Swapped with Misprint) 2025-08-08 02:22:02 +03: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 863e3a34ae Rearranged jokers for palette optimization (Banner and Mystic Summit don't go well together) 2025-08-08 00:31: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
theturtlemafia 4492176df2 allows multiple joker-effect popup texts 2025-08-07 23:08:41 +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 b0a4fc968c Removed duplicate declarations to fix build 2025-08-07 22:48:06 +03:00