wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
537 Commits 1 Branch 0 Tags
0b848cd72e1a5609c6d59f3f4cc5af866a1be0bf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MeirGavish 0b848cd72e Merge branch 'main' into start_music_after_splashscreen 2025-10-21 12:25:07 +03:00
MeirGavish 8a4242e81e Merge pull request #132 from ricfehr3/feature/replace-malloc-with-pools 
Feature/replace malloc with pools
 2025-10-21 12:03:52 +03:00
MeirGavish 462c040e9a Changed the check in game_change_state() to full bounds checking 2025-10-19 11:45:48 +03:00
MeirGavish 53d2e53d78 Changed music to start after Splash Screen 2025-10-17 13:43:21 +03:00
MeirGavish f725c5e1b8 Merge pull request #155 from drewjohnson2/stateRefactor 
State refactor
 2025-10-17 11:51:24 +03:00
MeirGavish 6dce57e197 Merge pull request #145 from pansythoughts/main 
kind of fixed how game_speed behaves
 2025-10-14 13:57:40 +03:00
MeirGavish b5b7c856d6 Merge pull request #133 from ricfehr3/refactor-blinds 
Cleanup, Refactor blinds into a map
 2025-10-14 13:46:27 +03:00
MeirGavish f36fa5e998 Merge pull request #169 from cellos51/implement_joker_testing 
Implement joker testing
 2025-10-13 21:27:42 +03:00
MeirGavish 71de180871 Merge branch 'main' into implement_joker_testing 2025-10-13 20:59:17 +03:00
MeirGavish 8c25089966 Allow defining an ID for a joker to always appear in shop and be tested 2025-10-13 20:58:44 +03:00
MeirGavish d7f64d3570 Merge pull request #166 from cellos51/integrate_joker_art 
Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization)
 2025-10-09 23:54:56 +03:00
MeirGavish 9d1a51884f Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization) 2025-10-09 23:42:07 +03:00
MeirGavish 609e1f19b6 Merge pull request #159 from MathisMartin31/main 
Add Pareidolia and Acrobat Jokers
 2025-10-09 20:43:36 +03:00
MeirGavish 30638b65e2 Merge pull request #164 from ricfehr3/hotfix/hand-input-order 
Fix softlock related to #163
 2025-10-09 15:16:56 +03:00
MeirGavish 94cb898bb9 Merge pull request #134 from drewjohnson2/magic_numbers 
Magic numbers
 2025-10-09 11:18:02 +03:00
MeirGavish 9b6c77ea3f Merge pull request #119 from Nanrech/pr-fix 
Add blueprint and brainstorm jokers
 2025-10-08 22:46:01 +03:00
MeirGavish 4b35b2f7d8 Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525 2025-10-08 22:40:15 +03:00
MeirGavish f257ec03af Merge pull request #150 from ricfehr3/docs/update-docs-docker 
Update docs for docker
 2025-10-08 10:32:11 +03:00
MeirGavish 296c489562 Merge pull request #162 from cellos51/integrate_joker_art 
Integrate joker art
 2025-10-08 00:45:09 +03:00
MeirGavish ae40949008 Fixed Bull border corner transparency 2025-10-08 00:18:30 +03:00
MeirGavish 77f76bd4ef Removed "unused" attribute from integrated jokers 2025-10-08 00:05:37 +03:00
MeirGavish a0f1ef7780 Added art for xmult hand jokers The Duo The Trio, The Family, The Order, and The Tribe by @MathisMartin31 2025-10-07 23:52:49 +03:00
MeirGavish 73c2db6b69 Merge pull request #143 from ricfehr3/feature/ci-release-on-tag 
Add uploading ROM on tag push
 2025-10-07 23:04:19 +03:00
MeirGavish c529c4be69 Added art for jokers Abstract Joker by @MathisMartin31 and Bull by @NoWhammies10 and @GreenNinja2525 2025-10-07 21:26:43 +03:00
MeirGavish 46936c1878 Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10 2025-10-07 21:13:31 +03:00
MeirGavish 22ddd83931 Merge pull request #138 from Seafoamm/main 
Add macOS setup instructions
 2025-10-07 16:20:01 +03:00
MeirGavish f7c68934f7 Merge pull request #146 from noctowlhoot/main 
Added more Jokers all outside of scope, some with art available already from MathisMartin31
 2025-10-07 13:01:48 +03:00
MeirGavish 4fc0fbf5a8 Merge pull request #139 from mannodermaus/wrap-hand-input-on-oob-movement 
Wrap around hand selection when going out of bounds horizontally
 2025-10-07 12:56:53 +03:00
MeirGavish f579c13ceb Merge pull request #149 from GreenNinja2525/main 
Fix Dynamic Badges (Hopefully) [Now Safe to Merge]
 2025-09-27 21:44:27 +02:00
MeirGavish 8dbcadac59 Merge pull request #153 from ricfehr3/feature/add-version 
Add git hash baked into ROM for bug reports
 2025-09-27 21:41:09 +02:00
MeirGavish 74739d87ed Merge pull request #123 from drewjohnson2/main 
Adding an x macro to cut down on some boilerplate.
 2025-09-22 23:15:56 +02:00
MeirGavish 9dc5f7ccc3 Merge pull request #116 from HeadedBranch/main 
Add install instructions for linux
 2025-09-18 21:44:30 +02:00
MeirGavish 27e91fb4a4 Merge pull request #121 from drewjohnson2/main 
Removed redundant copy of shadow buffer into OAM.
 2025-09-15 23:50:50 +03:00
MeirGavish a16065439e Merge pull request #117 from ricfehr3/main 
Add docker support
 2025-09-15 22:30:21 +03:00
MeirGavish d1bbba82df Merge pull request #112 from GreenNinja2525/main 
Revise Build Instructions
 2025-08-30 20:56:32 +03:00
MeirGavish aec53ced91 Merge pull request #111 from cellos51/held_jokers_refactor 
Small refactor for the joker lists to have wrapping functions to add and remove jokers
 2025-08-30 02:16:15 +03:00
MeirGavish cc65fbc5de Small refactor for the joker lists to have wrapping functions to add and remove jokers 2025-08-30 02:15:00 +03:00
MeirGavish c15c2821e8 Merge branch 'hblank_affine_background_effects' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects 2025-08-29 16:26:41 +03:00
MeirGavish 5e4722e27b Merge pull request #109 from GreenNinja2525/main 
README.md Rework with Custom Badges
 2025-08-25 21:13:00 +03:00
MeirGavish ff9c28cbed Merge branch 'main' into hblank_affine_background_effects 2025-08-22 20:16:26 +03:00
MeirGavish 3d3d7198b8 Merge pull request #107 from cellos51/blue_joker_fixes_additional_proposed_changes 
Additional change for Blue Joker
 2025-08-22 19:58:09 +03:00
MeirGavish ff54bb244f Merge pull request #108 from cellos51/smiley_scary_face 
Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code
 2025-08-22 19:55:46 +03:00
MeirGavish 1d070b9c3f Fixed Blue Joker shine 2025-08-22 19:47:56 +03:00
MeirGavish 2d50005e30 Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code 2025-08-22 19:43:27 +03:00
MeirGavish c5488fb008 Merge pull request #106 from GreenNinja2525/main 
Update Blue Joker and Fix Greedy Joker's Outline
 2025-08-22 18:41:43 +03:00
MeirGavish 76f225168a Additional change for Blue Joker 2025-08-22 18:28:00 +03:00
MeirGavish 5e93a95d03 Merge pull request #105 from cellos51/game_over_screen 
Game over (and win) screen
 2025-08-22 02:10:07 +03:00
MeirGavish 3be49b1d80 Removed old comment 2025-08-22 02:09:24 +03:00
MeirGavish 854c52464f Small refactor - extracted helper functiosn for main_bg_se_copy_expand_3x3_rect() 2025-08-22 00:37:02 +03:00
MeirGavish 7f5ed5433f Win screen + Game over animation with hand discard 2025-08-21 23:33:51 +03:00
MeirGavish a707927b2f Refactor - extracted card_in_hand_loop_handle_discard_and_shuffling() from cards_in_hand_update_loop() 2025-08-21 19:07:02 +03:00
MeirGavish c4b538c009 Basic game over screen + added main_bg_se_copy_expand_3x3_rect() 2025-08-19 21:40:40 +03:00
MeirGavish 5a70b002a9 graphic_utils refactors - renamed functions, optimized some code, used Tonc defines 2025-08-19 18:33:47 +03:00
MeirGavish 065d846ac7 Used text red color for game over background 2025-08-19 17:59:26 +03:00
MeirGavish 42a0e94afd Refactor - Added defines for text colors and used them in all usses of tte_printf 2025-08-19 17:47:24 +03:00
MeirGavish 6d6bb39c97 Affine background now turns red on game over + other WIP changes for game over screen 2025-08-19 16:31:32 +03:00
MeirGavish 7bbaec261b Merge branch 'main' into game_over_screen 2025-08-19 13:33:20 +03:00
MeirGavish 9164fba996 Even Steven card corner fix 2025-08-17 14:51:04 +03:00
MeirGavish 1b9785bc1f Sly Joker card corner fix 2025-08-17 13:42:56 +03:00
MeirGavish c3f9f57e7f Merge pull request #74 from theturtlemafia/ttm/joker-scope-joker-1 
Adds Blue Joker, Even Steven, Odd Todd, Scholar, Business Card and unused code for jokers without sprites Raised Fist, Reserved Parking, Scary Face, Abstract Joker, Bull, and Smiley Face
 2025-08-17 12:46:46 +03:00
MeirGavish 46141090a0 Added joker sprites by @GreenNinja2525 for Blue Joker, Even Steven, Odd Todd, Scholar and Business Card. Disabled jokers with no sprites. 2025-08-17 12:36:20 +03:00
MeirGavish 2539954dea Fixed build error from previous merge and applied review comments 2025-08-17 11:10:00 +03:00
MeirGavish 04515839dc (Manual conflict res) merged main into ttm/joker-scope-joker-1 2025-08-17 11:03:27 +03:00
MeirGavish 8524a78271 Merge pull request #102 from cellos51/joker_selling 
Joker Selling
 2025-08-17 10:57:38 +03:00
MeirGavish 376309a9ef (Manual conflict res on game.c) Merged main into ttm/joker-scop-1 2025-08-17 10:37:03 +03:00
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 bc8847d2cb Merge branch 'main' into joker_selling 2025-08-16 12:41:38 +03:00
MeirGavish b63559862f renamed int_list.c to list.c 2025-08-16 12:41:11 +03:00
MeirGavish 3e775f2ac6 Added game over menu tiles to background_gfx.png and removed dedicated background file 2025-08-16 12:27:31 +03:00
MeirGavish ff17883b6f Merge branch 'main' into game_over_screen 2025-08-16 12:00:32 +03:00
MeirGavish 3557e7d34d Fixed inconsistent joker 'A's and rounded card corners 2025-08-16 10:56:22 +03:00
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 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
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
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