* initial additions
* Move current_blind to game vars
* tmp
* tmp
* tmp
* tmp
* tmp
* tmp
* tmp
* Compile but is broken
* temp fix for token location
* tmp
* Working, lets clean up
* remove todo
* Remove odd reroll blind variable
* fix skipping blind screen
* fix reroll
* remove magic for blind token locations
* clang format
* Cleanup button highlight in blind menu
* some cleanup
* Add layout file for global UI rects
* remove dead code
* Clang format
* clang format it up
* Move reset top left funct to gfx utils
* make note of soon-to-be removed vars
* Cleanup gamevars declaration
* Cleanup layout file
* Apply suggestions from code review
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* Add include for stdbool.h in common_ui.h
* Cleanup rect declaration
* Start moving state machine stuff to new file
* quick tmp
* oops, add new files
* working call list
* fixed pointer stuff
* working as per norm
* working replacement
* move defines to static const
* fix compile issue
* Add some missing "void"s
* Working new substates
* add statemachine to blind select
* Fix game restart statemachine leak
* clang-format
* Clang format
* Rework shop exit logic
* Use new state machine in shop
* Remove substates entirely
* Remove debug stuff
* Clang format
* document state machine better
* update list tests
* clang-format
* Update for PR
* Claaaaang format
* another clang-format
* Remove extra state in round_end
* cleanup docs for removals in lists
* clang-format... again
* update doxygen format
* Clang format
* tmp
* Update for Pr
* clang-format
* Cleanup for only supporting losing
* bug fix, thanks logs!
* Fix dangling pointer bug
The control of removing statemachines may call issues if starting the
function is done from another state machine call. To remedy this, add a
flag to determine if a state machine is registered and return early
instead of blindly removing it to re-add.
* Fix bug with audio iterations possibly going in reverse
* Remove extra includes
* Clang-format
* Add sound effects for game win/lose
* adjust audio steps
* tmp
* Nice sounding and cleaned up
* Fix and cleanup
* clang-format
* clang-format
* clang format again
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* Options menu revamp
* Implement readable card sprites
* redraw characters to fix the original style
* clang format
* remove usage of UNDEFINED (-1) for unsigned values
* typo
* change save fix for something cleaner
* remove dependency to game_variables.h from card.c
* Make the palette look less silly ^^'
* Address @ricfehr3's comments
* clang format
* quick rename
* clang format
---------
Co-authored-by: Geralt <84459734+MathisMartin31@users.noreply.github.com>
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: Turro75 <valerio.turrini@gmail.com>
* Options menu revamp
* Implement readable card sprites
* redraw characters to fix the original style
* clang format
* remove usage of UNDEFINED (-1) for unsigned values
* typo
* change save fix for something cleaner
* remove dependency to game_variables.h from card.c
* Make the palette look less silly ^^'
* Address @ricfehr3's comments
* clang format
* quick rename
* clang format
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
* initial additions
* Move current_blind to game vars
* tmp
* tmp
* tmp
* tmp
* tmp
* tmp
* tmp
* Compile but is broken
* temp fix for token location
* tmp
* Working, lets clean up
* remove todo
* Remove odd reroll blind variable
* fix skipping blind screen
* fix reroll
* remove magic for blind token locations
* clang format
* Cleanup button highlight in blind menu
* some cleanup
* Add layout file for global UI rects
* remove dead code
* Clang format
* clang format it up
* Move reset top left funct to gfx utils
* make note of soon-to-be removed vars
* Cleanup gamevars declaration
* Cleanup layout file
* Apply suggestions from code review
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* Add include for stdbool.h in common_ui.h
* Cleanup rect declaration
* Start moving state machine stuff to new file
* quick tmp
* oops, add new files
* working call list
* fixed pointer stuff
* working as per norm
* working replacement
* move defines to static const
* fix compile issue
* Add some missing "void"s
* Working new substates
* add statemachine to blind select
* Fix game restart statemachine leak
* clang-format
* Clang format
* Rework shop exit logic
* Use new state machine in shop
* Remove substates entirely
* Remove debug stuff
* Clang format
* document state machine better
* update list tests
* clang-format
* Update for PR
* Claaaaang format
* another clang-format
* Remove extra state in round_end
* cleanup docs for removals in lists
* clang-format... again
* update doxygen format
* Clang format
* Update list docs
* Update lists tests
* Fix bad conflict resolution
---------
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* move all hand funcs to their new file. now to clean up
* WIP
* Cleanup + doc hand.h
* clang format
* Refactor loose variables in hand.c into a proper Hand struct
* Fix some more issues
* Apply *some* suggestions from code review
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* remove outdated comment
* fix rebase issue
* fix rng_info missing from g_game_vars init
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* Extract rng manipulation to its own file
* clang format
* Get CPU cycles since game start to use for RNG
* change a few things
* clang format
* Implement suggestions from @ricfehr3
* clang format
* Fix rebase issue
* clang format
* Create RngInfo struct to hold seed and step
* clang format
* Make a note about rng_restore system not having been tested properly yet
* Apply suggestions from @ricfehr3
Co-authored-by: Rickey <ric@rf3.xyz>
* clang format
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: Rickey <ric@rf3.xyz>
* Allow exiting options menu without saving
* Change "Back" button text to "Cancel" to be more explicit
* clang format
* fix load_game
* use proper existing defines for options default values
* fix buttons' array sizes
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
* optimizations
* fix prototype
* clang-format
* changes
* fix bug
* fix bug that came back after rebase
* make is_sprite_object_static more readable
* make it not broken
* actually make it compile...
* clang-format
* remove first extra check
* remove second extra check
* remove third extra check
* helper function 1
* second helper function
* how did i do this that wrong
* seperate epsilon
* combine if statements
* clarify comment
* remove redundant checks
* Remove braces around return
Co-authored-by: Rickey <ric@rf3.xyz>
* Move comment to above
Co-authored-by: Rickey <ric@rf3.xyz>
* clang-format
* simplify using abs()
Co-authored-by: Rickey <ric@rf3.xyz>
* fix syntax error from suggestion
* drop second epsilon + use abs()
* update comment
* extract sprite_oject_needs_position_sync from is_sprite_object_static
* figured out the root cause :)
* make it compile
---------
Co-authored-by: Rickey <ric@rf3.xyz>
* initial commit, DOES NOT COMPILE
* Rename joker interactions file to `joker_row`
* IT'S WORKIIING (now to make it pretty lol)
* fixed rebase issues
* fix rebase + undo state machine changes
* Document shop state functions
* clang format
* fix reroll cost not appearing on shop init
* Move generic SpriteObject text/price printing functions to sprite.c + some minor fixes
* Resolve weird defines/include order issue
* clang format
* Implement suggestions from @ricfehr3
* clang format
* clang format
* fix rebase
* Implement sugegstions from @ricfehr3
* Refactored shop to use the Button struct
* missed some memsets
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
* Initial round_end extraction
* move hands to game vars
* Checkpoint
* Finish removing all variables for state fns
* Move over round_end substate functions
* Move over round_end with compile
* working in general
* Fix round start state issue
* clang-format
* Fix clang format issue
* PR fixes and standardize types in game vars struct
* Clang-format
* docs: clarify clang-format version and usage
Added version, installation, and verification steps for clang-format to help contributors avoid CI issues.
* Enhance CONTRIBUTING.md with installation details
Updated installation instructions for clang-format on Ubuntu/Debian and Arch Linux. Added details for verifying installation and modified commands to include additional directories.
* Revise clang-format installation instructions
Updated installation instructions for clang-format and removed redundant verification section.
* Enhance clang-format usage instructions in CONTRIBUTING.md
Added recommendations for using clang-format before PR submission to ensure proper code formatting.
* Update CONTRIBUTING.md with clang18 PATH instructions
Add instructions to set PATH for clang18 on Arch Linux
* Make save changes their own branch
* Make SaveData tags char[] instead of u32[]
* Make Game and Options data saving independent
* removed unused functions
* Potential fix for pull request finding
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* mark save sections as valid only after they are actually written to SRAM
* fix comparison between different integer types
* Implement some suggestions from @ricfehr3
* Add extensive documentation on the structure of the savefile
* fix doxygen doc generation
* fix it again
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* Move game over (win/lose) state functions to their own file
* remove unused enum
* clang format
* Implement suggestions from @ricfehr3
* Fixing lack of highlighted button after skipping ablind
* factorize as much game over state code as possible
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
* Music - copied echo melodies from old branch `music_past_echo_triads`
* Music - increased volume and panning of panned echo triads
* Music - compatibility save
* Music - reduced the bolume of panned echo triads back but kept the panning
* Music - added note cut at the end of marimba climbs + increased the volume of the background drone a bit
* Music - added up to measure 54 - finished echo leads
* Music - Fixed backing error in the echo leads (missed subdominant section)
* Music - Fixed backing drone crescendo
* Music - Made the backing drone a bit more subtle
* Music - Improved last lead echoes
* Music - Finished last measures mallet arpeggios + added crash cymbal in the beginning
* Music - removed crash cymbal in the beginning, doesn't sound good compiled
* Music - Reduced first marimba arpeggios by one octave
* Music - Added subtle crescendo in dotted eighth scale walk
* Music - reduced volume and added crescendo to the drone in the beginning
* Music - Increased the last echo lead by an octave
* Music - Switched the panning of the last panned echo triad so it correctly alternates
* Music - Fixed panned echo triads panning inconsistencies
* Move build instructions to contributing
* Add python pillow install instructions for win
* update linux instructions
* make cleaner menus
* Add macos help
* Update formatting and instructions in CONTRIBUTING.md
* Add build instructions reference to README
Added a note to refer to CONTRIBUTING.md for build instructions.
* Update build instructions in README.md
Clarified build instructions in README for different platforms.
* Fix step number in build instructions
Updated the step number in the build instructions to reflect the correct sequence.
* background
* Implement Options button
* Update main menu artwork
* add options menu tiles
* prepare options menu handling
* incorporate main menu refactor
* toto
* add all menu interactions
* do not reset selection_x in main_menu
* options struct
* fix rebase from ricfehr3's repo
* Implement high contrast cards
* Save/Load options values to SRAM
* load options on game_init and validate data within the load_options function
* Get changes from ricfehr3's PR
* recover fix for glitched ace
* clang format
* clang format
* clang format
* Save 500B of image data by using only minimal set of tiles instead of keeping final window in source file
* clang format
* clang format
* Implement Options button
* Update main menu artwork
* progress, leaving it alone for now until discussion
* make game_vars an extern
* Move options vars into their own struct
* rollback previous commit
* Implement save validation. Version check to come
* implement data validity + version check for game saves
* clang format
* Save position in rng sequence for consistent run after load
* fix rebase issues
* fix rebase issue
* remove unused/duplicate define
* Oops, made a mistake when testing PR #424
* encode high contrast palette into an image, and load it at game_start
* document save.c/h and correct typos
* correct alignment
* game speed and high contrast buttons working
* small cleanup
* sliders also work again now
* clang format
* Moved balatro_version extern declaration to version.h file
* removed unsused variable
* make showing ROM version a toggle
* move ante, round and money to the GameVariables struct
* Rename SaveCheckInfo struct to SaveHeader for clarity
* Add SaveHeader struct explanation
* clang format
* Revert unnecessary tileset optimization
* SFX now follows the sound volume slider
* clang format
* Music now follows volume slider
* Changed volume slider increment from 5 to 20 to avoid having the music sound too rough under 20% volume
* refactor main_menu.c to use SelectionGrid and Button structs
* clang format
* make a "new" save button so we don't save during the state transition
* clang format
* Reduced state transition flicker by only changing affine background to a different one
* Fix loading game too late in game init sequence
* First batch of suggestions from @MeirGavish
* Remove unnecessary intermediary buffers for high contrast palette swapping
* comment row warp hack for button input
* Add some of Copilot's suggestions
* rename balatro_version into gbalatro_version for rebranding reasons + version display erase screen fix
* remove unnecessary NULL check on `on_selection_changed` method
* implement small game speed arrow buttons animation
* factorize some code
* remove unnecessary data validation in load_game(), since we already checked the header
* Implement @MeirGavish 's suggestion regarding splitting the huge `on_update` function
* clang format
* implement @ricfehr3 's suggestion about keeping last selected button instead of using an obscure `on_boot` boolean
* Apply @ricfehr3's suggestions
* fix clang-format flags
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
* Add basic common_ui background gfx functions
* Move game main menu to separate file
* clang format
* tmp commit basic docs
* clang format
* scope vars and cleanup
* Quick consistency update. Finalize.
This branch is based on: https://github.com/GBALATRO/balatro-gba/pull/363
Co-authored-by: emiyl <me@emiyl.com>
* Simplify global struct
* clang-format
* Add clang-format to subdirs
* Move timer definitions into their own file
* clang-format
* Fix action yml
* docs
* Update for PR
* Move game start to a state
* Remove lag switch
* Remove GameVariables pointer for callbacks
* Make game_vars a global
* move declaration of game vars in header
* Fix multiple game_vars
* fix for pr
* remove change_background in update again
* clang format
* Make bgCallbacks table static const
---------
Co-authored-by: emiyl <me@emiyl.com>
* Optimize Damping Coefficient
* Added Rounding + Moved Constants
* Added Comments and Made Rounding not use a magic number
* adjust epsilon
* Adjusted Documentation
* Created sprite bank for all blinds
* progress city, it's a beatiful city that progress city!
* Sprite appears in blind selection screen
* Added all blind colors
* fix magic numbers + disable boss reroll
* Fix boss blind token not moving after a reroll
* fix always rolling the Needle due to choosing too early for the rng seed to be set
* No need for affine sprite for blind tokens, regular is enough
* address Copilot's review 1/2
* address Copilot's review 2/2
* correct Blind Tokens/Types
* Index palette colors into the files instead of code
* Fix blind sprites (flip bug not solved)
* Fix magic number, tile index and Mark colors
* load boss blind palette only when changing spritesheet
* Adressing clang format and ease of modification of the blinds' list
* Removed some magic numbers
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
* Add optional exit indexes to selection grid rows & fix shop reroll button movement (#316)
- Added has_exit_idx and exit_idx to SelGridRowAttributes to simulate subgrid-like behavior that was desired in shop reroll button
- Add logic to use exit index if given inside selection_grid_move_selection_horz()
- Add joker focus logic to shop_reroll_row_on_selection_changed()
* clang-format fix
* clang format fix#2
errors due to version mismatch in local fixed (i hope)
* important fix: check x instead of y for next_roudn_btn_sel_x
was checking y against an X value
* changed commenting
* selection_grid.h clang-format fix
* changed commenting again
trying to make docs understandable
* set shop selection rows explicit
Co-authored-by: Rickey <ric@rf3.xyz>
* syntax fix
* clang format fix onceagain
* guard clause when moving down from jokers
---------
Co-authored-by: Rickey <ric@rf3.xyz>
* Basic Doxygen Awesome Support
* Add logo for Doxygen aswell as a Project Brief
* Better Catch Phrase
* Moved Doxygen Awesome into it's own folder
* Included The MIT LICENSE inside the doxygen-awesome directory
* Color Tweaks
* add doxgen-awesome light/dark mode toggle
* fragment copy button extension for doxygen
* add github corner
* Create VERSION file for doxygen-awesome
* Update doxygen/doxygen-awesome/VERSION
Co-authored-by: Rickey <ric@rf3.xyz>
---------
Co-authored-by: Rickey <ric@rf3.xyz>
* Convert static joker sprites indexes to maps for dynamic spritesheets size
* tmp commit
* reorder Joker spritesheets
* more reordering
* Joker maps, will test later
* More reorders and palette optimizations. Sprites now work
* Fix Joker gfx
* Format joker.c
* Fix rebase error
* Integrate Shoot the Moon art
* format
* format
* removing useless GBAL_UNUSED from photograph Joker effect func
* Tidy up joker.c variables formatting
* Fix magic number
* Add context for map in joker.c
Co-authored-by: Rickey <ric@rf3.xyz>
* Update source/joker.c
Co-authored-by: Rickey <ric@rf3.xyz>
* Apply suggestion from @ricfehr3
Co-authored-by: Rickey <ric@rf3.xyz>
* format
* reduce clutter in joker_effects.c file by defining a macro for forward static declarations of joker effect funcs
* refactored some maps in joker.c to make it more concise
* clang format
* adding back how to mark functions as unused when Jokers don't have a sprite yet
* format
* Remove comment about unused functions for Jokers without art
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com>
Co-authored-by: Rickey <ric@rf3.xyz>
* Music - Added portamento and note stops to the lead melody
* Added OpenMPT .bak files to .gitignore
* Music - Expanded the module 2x for more accurate quasi-triplet + added 2-3 measures
* Music - Added pitch bend and fixed decorative note
* Music - Added measures 31-32
* Fixed wrong G/D chord sample
* Music - added measures 37-38
* Music - Added echo quasi-square
* Music - layered the quasi-square with the keyboard
* Music - small reduction to quasi-square volume
* Music - more volume adjustments
* Music - added measures 39-32 (triad chords)
* Music - raised the triad chords one octave
* Added missing repetition measures 33-36
* Music - More repetition measures 43-46
* Music - fixed pitch bend in measure 30
* Music - Added tremolo to the lead synth
* Revert "Music - Added tremolo to the lead synth"
This reverts commit 3ffee4684521989501239fbfae6b1276bf713818.
* Music - reduced the triad chords by an octave
* Music - Added lead melody fade-out and reduced triad chords volume
* Music - Added channel 7, and unused channel 8
* Increased the triad chords volume back
* Music - Added panned backing chords (used all 8 channels)
* Music - Added all the panned backing chords
* Music - fixed last echo note
* Music - Added background fifth drown to triad chords
* Music - reduced panning of panned chords
* Updated music arrangement credits in README
MeirGavish