wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
301 Commits 1 Branch 0 Tags
eaefc8e522083adf5b48d702b81d6baa29b376e0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 06dc4f9c62 Extracted focus to SpriteObject for joker selling - WIP 2025-08-15 10:38:20 +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 05af8217ff Small affine background CBB/SBB fix 2025-08-12 01:59:04 +03:00
MeirGavish 8a905907fc Merge pull request #92 from cellos51/joker_pooling 
Joker pooling + Shop code refactor
 2025-08-09 23:05:40 +03:00
MeirGavish 38282d0f2a Small refactors 2025-08-09 21:31:41 +03: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
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
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
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
MeirGavish 69a7bd3a79 Merge pull request #83 from cellos51/jokers_with_graphics 
Extracted changes from PR #74 and integrated joker graphics into them (+ a few bug fixes)
 2025-08-08 02:23:26 +03: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
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
MeirGavish f84268c14d Added int list for joker pooling 2025-08-07 19:47:55 +03:00
MeirGavish d83b324b4f Merge pull request #82 from cellos51/club_symbol_change 
Changed Clubs corner symbol to improve card readability
 2025-08-07 15:29:36 +03:00
MeirGavish fe4b8e081d Changed clubs symbol to improve card readability 2025-08-05 22:03:54 +03:00
MeirGavish 54d8c780e7 Merge pull request #81 from cellos51/readme_update 
Update README.md
 2025-08-04 23:24:23 +03:00
MeirGavish 742114792d Fixed game starting at shop 2025-08-04 20:27:03 +03:00
MeirGavish 607a175426 Update README.md 
Reworded the readme and added links to the official version of Balatro on all platforms
 2025-08-04 18:56:38 +03:00
MeirGavish 38eac4c01c Merge pull request #79 from cellos51/debug_symbols 
Added -g compile flag to allow debug symbols for IDE debugging
 2025-08-04 10:26:52 +03:00
MeirGavish d4bef1e55c Merge pull request #78 from cellos51/jokers_palette_swapping 
Updated joker palette swapping system to reuse palettes when jokers are removed
Also includes some refactoring in game.c for the shop intro
And also in sprite.c/.h I removed the unused pb and tid fields and provided a sprite_get_pb() function to access the actual parameter from the object
 2025-08-04 10:25:54 +03:00
MeirGavish 8956501591 Merge branch 'main' into jokers_palette_swapping 2025-08-04 10:21:19 +03:00
MeirGavish 7364c64527 Merge branch 'main' into debug_symbols 2025-08-04 10:21:09 +03:00
MeirGavish 7c6aa7371f Added -g compile flag to allow debug symbols for IDE debugging 2025-08-04 10:20:49 +03:00
MeirGavish de672572b1 Updated joker palette swapping system to reuse palettes when jokers are removed 2025-08-04 10:18:33 +03:00
MeirGavish 5cedb08816 Merge pull request #77 from cellos51/move_shop_price_down 
Fixed bug where shop price would continue displaying after the item was purchased
 2025-08-03 18:15:58 +03:00
MeirGavish ec2aaf245d Added clarification comment 2025-08-03 18:15:28 +03:00
MeirGavish bbefff2eb9 Fixed bug where shop price would continue displaying after the item was purchased 2025-08-03 16:51:16 +03:00
MeirGavish e7b6d24815 Merge pull request #76 from cellos51/move_shop_price_down 
Moved the price of shop items below the item so it is not obstructed when the card is raised on highlight
 2025-08-03 16:10:20 +03:00
MeirGavish a8f429eca3 Moved the price of shop items below the item so it is not obstructed when the card is raised on highlight 2025-08-03 16:08:41 +03:00
MeirGavish 8e22dbf02d Merge pull request #73 from theturtlemafia/ttm/even-more-jokers 
Adds XMult, Joker Stencil and Misprint
 2025-08-02 20:23:54 +03:00
MeirGavish 56a211616a Removed misprint magic number 2025-08-02 19:43:44 +03:00
MeirGavish 9f9b557143 Refactor - extracted game_shop_intro() from game_shop() 2025-08-02 18:56:10 +03:00
MeirGavish da8b3bbc00 Merge pull request #72 from cellos51/audio_refactors 
Audio refactors
 2025-08-01 21:06:56 +03:00
MeirGavish cb835653f6 card_select and card_deselect were flipped, fixed them back. This only affects the sound displayed when cards are scored, now it's the select instead of the deselect. 2025-08-01 21:06:07 +03:00
MeirGavish 537ceb622f Added audio_utils.h/.c and refactored calls to mmEffectEx to use wrapper play_sfx() instead 2025-08-01 20:36:07 +03:00
MeirGavish 0407beebf3 Merge pull request #71 from cellos51/small_features 
B button now deselects all selected cards
 2025-08-01 17:51:20 +03:00
MeirGavish 5149e6c23e B button now deselects all selected cards 2025-08-01 17:49:30 +03:00
MeirGavish 9df458b78f Added copilot's full house detection code with @theturtlemafia's boolean simplification. Tested. 2025-08-01 03:17:54 +03:00
MeirGavish fa35ede0f5 Merged main into ttm/bigger-joker-refactor (manual delete of joker_gfx.png for conflict resolution) 2025-08-01 02:11:41 +03:00
MeirGavish c6115ea5be Merge pull request #70 from cellos51/new_jokers_graphics 
Added dynamic palette loading for jokers and added new joker designs by @GreenNinja2525
 2025-08-01 02:09:39 +03:00
MeirGavish 305d093042 Added more joker art by for jokers 6-16, missing code implementation so they are not yet displayed. 2025-08-01 02:03:24 +03:00
MeirGavish 0c834d17c2 Added dynamic palette loading for jokers and added new joker designs by @GreenNinja2525 2025-07-30 21:00:29 +03:00
MeirGavish 095fb455cc Merge pull request #64 from theturtlemafia/ttm/joker-struct-refactor 
Refactor jokers to use struct and function pointer for joker effects and added Lusty, Wrathful, and Gluttonous jokers
 2025-07-29 00:56:04 +03:00
MeirGavish f8d7851c50 Merge branch 'jokers_temp_placeholder_art' 2025-07-29 00:53:55 +03:00
MeirGavish 22a44d4423 Added temporary placeholder art for Lusty, Wrathful, and Gluttonous jokers 2025-07-29 00:52:34 +03:00
MeirGavish 6ccb14034d Merge pull request #66 from cellos51/bug_fixes 
Fixed a bug where selecting discard with 0 discards would toggle card select and extracted function game_playing_process_hand_select_input() from game_playing_process_input_and_state()
 2025-07-27 23:20:01 +03:00
MeirGavish e5602d672f Fixed a bug where selecting discard with 0 discards would toggle card select and extracted function game_playing_process_hand_select_input() 2025-07-27 23:15:28 +03:00
MeirGavish 5c58b092d7 Extracted sinful jokers effects to single function sinful_joker_effect() 2025-07-27 19:01:26 +03:00
MeirGavish 3ed4bdc698 Merge pull request #63 from cellos51/refactors 
Extracted JokerObject and CardObject common functionalities to SpriteObject, removing duplicate code and dangerous casts.
 2025-07-27 13:38:27 +03:00
MeirGavish 4ab7fed2ef Merge branch 'main' into refactors 2025-07-27 01:25:46 +03:00
MeirGavish 8673856f18 Fixed a pixel error in the 7 of diamonds card sprite 2025-07-27 01:22:48 +03:00
MeirGavish f6b6e22c33 Merge branch 'main' into refactors 2025-07-27 01:14:24 +03:00
MeirGavish 95565862b0 Extracted JokerObject and CardObject common functionalities to SpriteObject, removing duplicate code and dangerous casts. 2025-07-27 01:13:57 +03:00
MeirGavish 8f49332aa3 Merge pull request #62 from cellos51/ci_changes 
Added flag to Makefile to treat warnings as errors
 2025-07-26 22:58:21 +03:00
MeirGavish 8043a2bad6 Added flag to Makefile to treat warnings as errors that fail build, and commented out code in game.c to be warning free 2025-07-26 20:04:39 +03:00
MeirGavish 942a954d00 Merge pull request #61 from cellos51/graphic_changes 
Moved the PLAY text of the PLAY HAND button one pixel down so it is separated from the button highlight
 2025-07-26 19:56:01 +03:00
MeirGavish 16d327b7f4 Moved the PLAY text of the PLAY HAND button one pixel down so it is separated from the button highlight 2025-07-26 19:54:22 +03:00
MeirGavish 4a630a25d2 Merge pull request #60 from cellos51/refactors 
Renamed functions updating the display values from set_score, set_money etc...
 2025-07-26 19:43:26 +03:00
MeirGavish 1c036482a1 Renamed functions updating the display values from set_score, set_money etc. to display_score, display_money etc. to remove implication they are setting an actual value 2025-07-26 19:40:38 +03:00
MeirGavish d62509aff3 Changed the build CI workflow to be triggered for pushes only to the main branch 
I just thought triggering on push to any branch is a little excessive
 2025-07-26 12:54:37 +03:00
MeirGavish c49dbbab64 Merge pull request #58 from MeirGavish/create_ci_github_actions 
Created a CI Build Test using Github Actions
 2025-07-26 11:48:03 +03:00
MeirGavish 03e3d31e38 Fixed build_ci_workflow.yml to trigger on pull requests to main 2025-07-26 11:21:24 +03:00
MeirGavish b39d95ae2d Reset cache key version to v1 and added more comments in build_ci_workflow.yml 2025-07-26 01:46:10 +03:00
MeirGavish c745d776d0 Created Github Actions Build CI Test build_ci_workflow.yml 2025-07-26 01:40:33 +03:00
MeirGavish 8bbf97ea65 Merge pull request #53 from cellos51/fixed-sprite-vram-optimizations (Re-applied sprite vram optimizations after blind sprite fix) 2025-07-24 11:27:33 +03:00
MeirGavish c781807ed8 Revert "Sprite vram optimizations" 2025-07-24 02:14:04 +03:00
MeirGavish 5cc62612f5 Merge pull request #47 from cellos51/refactors 
Moved the round end blind sprite and score a bit to the left so they look better for 4 digits
 2025-07-23 19:49:46 +03: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
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
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
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