 Gordie
|
43d06921ce
|
Merge pull request #29 from GreenNinja2525/main
Edit README.md to temporarily remove Linux stuff for now
|
2025-07-11 23:06:05 -04:00 |
|
|
GreenNinja2525
|
c1b67e57d0
|
Edit README.md to temporarily remove Linux stuff for now
|
2025-07-11 21:51:07 -04:00 |
|
|
cellos51
|
1fc194448e
|
fixed blind descend animation
|
2025-07-11 18:56:52 -04:00 |
|
|
cellos51
|
1ac345b71b
|
Changed the word "my" to "an" in the readme to disassociate myself as the sole owner
|
2025-07-11 18:42:40 -04:00 |
|
|
cellos51
|
53d89b2752
|
Merge branch 'main' of https://github.com/cellos51/balatro-gba
|
2025-07-11 18:32:20 -04:00 |
|
|
cellos51
|
6266ea9fa5
|
Unified timer default value to be 0
|
2025-07-11 18:32:17 -04:00 |
|
|
Gordie
|
e76a42dd88
|
Merge pull request #28 from GreenNinja2525/main
Small corrections to Windows Build instructions.
|
2025-07-11 17:57:21 -04:00 |
|
|
GreenNinja2525
|
3c95bf2682
|
Small corrections to Windows Build instructions.
|
2025-07-11 14:40:21 -04:00 |
|
|
cellos51
|
beaf365e0c
|
Fixed compilation issue and changed default background
|
2025-07-11 13:52:33 -04:00 |
|
|
Gordie
|
541ad72a65
|
Merge pull request #26 from MeirGavish/start_at_blind_selection
Changed game to start at blind selection
|
2025-07-11 13:48:26 -04:00 |
|
|
MeirGavish
|
43a32f5a99
|
Merge branch 'main' into start_at_blind_selection
|
2025-07-11 19:42:52 +03:00 |
|
|
Gordie
|
f9f58603c3
|
Merge pull request #27 from MeirGavish/refactors
Fixed issue where pop menu panels overrode joker and consumable panels
|
2025-07-11 12:33:00 -04: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
|
1d400d98ea
|
Merge pull request #25 from GreenNinja2525/main
Add Initial Build Instructions For Windows and Update README.md
|
2025-07-10 23:12:51 -04:00 |
|
|
GreenNinja2525
|
a32c1fa8b2
|
Add Initial Build Instructions For Windows and Update README.md
|
2025-07-10 22:57:22 -04: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
|
2b60340747
|
Created function main_bg_se_copy_rect
|
2025-07-11 03:05:34 +03:00 |
|
|
MeirGavish
|
04e9aefe51
|
Merge branch 'main' into refactors
|
2025-07-11 02:44:47 +03:00 |
|
|
Gordie
|
867681bf0c
|
Merge pull request #21 from MeirGavish/refactors
Refactors - Added screen rect vertical copying function
|
2025-07-10 17:19:41 -04:00 |
|
|
MeirGavish
|
4f3c91361d
|
Whitespace edit
|
2025-07-10 23:37:56 +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 |
|
|
Gordie
|
86f14d7983
|
Merge pull request #20 from MeirGavish/tte_rect_refactor
TTE Rect Refactor and More
|
2025-07-09 12:57:18 -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 |
|
|
Gordie
|
8a0ede16af
|
Merge pull request #18 from MeirGavish/refactors
Refactor - Added SBB and CBB defines for SE/tile bases to remove their magic numbers
|
2025-07-08 17:56:24 -04:00 |
|
|
MeirGavish
|
de3e75928d
|
Merge branch 'main' into refactors
|
2025-07-09 00:45:07 +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 |
|
|
Gordie
|
ff4e32ad3e
|
Merge pull request #17 from MeirGavish/bug_fixes
Five of a kind bug fix
|
2025-07-08 13:48:41 -04:00 |
|
|
MeirGavish
|
ef973f54fe
|
Another indent fix
|
2025-07-08 19:19:16 +03:00 |
|
|
MeirGavish
|
f392237b68
|
Fixed indent error from previous commit
|
2025-07-08 19:15:12 +03:00 |
|
|
MeirGavish
|
e65b43e966
|
Fixed five of a kind bug
|
2025-07-08 19:11:48 +03:00 |
|
|
Gordie
|
2805018463
|
Merge pull request #16 from GreenNinja2525/main
Replace Default Card Sprites - Small Edits
|
2025-07-07 14:33:07 -04:00 |
|
|
GreenNinja2525
|
8250af122c
|
Add files via upload
|
2025-07-07 14:23:54 -04:00 |
|
|
cellos51
|
a56bba2c0e
|
implemented shop screen after round end
|
2025-07-05 19:34:48 -04:00 |
|
|
cellos51
|
8f7f093290
|
i keep accidentally pushing the game state
|
2025-07-05 14:32:08 -04:00 |
|
|
cellos51
|
6435b92378
|
Slight update to graphics and added shop background image
|
2025-07-03 21:49:29 -04:00 |
|
|
Gordie
|
729aa903be
|
Merge pull request #11 from MeirGavish/replace_vid_sync_with_interrupt
Replace vid_sync() with VBL interrupt
|
2025-07-03 01:32:31 -04:00 |
|
|
MeirGavish
|
878a0a24eb
|
Replaced call to vid_sync() with the better VBlankIntrWait()
|
2025-07-03 04:15:48 +03:00 |
|