wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
481 Commits 1 Branch 0 Tags
9d1a51884f064bcf9307bd6c887e8fe35cfd327c
Commit Graph
481 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Geralt ce5150bffb Update joker_effects.c 
Temporarily remove Pareidolia from shop until @MeirGavish can add the artwork for it
 2025-10-09 18:57:10 +02:00
Geralt ce6d2049f8 Update game.h 
Fix missing `is_joker_present` rename into `is_joker_owned`
 2025-10-09 14:52:41 +02:00
Geralt f14f200cb0 Update joker_effects.c 
Remove the "unused" attribute from joker effect functions that was added by mistake during merge
 2025-10-09 14:50:18 +02:00
Geralt c4f22be9b9 Update joker.h 
Restoring the Brainstorm Joker ID, deleted by mistake while adding the Pareidolia Joker ID
 2025-10-09 14:46:57 +02: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
Rickey Fehr 73ec9a40d3 Fix softlock related to #163 2025-10-08 20:29:11 -07:00
Geralt 6787fab0c2 Merge branch 'main' into main 2025-10-08 23:25:24 +02:00
Drew f752793caa Shop light specific macros for color 2025-10-08 16:16:23 -05: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
NanandMeirGavish 23a14cb76e Update source/joker_effects.c 
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-10-08 20:41:09 +02:00
Nan 8ae4968539 Remove duplicated entries 2025-10-08 18:52:10 +02:00
Nan 9ae53bddb8 Fix errors introduced by latest commits 2025-10-08 18:39:49 +02:00
Nan af72fe5749 Fix conflicts 
Attempt 1
 2025-10-08 18:21:55 +02:00
Nan 7e17419811 Merge branch 'main' into pr-fix 2025-10-08 18:11:20 +02:00
NanandCopilot fec243b482 Update source/joker_effects.c 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-10-08 17:59:27 +02:00
NanandMeirGavish 324478845d Update source/joker_effects.c 
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-10-08 17:58:11 +02:00
NanandMeirGavish 0dbde481d5 Update source/joker_effects.c 
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-10-08 17:57:50 +02:00
NanandCopilot bc44de0493 Update include/joker.h 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-10-08 17:57:20 +02: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
Drew 4e0d72ca8a PR Feedback 2025-10-08 01:27:15 -05:00
MonteCrysto aa5ebd13fc Add suggestions from @MeirGavish 2025-10-08 08:14:54 +02:00
Rickey Fehr cca015238d Update docs for docker 2025-10-07 20:30:11 -07: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
MonteCrysto 8cd86f1640 Merge remote-tracking branch 'upstream/main' 
And add NULL Acrobat Joker effect
 2025-10-07 20:18:41 +02: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
noctowlhootandMeirGavish 0187b5f78e Update source/joker_effects.c 
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-10-07 20:24:00 +10:30
MonteCrysto 0cfe0e5126 Added forgotten base price for the Acrobat Joker 2025-09-30 23:51:46 +02:00
MonteCrysto b7a94fa085 Fix some issues (I actually forgot to compile) 2025-09-30 23:34:11 +02:00
MonteCrysto de7c9d4d60 Add a "get_num_hands_remaining" function and implement the Acrobat Joker 2025-09-30 23:06:13 +02:00
MonteCrysto c781ee9666 Add a "is_card_face" function to take into account if Pareidolia is present 2025-09-30 22:47:00 +02:00
Drew 1f40279a36 Created a define for a screen entry horizontal flip. 2025-09-30 00:09:53 -05:00
Drew a6dd95ab0a Added a few more defines 2025-09-28 16:03:04 -05:00
Drew cc95554db7 Added constants for timer values. The names on these might be bad. 2025-09-28 16:03:04 -05:00
Drew 34d885674c Finished adding palette memory indexs to an enum 2025-09-28 16:03:04 -05:00
Drew 99ecd424f4 Added enum values for some of the palette bank indexes 2025-09-28 16:03:04 -05: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
Wheeler 46944e5699 Merge branch 'cellos51:main' into main 2025-09-27 15:22:41 -04:00