wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
612 Commits 1 Branch 0 Tags
16b24a0bf98f48cb47f667ec2a3bda83bba3c655
Commit Graph

612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MeirGavish 16b24a0bf9 Updated splash screen with new organization URL (#306) 2025-12-10 23:00:46 -08:00
Marcel Schulz f9ed858549 [Fixed] Joker shop price not properly erased on purchase (#286) 2025-12-11 08:39:09 +02:00
MeirGavish 1e1fe85b88 Merge pull request #227 from GBALATRO/music_relayer_chords 
Music - Relayered chord samples
 2025-12-11 07:02:20 +02:00
MeirGavish 0698d27ce9 Music - Switched to 44.1kHz chord samples 2025-12-11 07:00:38 +02:00
MeirGavish a4e1fab100 Music - Switched chords to C-based samples (+reused some frames instead of copy-pasted ones) 2025-12-11 07:00:38 +02:00
MeirGavish d22fcb0056 Music - Relayered chord samples 2025-12-11 07:00:38 +02:00
MeirGavish d96bc9b1c2 Renamed GBLA_UNUSED -> GBAL_UNUSED and updated RowOnKeyTransitFunc documentation (#292) 2025-12-10 17:17:28 -08:00
MeirGavish 5a4856ec82 Refactor - removed tile_mem obj charblock index magic number (#293) 2025-12-10 17:13:59 -08:00
Rickey 2fb9e6d633 Clang format joker files and def files (#257) 
* Clang format joker files and def files

* Fix blind usage of GBLA_UNUSED macro

* Add final files for clang-format (main.c and selection_grid.h)

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-12-10 09:41:24 +02:00
Rickey 35ecbf33ae Format and document utility files (#246) 
* Format and document utility files

* Add Doxyfile

* small updates for cleanup

* Final touches for util docs

* Replace `_` with `s_` for static functions

* update for clang-format changes

* Update include/audio_utils.h

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Apply suggestions from code review

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Update include/audio_utils.h

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Update include/graphic_utils.h

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* Make clang-format happy :)

* Update gitignore for doxygen

* restor graphic_utils.c to main

* update graphics utils

* tmp

* tmp

* get it to compile

* fix some bad merge mistakes

* Fix clang format

* Apply suggestions from code review

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

* make clang-format happy

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-12-07 12:56:39 -08:00
MeirGavish 7bd510ee5f Update README for consistency in capitalization 2025-12-07 15:37:28 +02:00
MeirGavish cf746c597e Update README with joker swap controls 
Added controls for swapping jokers in the shop.
 2025-12-07 15:36:43 +02:00
Geralt bf66f96844 Add swapping order of Owned Jokers (#258) 
* swap Jokers

* Hide score properly

* add key_released to inputs triggering selection_grid process input

* format code

* Add suggestions and bug fixes from @MeirGavish

* Add comment

* format selection_grid

* toto

* format

* format

* Turned clang-format off for selection grid rows

* revert reroll bug fix, already adressed

* format selection_grid.c

* Move conditions around in game.c

* typo

* Attempt at fixing braced initializer indent format

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-12-07 02:58:50 -08:00
Rickey a82bd671de Separate clang-format test into its own workflow (#283) 
* Rework workflow dependencies
 2025-12-06 23:59:55 +02:00
Geralt 687d77e18a Improve Face Cards sprite art (#284) 
* Tweaks by @MeirGavish

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-12-06 16:33:23 +02:00
MeirGavish 28ff6c81ef Fixed bug where reroll button is triggered by any key (#279) 2025-12-05 10:06:43 +02:00
MeirGavish 9f170f298d Restored removed joker shop availability check function (#276) 2025-12-04 18:21:10 -08:00
Rickey 291edaf4f2 Clang format and refactor game.h/c + update Bracket Alignment to BlockIndent (#259) 
* Refactor and clang-format game.h/c

* Updated clang-format AlignAfterOpenBracket: BlockIndent and ColumnLimit: 100 and refactored all files accordingly

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-12-03 13:49:31 +02:00
MeirGavish 43d837571e Truncate Scores (#269) 
* Fixed score truncation erasure, and centering for chips, mult, score and "temp score

* Added centering for money

* Added tests for truncate_uint_to_suffixed_str()

* Fixed u32 bug with get_digits

* Fixed score flames for large numbers

* Small change to update documentation

* Added 1 pixel on to score rect on the left to make room for full character tile + reset_top_left_panel_bottom_row() refactor

* Replaced directional defines with enums

* Updated ante_lut comment

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-12-02 08:28:36 +02:00
Geralt 07cab81ba1 Fix Wrathful Joker missing pixel (#272) 
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-12-01 09:34:30 +02:00
Geralt 10e75f18ae remove triboulet from code (#266) 
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-11-30 18:11:48 +02:00
MeirGavish 2d7394f03e Fixed corners for Banner joker (#271) 2025-11-30 17:57:05 +02:00
Tygyh 8bba449196 Convert BG_ID_* defines to enum BackgroundId (#265) 
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
 2025-11-30 08:53:51 +02:00
Geralt 0953a430c4 Implement Seltzer and Joker Expiration effect (#252) 
* Add Seltzer art

* Implement Joker expiration

* Add exception to copying Jokers + Seltzer message fix

* Move all scoring logic to joker_object_score away from check_and_score_joker_for_event

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-11-30 08:52:42 +02:00
Geralt 435a9a0a1d Refactor JokerEffect scoring (#245) 
* Remove usage of memcmp for JokerEffect null check

* Added suggestions from @ricfehr3

* Add suggestions from @MeirGavish


---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-11-28 19:03:47 +02:00
Rickey 1cacabdff6 Clang format pool (#255) 
* Update comment prefix + add github action

* Clang Format pool

* fix clang format version

* Fix pool clang format
 2025-11-27 10:41:13 -08:00
Rickey 184ee719b3 Clang format card.c/h (#256) 2025-11-26 00:52:04 +02:00
Rickey 09dd996181 Clang Format Blinds (#253) 
* Quick cleanup on bitset docs

* Clang format blind.h/c

* Replace `_` with `s_` for functions

* Fix newline size for macros.

* Fix format for ci

* Add macro for "unused" attribute
 2025-11-25 13:47:44 -08:00
Rickey 2c32ff69e3 Clang format hand analysis (#261) 
* Clang format hand analysis

* Update source/hand_analysis.c

Co-authored-by: MeirGavish <meir.gavish@gmail.com>

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-11-25 13:45:07 -08:00
Rickey e910aee184 Clang format list (#254) 
* Finish clang-format on lists
 2025-11-25 11:32:50 +02:00
Rickey 6db35b0f95 Clang format sprite (#262) 2025-11-24 23:26:47 +02:00
MeirGavish 4a5753c068 Merge pull request #260 from ricfehr3/clang-format-splash-screen 
Clang format splash screen
 2025-11-24 07:58:36 +02:00
Rickey Fehr fcb2337fa2 Clang format splash screen 2025-11-23 18:43:45 -08:00
MeirGavish f51380c93c Added sound effects for chips, mult, and xmult (#229) 2025-11-22 07:27:43 +02:00
Geralt 408c264e85 Modify blueprint and brainstorm implementation to fix retrigger bug (#244) 
---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-11-21 20:09:07 +02:00
MeirGavish 4567a8e1ad Added credits to readme (#247) 
* Added credits to README.md
 2025-11-21 16:04:31 +02:00
Geralt 2fb41e533c Make Chips, Mult and Score unsigned and protect against overflow (#212) 
---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-11-20 12:39:15 +02:00
Rickey 47b1bac31f Add list_swap() and list_insert() functions (#232) 
* Add list_swap() and list_insert() functions

* Update docs for list_swap

* Add test case and fix list insert bug

* Fix silly bug with list length on insertion

* Initial changes for pr

* Add reverse iterator and update test for it

* Cleanup iterator next function

* update tests to cover list_get_at_idx
 2025-11-18 18:19:00 -08:00
Rickey a4caa44580 Add clang format and used it for bitset (#240) 
* Add clang format file .clang-format

* Use clang format on bitset


---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-11-18 08:56:32 +02:00
MeirGavish f3f375cef1 Banner Joker art update by @GreenNinja2525 (#242) 2025-11-16 20:18:14 +02:00
Geralt 1ac55692e9 Break up the played cards scoring loop into several functions (#224) 
* rename PLAY_PLAYING state into PLAY_STARTING

* make discarded_card and sound_played global variables

* Broken up cards_score state update

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
 2025-11-16 17:33:01 +02:00
MeirGavish 557e591c31 Merge pull request #223 from cellos51/integrate_photograph 
Integrated Photograph joker art by @MathisMartin31
 2025-11-13 08:38:28 +02:00
Geralt 1f3d3bffbd Fix bug occurring when a retriggered card has a non-scoring card to the left (#218) 
---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-11-12 16:06:37 +02:00
MeirGavish 28043bd7ca Integrated Photograph joker art by @MathisMartin31 2025-11-12 14:11:16 +02:00
Geralt 4183f563ab Implement cards held in hand effects (#205) 
* Adapt existing Jokers to the Held Card mechanic + effect display location

* Add suggestions from @ricfehr3

* Add suggestions from @MeirGavish

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-11-12 13:18:53 +02:00
Rickey e0cffab768 Update list implementation to work with memory pools (#168) 
* Introduce indexed list implementation

* Fix CI tests for pool

* Take bitset out of pool

* Replace joker bitset interactions with wrappers

* Add bitset tests

* Add test to gitignore

---------

Co-authored-by: rfehr-idexx <ric-fehr@idexx.com>
 2025-11-11 17:56:21 +02:00
MeirGavish d5f59e904b Fixed game stuck due to interest bug + cleanup refactor (#214) 
Co-authored-by: MeirGavish <34395426+MeirGavish@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: MeirGavish <34395426+MeirGavish@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
 2025-11-07 00:33:52 +02:00
MeirGavish 64dd586df8 Optimized score lerping by changing the number of steps to a power of 2 (#211) 2025-11-06 12:15:07 +02:00
Geralt e7eaa82c9d Add flaming effect when exceeding score requirements (#210) 
* Fix grit palette swapping

* Add suggestions from @MeirGavish

---------

Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
 2025-11-04 12:31:09 +02:00
Rickey ecd98d0626 Merge pull request #208 from ffrank89/patch-1 
Add gba-dev pacman installation instructions to README.md
 2025-11-03 22:13:06 -08:00