Commit Graph

Select branches

Hide Pull Requests

prototype/chinese-joker-descriptions

Mono Color

• ff17883b6f Merge branch 'main' into game_over_screen MeirGavish 2025-08-16 12:00:32 +03:00
• 3557e7d34d Fixed inconsistent joker 'A's and rounded card corners MeirGavish 2025-08-16 10:56:22 +03:00
• eaefc8e522 Merge pull request #101 from cellos51/joker_selling MeirGavish 2025-08-16 08:27:51 +03:00
• ae019be190 Fixed shop initial selection to be visible + extracted shop outro MeirGavish 2025-08-16 06:41:33 +03:00
• 168e34375d Refactored shop_jokers to use list so purchased jokers can't be selected MeirGavish 2025-08-15 21:32:10 +03:00
• 2a4f045db6 Refactored list code to be generic void* list MeirGavish 2025-08-15 20:03:17 +03:00
• d1677e82d2 Added Selection Grid system and refactored shop code to use it MeirGavish 2025-08-15 19:30:07 +03:00
• b218d4ac3e (Manual conflict res) Merge branch 'main' into ttm/joker-scope-joker-1 MeirGavish 2025-08-15 10:56:41 +03:00
• 06dc4f9c62 Extracted focus to SpriteObject for joker selling - WIP MeirGavish 2025-08-15 10:38:20 +03:00
• 5d0ea3a101 Changed formatting on github link cellos51 2025-08-12 21:42:44 -04:00
• 4c5c0f4d40 Removed rng set in game_round_init() and updated defines for splash screen cellos51 2025-08-12 20:55:03 -04:00
• abfcb68f75 Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen cellos51 2025-08-12 20:53:31 -04:00
• f66e296989 Merge branch 'main' into hblank_affine_background_effects MeirGavish 2025-08-12 17:24:14 +03:00
• 5ef7fa49aa Added more undesired IDE artifacts to .gitignore MeirGavish 2025-08-12 17:22:42 +03:00
• 85e0d764ff Merge pull request #97 from cellos51/optimizations MeirGavish 2025-08-12 11:44:07 +03:00
• 0e080b916e Reverted removals of float2fx() as they're compiler-optimized but kept float optimization MeirGavish 2025-08-12 11:40:22 +03:00
• 658b0572d9 Removed all uses of float for optimization MeirGavish 2025-08-12 03:01:02 +03:00
• 3aa49e8625 Merge pull request #96 from cellos51/hblank_affine_background_effects_optimizations MeirGavish 2025-08-12 02:03:07 +03:00
• 05af8217ff Small affine background CBB/SBB fix MeirGavish 2025-08-12 01:59:04 +03:00
• 5ba0b1034b Comment clarification MeirGavish 2025-08-12 01:07:20 +03:00
• b043b82d3f Optimized affine background HBLANK effect - improved but still not good enough MeirGavish 2025-08-12 00:06:04 +03:00
• f2497a1284 fixed boss blind background being too dark cellos51 2025-08-10 16:34:47 -04:00
• 7505d89194 Addec count down timer to splash screen and stopped music playing until at menu cellos51 2025-08-10 13:11:05 -04:00
• 7d2be834a3 Splash screen with disclaimer added cellos51 2025-08-10 13:00:38 -04:00
• c5ff984e84 Added copliot's changes cellos51 2025-08-10 12:09:59 -04:00
• dcf892a393 Moved seed calculation into main_menu state cellos51 2025-08-10 12:04:06 -04:00
• d2aee1979b Reverted game over logic cellos51 2025-08-10 11:59:35 -04:00
• d20b5c5ce4 Buggy restarting cellos51 2025-08-09 23:18:52 -04:00
• 164f58aa1e Main menu prototype cellos51 2025-08-09 21:49:37 -04:00
• 254efd7841 implement feedback theturtlemafia 2025-08-09 19:23:47 -04:00
• af2358f487 Minor optimization cellos51 2025-08-09 17:08:18 -04:00
• 8a905907fc Merge pull request #92 from cellos51/joker_pooling MeirGavish 2025-08-09 23:05:40 +03:00
• 0dde0cb6ef Took Copilot's advice and defined some magic numbers cellos51 2025-08-09 15:14:57 -04:00
• 1ef0ce212b Different animation and fixed top 3 scanlines cellos51 2025-08-09 14:58:21 -04:00
• 38282d0f2a Small refactors MeirGavish 2025-08-09 21:31:41 +03:00
• 521b373bd2 Added new background visuals cellos51 2025-08-09 13:52:24 -04:00
• f77a58a07c Merge branch 'main' into joker_pooling MeirGavish 2025-08-09 20:51:59 +03:00
• 3441a1dae8 Joker pooling - Existing or owned jokers can't appear in shop + shop code refactor MeirGavish 2025-08-09 20:48:18 +03:00
• fc81c04fbc Merge pull request #89 from cellos51/graphic_fixes MeirGavish 2025-08-09 17:39:07 +03:00
• 3260769023 Card corner fixes MeirGavish 2025-08-09 17:35:17 +03:00
• a87929d9f2 Merge pull request #87 from cellos51/revert-85-main MeirGavish 2025-08-09 08:33:18 +03:00
• 08689d41ea Revert "Fix "A" in Zany and Wily Joker for consistency" MeirGavish 2025-08-09 08:32:11 +03:00
• 9d4b6a04b8 Merge branch 'main' into joker_pooling MeirGavish 2025-08-09 06:19:16 +03:00
• d60a6bf9ff Merge pull request #86 from TheBreadPerson/word MeirGavish 2025-08-08 22:59:58 +03:00
• 6007071b7d Complete refactor of naming conventions for memcpy TheBreadPerson 2025-08-08 14:04:09 -04:00
• b98025619f Merge pull request #75 from cellos51/boss_backgrounds MeirGavish 2025-08-08 18:18:04 +03:00
• 6363613f15 Added & back to the tile8_mem in affine_background_init() and changed memcpy16 to 32 cellos51 2025-08-08 10:44:55 -04:00
• 650c09af28 Converted void to u16 in functions cellos51 2025-08-08 09:54:24 -04:00
• ed3e5f695a Merge pull request #85 from GreenNinja2525/main MeirGavish 2025-08-08 16:14:35 +03:00
• ab91438a0d Change "A" in Zany and Wily Joker for consistency Wheeler 2025-08-08 08:32:12 -04:00
• 31ba1f166c Added some documentation for affine_background_load_palette() MeirGavish 2025-08-08 15:03:18 +03:00
• ecbfd97de1 Added some documentation to memcpy16_tile8_with_palette_offset() MeirGavish 2025-08-08 14:47:45 +03:00
• c750d48bfa Merge pull request #84 from cellos51/jokers_with_graphics MeirGavish 2025-08-08 11:46:22 +03:00
• e615588e29 Changed Fibonacci spiral border color to be more like the original MeirGavish 2025-08-08 11:44:16 +03:00
• c938310bf7 Transparency fix for joker_gfx6.png MeirGavish 2025-08-08 11:29:19 +03:00
• a1c64ef5a6 Added sprite improvements by @GreenNinja2525 for Blackboard, Mystic Summit, and Fibonacci with minor tweaks MeirGavish 2025-08-08 11:24:18 +03:00
• 54edefdc12 Added recolors to hand type jokers by @GreenNinja2525 MeirGavish 2025-08-08 10:22:28 +03:00
• 12ca27e27b Removed default color for affine background and changed to load palette from image instead cellos51 2025-08-08 00:32:30 -04:00
• 3c79a35b92 Redefined affinge background default color to use RGB15 and reverted grayscale of background image cellos51 2025-08-08 00:22:04 -04:00
• dbe8585c0a Refactor affine_background_set_color to simplify brightness adjustment logic cellos51 2025-08-08 00:08:28 -04:00
• bebe2237e4 Add memcpy16_tile8_with_palette_offset function and update affine_background_init to use it cellos51 2025-08-08 00:00:20 -04:00
• 9be6a31dce Use tonc defines for getting colors cellos51 2025-08-07 23:31:23 -04:00
• 01d7ed8e91 Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds cellos51 2025-08-07 21:34:46 -04:00
• 69a7bd3a79 Merge pull request #83 from cellos51/jokers_with_graphics MeirGavish 2025-08-08 02:23:26 +03:00
• 039c5771e1 Grouped Banner with Stencil to optimize palettes (Swapped with Misprint) MeirGavish 2025-08-08 02:22:02 +03:00
• fd8e52d48a Removed magic numbers for card score length and intmax buffer sizes MeirGavish 2025-08-08 01:59:21 +03:00
• 7e6cc02869 Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds cellos51 2025-08-07 17:44:58 -04:00
• 2ce3acbe1c Merge branch 'main' into jokers_with_graphics MeirGavish 2025-08-08 00:32:10 +03:00
• 863e3a34ae Rearranged jokers for palette optimization (Banner and Mystic Summit don't go well together) MeirGavish 2025-08-08 00:31:10 +03:00
• 5e6d28c663 Fixed stack top bugs in joker_effects.c - e.g. Blackboard activated if just the first card in hand was not spades/clubs MeirGavish 2025-08-08 00:01:36 +03:00
• 4492176df2 allows multiple joker-effect popup texts theturtlemafia 2025-08-02 00:27:35 -04:00
• 50ec1bcdab Added art by @GreenNinja2525 for jokers Walkie-Talkie, Fibonacci, Banner, Mystic Summit, and Blackboard MeirGavish 2025-08-07 23:08:35 +03:00
• b0a4fc968c Removed duplicate declarations to fix build MeirGavish 2025-08-07 22:48:06 +03:00
• f84268c14d Added int list for joker pooling MeirGavish 2025-08-07 19:47:55 +03:00
• d83b324b4f Merge pull request #82 from cellos51/club_symbol_change MeirGavish 2025-08-07 15:29:36 +03:00
• fe4b8e081d Changed clubs symbol to improve card readability MeirGavish 2025-08-05 22:03:54 +03:00
• d0ca4a483d Fix indentation in affine_background.c for consistency cellos51 2025-08-05 14:42:37 -04:00
• 592d7ae8bc Add affine background color functionality and integrate into game loop cellos51 2025-08-05 14:35:52 -04:00
• 46b53db8a0 Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds cellos51 2025-08-04 20:13:02 -04:00
• 54d8c780e7 Merge pull request #81 from cellos51/readme_update MeirGavish 2025-08-04 23:24:23 +03:00
• c7f6708555 Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds cellos51 2025-08-04 14:57:45 -04:00
• d41503e673 Created game over background image MeirGavish 2025-08-04 20:25:53 +03:00
• 742114792d Fixed game starting at shop MeirGavish 2025-08-04 20:27:03 +03:00
• 607a175426 Update README.md MeirGavish 2025-08-04 18:56:38 +03:00
• 95b1937eac Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds cellos51 2025-08-04 11:41:48 -04:00
• 38eac4c01c Merge pull request #79 from cellos51/debug_symbols MeirGavish 2025-08-04 10:26:52 +03:00
• d4bef1e55c Merge pull request #78 from cellos51/jokers_palette_swapping MeirGavish 2025-08-04 10:25:54 +03:00
• 8956501591 Merge branch 'main' into jokers_palette_swapping MeirGavish 2025-08-04 10:21:19 +03:00
• 7364c64527 Merge branch 'main' into debug_symbols MeirGavish 2025-08-04 10:21:09 +03:00
• 7c6aa7371f Added -g compile flag to allow debug symbols for IDE debugging MeirGavish 2025-08-04 10:20:49 +03:00
• de672572b1 Updated joker palette swapping system to reuse palettes when jokers are removed MeirGavish 2025-08-02 18:57:50 +03:00
• 5cedb08816 Merge pull request #77 from cellos51/move_shop_price_down MeirGavish 2025-08-03 18:15:58 +03:00
• ec2aaf245d Added clarification comment MeirGavish 2025-08-03 18:15:28 +03:00
• bbefff2eb9 Fixed bug where shop price would continue displaying after the item was purchased MeirGavish 2025-08-03 16:51:16 +03:00
• e7b6d24815 Merge pull request #76 from cellos51/move_shop_price_down MeirGavish 2025-08-03 16:10:20 +03:00
• a8f429eca3 Moved the price of shop items below the item so it is not obstructed when the card is raised on highlight MeirGavish 2025-08-03 16:08:41 +03:00
• dcff326730 Refactor to make it just change the brightness of a chosen color. I will make a seperate .h/.c file for the affine background when I get home. Elliptical 2025-08-02 14:54:08 -04:00
• 445ea788a4 fix error from rebase theturtlemafia 2025-08-02 13:28:28 -04:00
• 174050d813 add fist, parking, business card, scholar, scary face, abstact, bull, smiley, even, odd jokers theturtlemafia 2025-08-02 12:18:55 -04:00
• ee0591562f add blue joker theturtlemafia 2025-08-02 01:14:41 -04:00