Commit Graph
151 Commits
Author SHA1 Message Date
cellos51 dda145a907 Fixed blind sprites 2025-07-23 19:28:36 -04:00
MeirGavish c781807ed8 Revert "Sprite vram optimizations" 2025-07-24 02:14:04 +03:00
cellos51 6a326e27fe refactor: update blind and joker definitions; change game state to GAME_BLIND_SELECT 2025-07-23 17:31:21 -04:00
cellos51 011bc64bab huge memory save 2025-07-23 16:17:24 -04:00
MeirGavish 5e6bc76f5f Merge branch 'main' into jokers_refactors 2025-07-23 19:33:39 +03:00
cellos51 1b4267893d Added greedy joker and refactor joker system 2025-07-22 20:00:05 -04:00
MeirGavish c24dcab726 Added TODO note and a warning comment 2025-07-23 00:02:24 +03:00
cellos51 793da72465 added co-pilot's fixes 2025-07-22 15:45:29 -04:00
cellos51 c8893c806c Added @GreenNinja2525's replacement deck icon. Added play hand and discard buttons and changed keybindings. 2025-07-22 01:42:31 -04:00
cellos51 e7c5536cc2 added shop rerolling and edition pricing for jokers 2025-07-21 22:05:31 -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 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 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 54d8aa2ec6 Applied most refactors from previous merge by @MeirGavish 2025-07-16 21:31:05 -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 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 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
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 e1c1d68694 basic implementation of blind select screen 2025-07-09 21:37:49 -04: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
MeirGavish 2a92b3ecaa Added SBB and CBB defines for SE/tile bases to remove their magic numbers 2025-07-09 00:40:59 +03:00
cellos51 a56bba2c0e implemented shop screen after round end 2025-07-05 19:34:48 -04:00
cellos51 67b917fc7c Yandere dev style code for the almost finished round end screen 2025-06-30 21:20:51 -04:00
expected-ingot c8f2e96572 GAME_LOSE state 2025-06-30 14:16:07 +02:00
cellos51 c58b569516 Added more stuff to the end round, made the blind token a sprite and toned dow n the background animation a bit. 2025-06-30 03:18:04 -04:00
expected-ingot de6060eee3 Merge branch 'main' of https://github.com/cellos51/balatro-gba 2025-06-30 01:03:09 +02:00
expected-ingot de87271199 Fixed FRAMES macro to use ceil division 2025-06-30 00:55:55 +02:00
expected-ingot caf8c96c87 basic gamespeed implementation 2025-06-29 18:51:22 +02:00
MeirGavish 8bbe707dab refactor - removed some magic numbers 2025-06-29 11:58:54 +03:00
cellos51 2df498e035 Slight refactor and fixed cards being improperly selected when played and not sorted by rank (probably 💀) 2025-06-26 17:27:14 -04:00
cellos51 af43a91f19 moved all logic from card.c to game.c for future optimization 2025-06-26 00:20:46 -04:00
cellos51 126d5a5bab pushing changes before i do a major refactor 2025-06-25 00:07:00 -04:00
cellos51 c06aad7b26 Still some jank stuff right now but i think the whole sorta round functionality has been more or less finished 2025-06-23 18:57:51 -04:00
cellos51 5055c9abc7 functional basic gameplay 2025-06-12 01:44:54 -04:00
cellos51 85b25e575f Made the card animations for playing exactly in the same order and manor as Balatro (perfectionism moment) 2025-06-11 14:10:49 -04:00
cellos51 423c061b2f Cards can now be played but no score will be given 2025-06-10 19:22:45 -04:00
cellos51 2d21c83f89 Update card handling logic and improve background management; add hand types and refine game state transitions. 2025-05-19 11:24:13 -04:00
cellos51 7ce6082edd Refactor hand_discard function to return a boolean and update game logic for discarding cards; add background_play_gfx and improve text engine initialization. 2025-02-16 22:07:44 -05:00
cellos51 edfa358e35 Added the ability to discard cards in a hand and other various changes. 2025-02-08 22:27:05 -05:00