cellos51
8fafcd1cdf
Reduced amount of menu buttons
2025-08-25 17:52:27 -04:00
cellos51
b9b87a7b30
Refactor countdown timer rectangle usage in splash screen for improved readability
2025-08-25 17:50:16 -04:00
cellos51
7b2fc1ac75
Refactor main menu button color definitions for clarity and consistency
2025-08-25 16:59:10 -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
da6248036c
Remove unnecessary joker initialization in game_start and set game state to GAME_BLIND_SELECT
2025-08-24 13:47:59 -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
cellos51
5d0ea3a101
Changed formatting on github link
2025-08-12 21:42:44 -04:00
cellos51
4c5c0f4d40
Removed rng set in game_round_init() and updated defines for splash screen
2025-08-12 20:55:03 -04:00
cellos51
abfcb68f75
Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen
2025-08-12 20:53:31 -04:00
cellos51
f2497a1284
fixed boss blind background being too dark
2025-08-10 16:34:47 -04:00
cellos51
7505d89194
Addec count down timer to splash screen and stopped music playing until at menu
2025-08-10 13:11:05 -04:00
cellos51
7d2be834a3
Splash screen with disclaimer added
2025-08-10 13:00:38 -04:00
cellos51
c5ff984e84
Added copliot's changes
2025-08-10 12:09:59 -04:00
cellos51
dcf892a393
Moved seed calculation into main_menu state
2025-08-10 12:04:06 -04:00
cellos51
d2aee1979b
Reverted game over logic
2025-08-10 11:59:35 -04:00
cellos51
d20b5c5ce4
Buggy restarting
2025-08-09 23:18:52 -04:00
cellos51
164f58aa1e
Main menu prototype
2025-08-09 21:49:37 -04:00
cellos51
6363613f15
Added & back to the tile8_mem in affine_background_init() and changed memcpy16 to 32
2025-08-08 10:44:55 -04:00
cellos51
650c09af28
Converted void to u16 in functions
2025-08-08 09:54:24 -04:00
cellos51
12ca27e27b
Removed default color for affine background and changed to load palette from image instead
2025-08-08 00:32:30 -04:00
cellos51
3c79a35b92
Redefined affinge background default color to use RGB15 and reverted grayscale of background image
2025-08-08 00:22:04 -04:00
cellos51
dbe8585c0a
Refactor affine_background_set_color to simplify brightness adjustment logic
2025-08-08 00:08:28 -04:00
cellos51
bebe2237e4
Add memcpy16_tile8_with_palette_offset function and update affine_background_init to use it
2025-08-08 00:00:20 -04:00
cellos51
9be6a31dce
Use tonc defines for getting colors
2025-08-07 23:31:23 -04:00
cellos51
01d7ed8e91
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
2025-08-07 21:34:46 -04:00
cellos51
7e6cc02869
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
2025-08-07 17:44:58 -04:00
cellos51
d0ca4a483d
Fix indentation in affine_background.c for consistency
2025-08-05 14:42:37 -04:00
cellos51
592d7ae8bc
Add affine background color functionality and integrate into game loop
2025-08-05 14:35:52 -04:00
cellos51
46b53db8a0
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
2025-08-04 20:13:02 -04:00
cellos51
c7f6708555
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
2025-08-04 14:57:45 -04:00
cellos51
95b1937eac
Merge branch 'main' of https://github.com/cellos51/balatro-gba into boss_backgrounds
2025-08-04 11:41:48 -04:00
cellos51
6a1f3bcd7a
I hope this works
2025-07-23 20:14:22 -04:00
cellos51
dda145a907
Fixed blind sprites
2025-07-23 19:28:36 -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
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
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
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
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
cellos51
c848419fdc
Added The Wall's background palette
2025-07-20 22:24:37 -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
cellos51
fac4a3c626
Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers
2025-07-19 15:16:08 -04: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
9f22628b6c
removed unused background
2025-07-16 01:21:32 -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
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
f80bfefad5
fixed an issue with the shop icon breaking after going to the next round
2025-07-12 01:22:16 -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
cellos51
beaf365e0c
Fixed compilation issue and changed default background
2025-07-11 13:52:33 -04:00
cellos51
be08cb79be
Added some comments into the game_round_end() function
2025-07-10 21:33:38 -04: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
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
cellos51
4a8c7d62aa
Set game state back to GAME_PLAYING from GAME_ROUND_END
2025-07-01 17:32:02 -04:00
cellos51
bbd66f2b58
Pretty much finished the round end screen
2025-07-01 17:31:25 -04:00
cellos51
d7ad34af92
Fixed some oversights
2025-06-30 21:29:35 -04:00
cellos51
67b917fc7c
Yandere dev style code for the almost finished round end screen
2025-06-30 21:20:51 -04:00
cellos51
c4594e379c
Update README.md to clarify content limitations and replace example GIF
2025-06-30 12:51:11 -04:00
cellos51
26d6665e6e
Fixed tiles on round end screen
2025-06-30 12:38:26 -04: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
cellos51
5196362ab9
Added wip moving background, end of round screen and temporarily removed blind icon.
2025-06-28 22:32:45 -04:00
cellos51
36b1508e85
Added begginings of the round end screen
2025-06-27 00:03:38 -04: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
167e0c6c1a
hello cooper!
2025-06-23 19:03:37 -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