Commit Graph
190 Commits
Author SHA1 Message Date
MeirGavish 16d327b7f4 Moved the PLAY text of the PLAY HAND button one pixel down so it is separated from the button highlight 2025-07-26 19:54:22 +03:00
MeirGavish 1c036482a1 Renamed functions updating the display values from set_score, set_money etc. to display_score, display_money etc. to remove implication they are setting an actual value 2025-07-26 19:40:38 +03:00
MeirGavish d62509aff3 Changed the build CI workflow to be triggered for pushes only to the main branch
I just thought triggering on push to any branch is a little excessive
2025-07-26 12:54:37 +03:00
MeirGavish c49dbbab64 Merge pull request #58 from MeirGavish/create_ci_github_actions
Created a CI Build Test using Github Actions
2025-07-26 11:48:03 +03:00
MeirGavish 03e3d31e38 Fixed build_ci_workflow.yml to trigger on pull requests to main 2025-07-26 11:21:24 +03:00
MeirGavish b39d95ae2d Reset cache key version to v1 and added more comments in build_ci_workflow.yml 2025-07-26 01:46:10 +03:00
MeirGavish c745d776d0 Created Github Actions Build CI Test build_ci_workflow.yml 2025-07-26 01:40:33 +03:00
MeirGavish 8bbf97ea65 Merge pull request #53 from cellos51/fixed-sprite-vram-optimizations (Re-applied sprite vram optimizations after blind sprite fix) 2025-07-24 11:27:33 +03:00
cellos51 6a1f3bcd7a I hope this works 2025-07-23 20:14:22 -04:00
Elliptical f23f1293b6 Merge branch 'main' into fixed-sprite-vram-optimizations 2025-07-23 19:52:17 -04:00
cellos51 dda145a907 Fixed blind sprites 2025-07-23 19:28:36 -04:00
Elliptical 8d41ab270c Merge pull request #50 from cellos51/revert-48-sprite-vram-optimizations
Temporarily Revert "Sprite vram optimizations"
2025-07-23 19:24:25 -04:00
MeirGavish c781807ed8 Revert "Sprite vram optimizations" 2025-07-24 02:14:04 +03:00
Elliptical f8005546c5 Merge pull request #48 from cellos51/sprite-vram-optimizations
Sprite vram optimizations
2025-07-23 17:38:03 -04:00
cellos51 ea5e4d5d1e refactor: remove commented-out code and simplify joker initialization 2025-07-23 17:35:42 -04: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 300e725dfe made jokers dynamic and changed memcpy to us 32 2025-07-23 17:00:18 -04:00
cellos51 d122fde361 card layer does something now 2025-07-23 16:33:18 -04:00
cellos51 011bc64bab huge memory save 2025-07-23 16:17:24 -04:00
MeirGavish 5cc62612f5 Merge pull request #47 from cellos51/refactors
Moved the round end blind sprite and score a bit to the left so they look better for 4 digits
2025-07-23 19:49:46 +03:00
MeirGavish 2ed5922d43 merged jokers_refactors into refactors (manual conflict resolution) 2025-07-23 19:36:30 +03:00
MeirGavish 5e6bc76f5f Merge branch 'main' into jokers_refactors 2025-07-23 19:33:39 +03:00
Elliptical 992a6e1774 Merge pull request #46 from TheBreadPerson/truncating
Added truncating of numbers
2025-07-23 02:08:41 -04:00
TheBreadPerson b6a8fd4e6a Merge branch 'main' of https://github.com/cellos51/balatro-gba into truncating 2025-07-23 01:47:25 -04:00
TheBreadPerson b994358ac6 Minor number change 2025-07-23 01:45:00 -04:00
Elliptical 28767ebc4d Merge pull request #44 from cellos51/jokers
Basic joker implementation
2025-07-22 20:08:20 -04:00
cellos51 c025d35468 null check on greedy joker 2025-07-22 20:07:51 -04:00
cellos51 0e40dc43f7 Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers 2025-07-22 20:00:15 -04:00
cellos51 1b4267893d Added greedy joker and refactor joker system 2025-07-22 20:00:05 -04:00
Elliptical 14fc68e982 Merge pull request #43 from MeirGavish/refactors
Fixed a bug in text overflow case for update_text_rect_to_right_align_num()
2025-07-22 19:41:40 -04:00
MeirGavish 8ed7ddb127 Moved the round end blind sprite and score a bit so they look better on 4 digits 2025-07-23 02:14:30 +03:00
cellos51 62db2815dd removed another static variable and improved boss blind selection 2025-07-22 17:43:52 -04:00
cellos51 e51e08322f Fixed compilation error and removed another static variable 2025-07-22 17:39:33 -04:00
cellos51 c536d78976 Minor refactor to avoid the use of variable 2025-07-22 17:35:52 -04:00
MeirGavish c48ddee5c4 Fixed a bug in text overflow case for update_text_rect_to_right_align_num() 2025-07-23 00:32:31 +03:00
MeirGavish c24dcab726 Added TODO note and a warning comment 2025-07-23 00:02:24 +03:00
cellos51 b583755985 Refactored background change logic and removed unused static state variables in game functions 2025-07-22 15:53:49 -04:00
cellos51 793da72465 added co-pilot's fixes 2025-07-22 15:45:29 -04:00
TheBreadPerson 7a86450114 Starting to truncate numbers, half-baked 2025-07-22 15:34:03 -04:00
MeirGavish 087cb47f9d Merge branch 'main' into refactors 2025-07-22 16:31:38 +03:00
MeirGavish 71d41d7f62 Switched all the code in graphic_utils.c to use se_mat instead of se_mem, it's beautiful 2025-07-22 16:30:48 +03:00
cellos51 9086aa0f59 Fixed hands and discards being infinite and palette issue 2025-07-22 02:26:22 -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 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 7688b5062c Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers 2025-07-20 22:38:45 -04:00