Commit Graph

Select branches

Hide Pull Requests

prototype/chinese-joker-descriptions

Mono Color

• 7bafc260dd fixed game_speed, now using fixed point and keeping game_speed static alex 2025-09-22 22:04:51 -07:00
• 3888a198c8 Change to Shields.io Badges Wheeler 2025-09-22 22:38:57 -04:00
• e58208e13d Add uploading ROM on tag push Rickey Fehr 2025-09-21 18:44:46 -07:00
• 74739d87ed Merge pull request #123 from drewjohnson2/main MeirGavish 2025-09-22 23:15:56 +02:00
• e620697917 Renamed joker_table.h to def_joker_gfx_table.h. Removed an unnecessary constant Drew 2025-09-22 16:06:45 -05:00
• 8d278b0c19 Fix Dynamic Badges (hopefully) Wheeler 2025-09-22 12:44:20 -04:00
• 26db4e1aa0 Update joker_effects.c noctowlhoot 2025-09-22 21:42:15 +09:30
• 66c6b91222 Merge pull request #1 from noctowlhoot/noctowlhoot-patch-1 noctowlhoot 2025-09-22 20:54:44 +09:30
• 591485a5ac Update joker_effects.c noctowlhoot 2025-09-22 20:49:35 +09:30
• 301f5a2a53 kind of fixed how game_speed behaves alex 2025-09-21 23:49:24 -07:00
• 6e60cf5970 kind of fixed how game_speed behaves alex 2025-09-21 23:16:50 -07:00
• a9f44e74d4 Wrap around hand selection when going out of bounds horizontally Marcel Schnelle 2025-09-21 17:50:51 +09:00
• 2c2cb17f74 Add macOS setup instructions Seafoamm 2025-09-21 00:25:51 -07:00
• 9dc5f7ccc3 Merge pull request #116 from HeadedBranch/main MeirGavish 2025-09-18 21:44:30 +02:00
• 7c377fca94 Making joker_gfxTiles and joker_gfxPal static Drew 2025-09-17 15:35:21 -05:00
• c4e804234b Moving macro into pool definition Drew 2025-09-17 15:01:26 -05:00
• 3dc959c17d Converting joker_gfxTiles and joker_gfxPal to pools Drew 2025-09-17 14:35:00 -05:00
• 2c5bc3b5dd Adding an x macro to cut down on some boilerplate. This should make adding additional jokers require a little less typing. Additional jokers will need an entry in /include/joker_table.h Drew 2025-09-15 21:36:20 -05:00
• 27e91fb4a4 Merge pull request #121 from drewjohnson2/main MeirGavish 2025-09-15 23:50:50 +03:00
• 2669afbae2 Merge branch 'main' of https://github.com/cellos51/balatro-gba Nan 2025-09-15 21:46:48 +02:00
• a16065439e Merge pull request #117 from ricfehr3/main MeirGavish 2025-09-15 22:30:21 +03:00
• 5b76cbfad0 Add cache for docker compose container Rickey Fehr 2025-09-14 13:25:57 -07:00
• 074f1956aa Update Github Actions CI to use Docker Compose Rickey Fehr 2025-09-14 13:06:41 -07:00
• e8e945b17d Removed redundant copy of shadow buffer into OAM. Drew 2025-09-14 13:50:38 -05:00
• 35c0d383c5 Add blueprint and brainstorm jokers Nan 2025-09-13 22:18:31 +02:00
• b27c94e5bd Add docker support Rickey Fehr 2025-09-11 12:46:18 -07:00
• 1562e4f9c7 Add step to activate correct shell variables Isaac Hesslegrave 2025-09-11 08:36:37 +00:00
• c2ef5b15d4 Add install instructions for linux Isaac Hesslegrave 2025-09-11 08:27:42 +00:00
• d1bbba82df Merge pull request #112 from GreenNinja2525/main MeirGavish 2025-08-30 20:56:32 +03:00
• 984e77d6c8 Add Missing Instruction and Move Link Wheeler 2025-08-29 20:12:59 -04:00
• 2bd253f451 Formatting Error Wheeler 2025-08-29 19:25:22 -04:00
• 176accd1a6 Merge branch 'cellos51:main' into main Wheeler 2025-08-29 19:19:15 -04:00
• 3c09d6fb79 Revise Build Instructions Wheeler 2025-08-29 19:18:35 -04:00
• aec53ced91 Merge pull request #111 from cellos51/held_jokers_refactor MeirGavish 2025-08-30 02:16:15 +03:00
• cc65fbc5de Small refactor for the joker lists to have wrapping functions to add and remove jokers MeirGavish 2025-08-30 02:15:00 +03:00
• ff62b12ac9 Merge pull request #91 from cellos51/hblank_affine_background_effects Elliptical 2025-08-29 15:18:49 -04:00
• c15c2821e8 Merge branch 'hblank_affine_background_effects' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects MeirGavish 2025-08-29 16:26:41 +03:00
• d0d83eb236 Main menu uses HBLANK and the game uses standard affine background cellos51 2025-08-28 23:00:27 -04:00
• f4d8fc9097 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 cellos51 2025-08-28 22:39:48 -04:00
• a478701deb Merge pull request #93 from cellos51/main_menu_and_splash_screen Elliptical 2025-08-28 19:35:55 -04:00
• c41fcd1a24 Remove unused definition for maximum background palette size cellos51 2025-08-28 19:04:51 -04:00
• 4b7a22baff made all palettes have their length set in grit cellos51 2025-08-28 19:03:48 -04:00
• bc32707126 replaced magic numbers for background palette size cellos51 2025-08-28 16:09:46 -04:00
• 6e2d3ee499 Merge branch 'main' of https://github.com/cellos51/balatro-gba into hblank_affine_background_effects cellos51 2025-08-25 19:34:25 -04:00
• 06ca593e8a Update source/game.c EllipticalandCopilot 2025-08-25 18:06:35 -04:00
• 8fafcd1cdf Reduced amount of menu buttons cellos51 2025-08-25 17:52:27 -04:00
• b9b87a7b30 Refactor countdown timer rectangle usage in splash screen for improved readability cellos51 2025-08-25 17:50:16 -04:00
• 7b2fc1ac75 Refactor main menu button color definitions for clarity and consistency cellos51 2025-08-25 16:59:10 -04:00
• 94821ffa27 Update source/game.c EllipticalandMeirGavish 2025-08-25 16:15:07 -04:00
• 21d85f49ab Update source/main.c EllipticalandMeirGavish 2025-08-25 16:14:51 -04:00
• 5e4722e27b Merge pull request #109 from GreenNinja2525/main MeirGavish 2025-08-25 21:13:00 +03:00
• cb66b30795 Remove Forks and Stars badges Wheeler 2025-08-25 12:54:37 -04:00
• dda6585935 Minor Text Tweak Wheeler 2025-08-25 08:06:29 -04:00
• ab8a143eeb Minor Text issues Wheeler 2025-08-25 08:00:18 -04:00
• 5dbc50d755 Scale Gif and Add Balatro Wiki Badge Wheeler 2025-08-25 07:55:59 -04:00
• ba36679a3b Add New Gameplay Gif Wheeler 2025-08-25 07:32:44 -04:00
• 9ab2fef330 Remove Watchers Badge Wheeler 2025-08-24 20:27:27 -04:00
• 387bbbfda0 Add Icons to Badges, Remove Linux Instructions Section Wheeler 2025-08-24 20:23:08 -04:00
• 4f1f7cb347 Add splash screen functionality and update game state management cellos51 2025-08-24 15:44:45 -04:00
• da6248036c Remove unnecessary joker initialization in game_start and set game state to GAME_BLIND_SELECT cellos51 2025-08-24 13:47:59 -04:00
• 53e6156397 Merge branch 'main' of https://github.com/cellos51/balatro-gba into main_menu_and_splash_screen cellos51 2025-08-24 13:47:41 -04:00
• 06087370a1 Add Dynamic Badges and more small tweaks Wheeler 2025-08-22 23:56:25 -04:00
• 8a50940f48 Add Controls, minor tweaks and shorten Xbox Logo URL Wheeler 2025-08-22 23:05:52 -04:00
• e86777b4cc Add Cool Link Buttons to README.md Wheeler 2025-08-22 20:30:00 -04:00
• ff9c28cbed Merge branch 'main' into hblank_affine_background_effects MeirGavish 2025-08-22 20:16:26 +03:00
• 3d3d7198b8 Merge pull request #107 from cellos51/blue_joker_fixes_additional_proposed_changes MeirGavish 2025-08-22 19:58:09 +03:00
• ff54bb244f Merge pull request #108 from cellos51/smiley_scary_face MeirGavish 2025-08-22 19:55:46 +03:00
• 1d070b9c3f Fixed Blue Joker shine MeirGavish 2025-08-22 19:47:56 +03:00
• 2d50005e30 Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code MeirGavish 2025-08-22 19:43:27 +03:00
• c5488fb008 Merge pull request #106 from GreenNinja2525/main MeirGavish 2025-08-22 18:41:43 +03:00
• 76f225168a Additional change for Blue Joker MeirGavish 2025-08-22 18:28:00 +03:00
• 9d213662b7 Fix Outline of Greedy Joker Wheeler 2025-08-21 21:23:22 -04:00
• 0a47b19493 Update Blue Joker Wheeler 2025-08-21 21:09:15 -04:00
• 593901e981 Delete joker_gfx12.png (I messed up whoops) Wheeler 2025-08-21 21:08:23 -04:00
• d09d0a2ee8 Update Blue Joker Wheeler 2025-08-21 21:06:15 -04:00
• 5e93a95d03 Merge pull request #105 from cellos51/game_over_screen MeirGavish 2025-08-22 02:10:07 +03:00
• 3be49b1d80 Removed old comment MeirGavish 2025-08-22 02:09:24 +03:00
• 854c52464f Small refactor - extracted helper functiosn for main_bg_se_copy_expand_3x3_rect() MeirGavish 2025-08-22 00:37:02 +03:00
• 7f5ed5433f Win screen + Game over animation with hand discard MeirGavish 2025-08-21 23:33:51 +03:00
• a707927b2f Refactor - extracted card_in_hand_loop_handle_discard_and_shuffling() from cards_in_hand_update_loop() MeirGavish 2025-08-21 19:07:02 +03:00
• c4b538c009 Basic game over screen + added main_bg_se_copy_expand_3x3_rect() MeirGavish 2025-08-19 21:40:40 +03:00
• 5a70b002a9 graphic_utils refactors - renamed functions, optimized some code, used Tonc defines MeirGavish 2025-08-19 18:33:47 +03:00
• 065d846ac7 Used text red color for game over background MeirGavish 2025-08-19 17:59:26 +03:00
• 42a0e94afd Refactor - Added defines for text colors and used them in all usses of tte_printf MeirGavish 2025-08-19 17:47:24 +03:00
• 6d6bb39c97 Affine background now turns red on game over + other WIP changes for game over screen MeirGavish 2025-08-19 16:31:32 +03:00
• 7bbaec261b Merge branch 'main' into game_over_screen MeirGavish 2025-08-19 13:33:20 +03:00
• 9164fba996 Even Steven card corner fix MeirGavish 2025-08-17 14:51:04 +03:00
• 1b9785bc1f Sly Joker card corner fix MeirGavish 2025-08-17 13:42:56 +03:00
• c3f9f57e7f Merge pull request #74 from theturtlemafia/ttm/joker-scope-joker-1 MeirGavish 2025-08-17 12:46:46 +03:00
• 46141090a0 Added joker sprites by @GreenNinja2525 for Blue Joker, Even Steven, Odd Todd, Scholar and Business Card. Disabled jokers with no sprites. MeirGavish 2025-08-17 12:36:20 +03:00
• 2539954dea Fixed build error from previous merge and applied review comments MeirGavish 2025-08-17 11:10:00 +03:00
• 04515839dc (Manual conflict res) merged main into ttm/joker-scope-joker-1 MeirGavish 2025-08-17 11:03:27 +03:00
• 8524a78271 Merge pull request #102 from cellos51/joker_selling MeirGavish 2025-08-17 10:57:38 +03:00
• 376309a9ef (Manual conflict res on game.c) Merged main into ttm/joker-scop-1 MeirGavish 2025-08-17 10:37:03 +03:00
• 947fac7358 Added joker selling animation MeirGavish 2025-08-16 21:33:23 +03:00
• 64274ae465 Added joker selling (still no animation) + fixed SpriteObject constructor focused bug MeirGavish 2025-08-16 15:38:34 +03:00
• 92fa279059 Refactored jokers stack to be a list (AI used) MeirGavish 2025-08-16 13:18:44 +03:00
• bc8847d2cb Merge branch 'main' into joker_selling MeirGavish 2025-08-16 12:41:38 +03:00
• b63559862f renamed int_list.c to list.c MeirGavish 2025-08-16 12:41:11 +03:00
• 3e775f2ac6 Added game over menu tiles to background_gfx.png and removed dedicated background file MeirGavish 2025-08-16 12:27:31 +03:00