wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
573 Commits 1 Branch 0 Tags
f3f375cef1cd52a602cefe30de55378665a37d54
Commit Graph
235 Commits
Author SHA1 Message Date
cellos51 95d032f36b Corrected joker sprite canvas size and fixed money not being erased 2025-07-21 20:27:30 -04:00
cellos51 1b53a1b077 Updated to joker sprite to use the new one by @GreenNinja2525 and changed the way switching backgrounds works to prevent flicker 2025-07-21 20:09:35 -04:00
cellos51 86cf8896e2 Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers 2025-07-21 18:46:48 -04:00
cellos51 f9706ef429 Added boss blind colors to the blind select screen 2025-07-20 22:48:58 -04:00
cellos51 99907ec90a Change initial game state from GAME_SHOP to GAME_BLIND_SELECT 2025-07-20 22:42:30 -04:00
cellos51 a3a4d065b5 Jokers have prices in shop 2025-07-20 22:19:57 -04:00
cellos51 414bfa2a32 Semi functional jokers 2025-07-20 20:55:11 -04:00
cellos51 bdb0d7eee2 Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers 2025-07-20 16:18:24 -04:00
MeirGavish 69e8df3de9 Merge branch 'main' into refactors 2025-07-20 02:28:38 +03:00
MeirGavish 708d9a813f Fixed screenblock overflow bug and once again merged up/down versions of POP_MENU_ANIM_RECT 2025-07-20 01:55:49 +03:00
MeirGavish 0e231328ec Added right align text rect function and fixed blind requirement overflow when it's 4 digits (will still overflow for more) 2025-07-19 22:25:46 +03:00
cellos51 fac4a3c626 Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers 2025-07-19 15:16:08 -04:00
MeirGavish bef11f9923 Fixed blind bottom of rect overwrite on skip bug 2025-07-19 17:17:23 +03:00
cellos51 52fa45e426 Refactor joker selection logic in game shop 2025-07-18 20:38:34 -04:00
cellos51 c06b179764 really bad purchasing system for jokers 2025-07-18 20:25:12 -04:00
cellos51 176910c483 Jokers appear in the shop but don't do anything yet 2025-07-18 19:29:17 -04:00
cellos51 4a5644eddb Defining a basic system for jokers 2025-07-17 21:47:50 -04:00
cellos51 ea2e503222 Ante up on boss defeat 2025-07-17 18:02:46 -04:00
cellos51 54d8aa2ec6 Applied most refactors from previous merge by @MeirGavish 2025-07-16 21:31:05 -04:00
cellos51 a37ba18386 Fixed palette issue 2025-07-16 15:57:07 -04:00
cellos51 ed484d6557 temporary overwrite of previous merge. I've been working on this for 10 hours today and really do not have the patience to resolve the conflicts right now. I'll do it later 😭 2025-07-16 01:20:50 -04:00
cellos51 309ebf281a Major refactor, too much else to list, check the git changes. 2025-07-16 00:55:27 -04:00
MeirGavish 5d5a8a2d4b Fixed an error in previous hand background commit 2025-07-13 23:42:03 +03:00
MeirGavish 8cbfa70590 Switched hand background playing/selecting switch to use small moves instead of big copies 2025-07-13 23:17:37 +03:00
MeirGavish e7589f27dc Added move version (...)se_move_rect_1_tile_vert(), switched to use it in down pop-out animations, updated copy version, and removed my POP_MENU_ANIM_RECT UP/DOWN hack 2025-07-13 21:20:57 +03:00
MeirGavish f34444b3db Fixed main_bg_se_copy_rect(), exposed it, and used it in a few places 2025-07-13 20:41:40 +03:00
cellos51 e7a8e669ca Forgot to include boss blind functionality into background 2025-07-12 23:40:14 -04:00
cellos51 847f602c9e Changed the way the selecting/played background works and added logic for changing the background depending on blind type 2025-07-12 23:39:13 -04:00
cellos51 191c1a7264 Made blind tokens visible in GAME_BLIND_SELECT state 2025-07-12 19:47:49 -04:00
cellos51 1fc194448e fixed blind descend animation 2025-07-11 18:56:52 -04:00
cellos51 6266ea9fa5 Unified timer default value to be 0 2025-07-11 18:32:17 -04:00
cellos51 beaf365e0c Fixed compilation issue and changed default background 2025-07-11 13:52:33 -04:00
MeirGavish 43a32f5a99 Merge branch 'main' into start_at_blind_selection 2025-07-11 19:42:52 +03:00
MeirGavish 8d721b77e1 Fixed issue where pop menu panels overrode joker and consumable panels 2025-07-11 18:58:06 +03:00
MeirGavish a9a49e0884 Avoid non-small blind selection because it currently crashes the game 2025-07-11 18:42:53 +03:00
MeirGavish 4e5e1f340e Changed game to start at blind selection - added game_round_init() and game_set_state() etc to try and make easier state transmissions 2025-07-11 18:22:45 +03:00
Gordie ebb6177d0d Merge pull request #22 from MeirGavish/refactors 
Refactor - used main_bg_se_copy_rect_1_tile_vert() for current blind raising
 2025-07-10 21:44:36 -04:00
cellos51 be08cb79be Added some comments into the game_round_end() function 2025-07-10 21:33:38 -04:00
MeirGavish 3741f6f3bd Used main_bg_se_copy_rect_1_tile_vert for current blind raising 2025-07-11 04:06:04 +03:00
MeirGavish 05f4cc2abb Fixed generic main_bg_se_copy_rect_1_tile_vert() function and replaced some code with it 2025-07-10 23:20:44 +03:00
MeirGavish 6ef1f51c55 Merged "main"into "refactors" (manual conflict resolution) 2025-07-10 16:47:53 +03:00
MeirGavish fb7b60431c Extracted pop menu animation to a rect copying function for shop 2025-07-10 16:37:43 +03:00
cellos51 f027c7bea0 Added the ability to skip blinds in the blind select state 2025-07-09 22:06:49 -04:00
cellos51 e1c1d68694 basic implementation of blind select screen 2025-07-09 21:37:49 -04:00
cellos51 b246249be7 Updated shop state to have rough functionality to switch to the next state 2025-07-09 20:00:03 -04:00
MeirGavish 83af67c3ed Merged "main" into "refactors" (manually) 2025-07-09 22:27:21 +03:00
MeirGavish d787a918b6 Refactored so only set_hand() sets the global variable and not hand_get_type() so as to conform to set/get semantics 2025-07-09 22:17:16 +03:00
MeirGavish 83aa422f3e Refactor - replaced (almost) all magic numbers for TTE rects with rect definitions 2025-07-09 17:12:00 +03:00
MeirGavish b822d2b365 Moved code to new graphic_utils.c/.h header and added Rect wrapper struct 2025-07-09 04:59:19 +03:00
MeirGavish 2aaee73bac Replaced round end menu hack with clear rect function 2025-07-09 04:11:55 +03:00