wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
230 Commits 1 Branch 0 Tags
5cedb088168aeb7b5a802d31d945049aca4b374c
Commit Graph
94 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
MeirGavish 69e8df3de9 Merge branch 'main' into refactors 2025-07-20 02:28:38 +03:00
MeirGavish 708d9a813f Fixed screenblock overflow bug and once again merged up/down versions of POP_MENU_ANIM_RECT 2025-07-20 01:55:49 +03:00
MeirGavish a484d8cd44 Merge branch 'main' into bug_fixes 2025-07-19 22:31:35 +03:00
MeirGavish 0e231328ec Added right align text rect function and fixed blind requirement overflow when it's 4 digits (will still overflow for more) 2025-07-19 22:25:46 +03:00
MeirGavish bef11f9923 Fixed blind bottom of rect overwrite on skip bug 2025-07-19 17:17:23 +03:00
MeirGavish 5d5a8a2d4b Fixed an error in previous hand background commit 2025-07-13 23:42:03 +03:00
MeirGavish caeb9ae6ef Merge branch 'main' into refactors 2025-07-13 23:26:45 +03:00
MeirGavish 8cbfa70590 Switched hand background playing/selecting switch to use small moves instead of big copies 2025-07-13 23:17:37 +03:00
MeirGavish e7589f27dc Added move version (...)se_move_rect_1_tile_vert(), switched to use it in down pop-out animations, updated copy version, and removed my POP_MENU_ANIM_RECT UP/DOWN hack 2025-07-13 21:20:57 +03:00
MeirGavish f34444b3db Fixed main_bg_se_copy_rect(), exposed it, and used it in a few places 2025-07-13 20:41:40 +03:00
MeirGavish 90f8e47229 Merge branch 'fix_build_error' into refactors 2025-07-13 13:07:42 +03:00
MeirGavish e65d15654f Fixed compilation error 2025-07-13 11:15:30 +03:00
MeirGavish 9f34d9fd95 Merge branch 'main_bg_se_copy_rect' into refactors 2025-07-13 04:56:04 +03:00
MeirGavish 43a32f5a99 Merge branch 'main' into start_at_blind_selection 2025-07-11 19:42:52 +03:00
MeirGavish 8d721b77e1 Fixed issue where pop menu panels overrode joker and consumable panels 2025-07-11 18:58:06 +03:00
MeirGavish a9a49e0884 Avoid non-small blind selection because it currently crashes the game 2025-07-11 18:42:53 +03:00
MeirGavish 4e5e1f340e Changed game to start at blind selection - added game_round_init() and game_set_state() etc to try and make easier state transmissions 2025-07-11 18:22:45 +03:00
MeirGavish 3741f6f3bd Used main_bg_se_copy_rect_1_tile_vert for current blind raising 2025-07-11 04:06:04 +03:00
MeirGavish 2b60340747 Created function main_bg_se_copy_rect 2025-07-11 03:05:34 +03:00
MeirGavish 04e9aefe51 Merge branch 'main' into refactors 2025-07-11 02:44:47 +03:00
MeirGavish 4f3c91361d Whitespace edit 2025-07-10 23:37:56 +03:00
MeirGavish 05f4cc2abb Fixed generic main_bg_se_copy_rect_1_tile_vert() function and replaced some code with it 2025-07-10 23:20:44 +03:00
MeirGavish 6ef1f51c55 Merged "main"into "refactors" (manual conflict resolution) 2025-07-10 16:47:53 +03:00
MeirGavish fb7b60431c Extracted pop menu animation to a rect copying function for shop 2025-07-10 16:37:43 +03:00
MeirGavish 83af67c3ed Merged "main" into "refactors" (manually) 2025-07-09 22:27:21 +03:00
MeirGavish d787a918b6 Refactored so only set_hand() sets the global variable and not hand_get_type() so as to conform to set/get semantics 2025-07-09 22:17:16 +03:00
MeirGavish 83aa422f3e Refactor - replaced (almost) all magic numbers for TTE rects with rect definitions 2025-07-09 17:12:00 +03:00
MeirGavish b822d2b365 Moved code to new graphic_utils.c/.h header and added Rect wrapper struct 2025-07-09 04:59:19 +03:00
MeirGavish 2aaee73bac Replaced round end menu hack with clear rect function 2025-07-09 04:11:55 +03:00
MeirGavish de3e75928d Merge branch 'main' into refactors 2025-07-09 00:45:07 +03:00
MeirGavish 2a92b3ecaa Added SBB and CBB defines for SE/tile bases to remove their magic numbers 2025-07-09 00:40:59 +03:00
MeirGavish ef973f54fe Another indent fix 2025-07-08 19:19:16 +03:00
MeirGavish f392237b68 Fixed indent error from previous commit 2025-07-08 19:15:12 +03:00
MeirGavish e65b43e966 Fixed five of a kind bug 2025-07-08 19:11:48 +03:00
MeirGavish 878a0a24eb Replaced call to vid_sync() with the better VBlankIntrWait() 2025-07-03 04:15:48 +03:00
MeirGavish fca36200f1 Added Visual Studio project files to .gitignore 2025-07-03 04:13:10 +03:00
MeirGavish ce9e77d201 Fixed E character and "Score Aim" -> "Score Min" according to review 2025-06-30 15:44:15 +03:00
MeirGavish e65a5cf133 Merge branch 'main' into graphic_changes 2025-06-30 13:26:44 +03:00
MeirGavish 3ead483367 Merge branch 'main' into graphic_changes 2025-06-30 13:26:10 +03:00
MeirGavish 2969c8c18c Merge branch 'refactor_addendum' into refactors 2025-06-30 06:33:14 +03:00
MeirGavish b04b69e117 Added pixel to small background text height to make it more readable 2025-06-30 06:28:31 +03:00
MeirGavish c8c966b459 Missing change from previous refactor magic number commit 2025-06-30 06:12:31 +03:00
MeirGavish 9f9efeb8a4 refactor - extracted functions into smaller sub-functions 2025-06-29 19:13:36 +03:00
MeirGavish 8bbe707dab refactor - removed some magic numbers 2025-06-29 11:58:54 +03:00
MeirGavish 1c65652f7b Added Visual Studio dir to .gitignore 2025-06-29 10:55:21 +03:00