Nan af72fe5749 Fix conflicts ...

Attempt 1

2025-10-08 18:21:55 +02:00

..

affine_background.c

Main menu uses HBLANK and the game uses standard affine background

2025-08-28 23:00:27 -04:00

audio_utils.c

Added audio_utils.h/.c and refactored calls to mmEffectEx to use wrapper play_sfx() instead

2025-08-01 20:36:07 +03:00

blind.c

Merge branch 'main' of https://github.com/cellos51/balatro-gba into jokers

2025-07-20 22:38:45 -04:00

card.c

Extracted JokerObject and CardObject common functionalities to SpriteObject, removing duplicate code and dangerous casts.

2025-07-27 01:13:57 +03:00

game.c

Move version into C file

2025-09-24 20:44:13 -07:00

graphic_utils.c

Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen

2025-08-24 13:47:41 -04:00

hand_analysis.c

Added copilot's full house detection code with @theturtlemafia's boolean simplification. Tested.

2025-08-01 03:17:54 +03:00

joker_effects.c

Fix conflicts

2025-10-08 18:21:55 +02:00

joker.c

Renamed joker_table.h to def_joker_gfx_table.h. Removed an unnecessary constant

2025-09-22 16:06:45 -05:00

list.c

Refactored jokers stack to be a list (AI used)

2025-08-16 13:18:44 +03:00

main.c

Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects and changed parameters on affine source to be updated from experimental branch

2025-08-28 22:39:48 -04:00

selection_grid.c

Added joker selling (still no animation) + fixed SpriteObject constructor focused bug

2025-08-16 15:38:34 +03:00

splash_screen.c

Refactor countdown timer rectangle usage in splash screen for improved readability

2025-08-25 17:50:16 -04:00

sprite.c

Removed redundant copy of shadow buffer into OAM.

2025-09-14 13:50:38 -05:00

util.c

Added dynamic palette loading for jokers and added new joker designs by @GreenNinja2525

2025-07-30 21:00:29 +03:00

version.c

Move version into C file

2025-09-24 20:44:13 -07:00