wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
606 Commits 1 Branch 0 Tags
d96bc9b1c27d176c46fe3744ff3c2f5303a6ad6e
Commit Graph
197 Commits
Author SHA1 Message Date
Drew 04ffb0d4dd A little bit of scope creep here. 
Renamed some of the state functions to include the word 'on'. Also
replaced the switch statement in set_hand() with a lookup table
access. This lookup table contains the chips, mult and display name
for a given hand. Some may not like these changes, so we can easily
roll back if need be.
 2025-10-14 10:20:43 -05:00
Drew 121bbc01d5 Refactored state machine. 
Added a state info map which keeps track of a particular state's on_init, on_update and on_exit functions.
A few of the on_update functions have sub-states, which create extremely long switch statements.
Not sure if perhaps the best route would be to keep the switch statements but break the cases into individual
functions or if we should keep track of substates. The latter sounds like it could get complicated and really
messy quick. Problem for another day.
 2025-10-14 10:20:40 -05: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
Rickey Fehr ef048791c1 Separate out graphics and add ability change boss 2025-10-13 23:36:27 -07:00
Rickey Fehr f885fa9164 Fix Iterating over every blind instead of 3 max 2025-10-13 23:36:27 -07:00
Rickey Fehr 54d955d1e7 Update for PR 2025-10-13 23:36:27 -07:00
Rickey Fehr 3c2dd0edba Rename blind enums to represent their type 
This commit prefixes the enums `BlindType` and `BlindState` with their
types for clarity
 2025-10-13 23:36:27 -07:00
Rickey Fehr 7ee07bb34c Refactor blind into a map 2025-10-13 23:36:27 -07:00
alex 767e21d5fa made the lerped temp score expression clearer 2025-10-13 20:26:20 -07: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 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
Geralt ce6d2049f8 Update game.h 
Fix missing `is_joker_present` rename into `is_joker_owned`
 2025-10-09 14:52:41 +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
Geralt 6787fab0c2 Merge branch 'main' into main 2025-10-08 23:25:24 +02:00
MeirGavish 4b35b2f7d8 Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525 2025-10-08 22:40:15 +03:00
Nan 7e17419811 Merge branch 'main' into pr-fix 2025-10-08 18:11:20 +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
MonteCrysto aa5ebd13fc Add suggestions from @MeirGavish 2025-10-08 08:14:54 +02: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 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
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
alex 7bafc260dd fixed game_speed, now using fixed point and keeping game_speed static 2025-09-22 22:04:51 -07:00
Drew e620697917 Renamed joker_table.h to def_joker_gfx_table.h. Removed an unnecessary constant 2025-09-22 16:06:45 -05:00
alex 301f5a2a53 kind of fixed how game_speed behaves 2025-09-21 23:49:24 -07:00
alex 6e60cf5970 kind of fixed how game_speed behaves 2025-09-21 23:16:50 -07:00
Drew 2c5bc3b5dd Adding an x macro to cut down on some boilerplate. 
This should make adding additional jokers require a little less
typing. Additional jokers will need an entry in /include/joker_table.h
 2025-09-15 21:36:20 -05:00
Nan 35c0d383c5 Add blueprint and brainstorm jokers 
Implements blueprint and brainstorm to the game, but leaves the implementations commented out as they are still missing assets.
 2025-09-13 22:18:31 +02:00
cellos51 f4d8fc9097 Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects and changed parameters on affine source to be updated from experimental branch 2025-08-28 22:39:48 -04:00
cellos51 c41fcd1a24 Remove unused definition for maximum background palette size 2025-08-28 19:04:51 -04:00
cellos51 bc32707126 replaced magic numbers for background palette size 2025-08-28 16:09:46 -04:00
cellos51 6e2d3ee499 Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects 2025-08-25 19:34:25 -04:00
cellos51 4f1f7cb347 Add splash screen functionality and update game state management 
- Introduced GAME_SPLASH_SCREEN state in game.h
- Implemented splash_screen_init and splash_screen_update functions in splash_screen.c
- Updated game.c to initialize with GAME_SPLASH_SCREEN and handle splash screen updates
- Removed old splash screen code from main.c
 2025-08-24 15:44:45 -04:00
cellos51 53e6156397 Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen 2025-08-24 13:47:41 -04: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 7f5ed5433f Win screen + Game over animation with hand discard 2025-08-21 23:33:51 +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 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 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 376309a9ef (Manual conflict res on game.c) Merged main into ttm/joker-scop-1 2025-08-17 10:37:03 +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 2a4f045db6 Refactored list code to be generic void* list 2025-08-15 20:03:17 +03:00