wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Commit Graph

  • ab8200b2a3 Merge pull request #36 from MeirGavish/bug_fixes Gordie 2025-07-19 15:11:19 -04:00
  • bef11f9923 Fixed blind bottom of rect overwrite on skip bug MeirGavish 2025-07-19 17:17:23 +03:00
  • 52fa45e426 Refactor joker selection logic in game shop cellos51 2025-07-18 20:38:34 -04:00
  • c06b179764 really bad purchasing system for jokers cellos51 2025-07-18 20:25:12 -04:00
  • 176910c483 Jokers appear in the shop but don't do anything yet cellos51 2025-07-18 19:29:17 -04:00
  • 4a5644eddb Defining a basic system for jokers cellos51 2025-07-17 21:47:50 -04:00
  • ea2e503222 Ante up on boss defeat cellos51 2025-07-17 18:02:46 -04:00
  • 54d8aa2ec6 Applied most refactors from previous merge by @MeirGavish cellos51 2025-07-16 21:31:05 -04:00
  • a37ba18386 Fixed palette issue cellos51 2025-07-16 15:57:07 -04:00
  • 9f22628b6c removed unused background cellos51 2025-07-16 01:21:32 -04:00
  • 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 😭 cellos51 2025-07-16 01:20:50 -04:00
  • 309ebf281a Major refactor, too much else to list, check the git changes. cellos51 2025-07-16 00:55:27 -04:00
  • 70b3f089fb Merge pull request #31 from GreenNinja2525/main Gordie 2025-07-14 02:09:20 -04:00
  • f75e90f29b Merge pull request #33 from MeirGavish/refactors Gordie 2025-07-13 20:52:06 -04:00
  • 5d5a8a2d4b Fixed an error in previous hand background commit MeirGavish 2025-07-13 23:42:03 +03:00
  • e57b921d23 Merge branch 'cellos51:main' into main GreenNinja2525 2025-07-13 16:30:02 -04:00
  • caeb9ae6ef Merge branch 'main' into refactors MeirGavish 2025-07-13 23:26:45 +03:00
  • 8cbfa70590 Switched hand background playing/selecting switch to use small moves instead of big copies MeirGavish 2025-07-13 23:17:37 +03:00
  • e7589f27dc Added move version (...)se_move_rect_1_tile_vert(), switched to use it in down pop-out animations, updated copy version, and removed my POP_MENU_ANIM_RECT UP/DOWN hack MeirGavish 2025-07-13 21:20:57 +03:00
  • f34444b3db Fixed main_bg_se_copy_rect(), exposed it, and used it in a few places MeirGavish 2025-07-13 17:01:49 +03:00
  • b4b1f8adc8 Merge pull request #32 from MeirGavish/fix_build_error Gordie 2025-07-13 12:50:01 -04:00
  • 4f8930510e Update main.c and remove #include "background_play_gfx.h" GreenNinja2525 2025-07-13 12:21:56 -04:00
  • 90f8e47229 Merge branch 'fix_build_error' into refactors MeirGavish 2025-07-13 13:07:42 +03:00
  • e65d15654f Fixed compilation error MeirGavish 2025-07-13 11:15:30 +03:00
  • abc4d62405 Merge branch 'cellos51:main' into main GreenNinja2525 2025-07-12 23:49:07 -04:00
  • 297aa22ca1 Add copyright and disclaimer to address potential Copyright and Legal Action GreenNinja2525 2025-07-12 23:48:49 -04:00
  • e7a8e669ca Forgot to include boss blind functionality into background cellos51 2025-07-12 23:40:14 -04:00
  • 847f602c9e Changed the way the selecting/played background works and added logic for changing the background depending on blind type cellos51 2025-07-12 23:39:13 -04:00
  • 9f34d9fd95 Merge branch 'main_bg_se_copy_rect' into refactors MeirGavish 2025-07-13 04:56:04 +03:00
  • 191c1a7264 Made blind tokens visible in GAME_BLIND_SELECT state cellos51 2025-07-12 19:47:49 -04:00
  • f80bfefad5 fixed an issue with the shop icon breaking after going to the next round cellos51 2025-07-12 01:22:16 -04:00
  • 43d06921ce Merge pull request #29 from GreenNinja2525/main Gordie 2025-07-11 23:06:05 -04:00
  • c1b67e57d0 Edit README.md to temporarily remove Linux stuff for now GreenNinja2525 2025-07-11 21:51:07 -04:00
  • 1fc194448e fixed blind descend animation cellos51 2025-07-11 18:56:52 -04:00
  • 1ac345b71b Changed the word "my" to "an" in the readme to disassociate myself as the sole owner cellos51 2025-07-11 18:42:40 -04:00
  • 53d89b2752 Merge branch 'main' of https://github.com/cellos51/balatro-gba cellos51 2025-07-11 18:32:20 -04:00
  • 6266ea9fa5 Unified timer default value to be 0 cellos51 2025-07-11 18:32:17 -04:00
  • e76a42dd88 Merge pull request #28 from GreenNinja2525/main Gordie 2025-07-11 17:57:21 -04:00
  • 3c95bf2682 Small corrections to Windows Build instructions. GreenNinja2525 2025-07-11 14:40:21 -04:00
  • beaf365e0c Fixed compilation issue and changed default background cellos51 2025-07-11 13:52:33 -04:00
  • 541ad72a65 Merge pull request #26 from MeirGavish/start_at_blind_selection Gordie 2025-07-11 13:48:26 -04:00
  • 43a32f5a99 Merge branch 'main' into start_at_blind_selection MeirGavish 2025-07-11 19:42:52 +03:00
  • f9f58603c3 Merge pull request #27 from MeirGavish/refactors Gordie 2025-07-11 12:33:00 -04:00
  • 8d721b77e1 Fixed issue where pop menu panels overrode joker and consumable panels MeirGavish 2025-07-11 18:58:06 +03:00
  • a9a49e0884 Avoid non-small blind selection because it currently crashes the game MeirGavish 2025-07-11 18:42:53 +03:00
  • 4e5e1f340e Changed game to start at blind selection - added game_round_init() and game_set_state() etc to try and make easier state transmissions MeirGavish 2025-07-11 03:49:36 +03:00
  • 1d400d98ea Merge pull request #25 from GreenNinja2525/main Gordie 2025-07-10 23:12:51 -04:00
  • a32c1fa8b2 Add Initial Build Instructions For Windows and Update README.md GreenNinja2525 2025-07-10 22:57:22 -04:00
  • ebb6177d0d Merge pull request #22 from MeirGavish/refactors Gordie 2025-07-10 21:44:36 -04:00
  • be08cb79be Added some comments into the game_round_end() function cellos51 2025-07-10 21:33:38 -04:00
  • 3741f6f3bd Used main_bg_se_copy_rect_1_tile_vert for current blind raising MeirGavish 2025-07-11 04:06:04 +03:00
  • 2b60340747 Created function main_bg_se_copy_rect MeirGavish 2025-07-11 03:05:34 +03:00
  • 04e9aefe51 Merge branch 'main' into refactors MeirGavish 2025-07-11 02:44:47 +03:00
  • 867681bf0c Merge pull request #21 from MeirGavish/refactors Gordie 2025-07-10 17:19:41 -04:00
  • 4f3c91361d Whitespace edit MeirGavish 2025-07-10 23:37:56 +03:00
  • 05f4cc2abb Fixed generic main_bg_se_copy_rect_1_tile_vert() function and replaced some code with it MeirGavish 2025-07-10 20:59:04 +03:00
  • 6ef1f51c55 Merged "main"into "refactors" (manual conflict resolution) MeirGavish 2025-07-10 16:47:53 +03:00
  • fb7b60431c Extracted pop menu animation to a rect copying function for shop MeirGavish 2025-07-10 03:23:42 +03:00
  • f027c7bea0 Added the ability to skip blinds in the blind select state cellos51 2025-07-09 22:06:49 -04:00
  • e1c1d68694 basic implementation of blind select screen cellos51 2025-07-09 21:37:49 -04:00
  • b246249be7 Updated shop state to have rough functionality to switch to the next state cellos51 2025-07-09 20:00:03 -04:00
  • 83af67c3ed Merged "main" into "refactors" (manually) MeirGavish 2025-07-09 22:27:21 +03:00
  • d787a918b6 Refactored so only set_hand() sets the global variable and not hand_get_type() so as to conform to set/get semantics MeirGavish 2025-07-09 17:36:19 +03:00
  • 86f14d7983 Merge pull request #20 from MeirGavish/tte_rect_refactor Gordie 2025-07-09 12:57:18 -04:00
  • 83aa422f3e Refactor - replaced (almost) all magic numbers for TTE rects with rect definitions MeirGavish 2025-07-09 06:34:50 +03:00
  • b822d2b365 Moved code to new graphic_utils.c/.h header and added Rect wrapper struct MeirGavish 2025-07-09 04:27:10 +03:00
  • 2aaee73bac Replaced round end menu hack with clear rect function MeirGavish 2025-07-09 03:26:12 +03:00
  • 8a0ede16af Merge pull request #18 from MeirGavish/refactors Gordie 2025-07-08 17:56:24 -04:00
  • de3e75928d Merge branch 'main' into refactors MeirGavish 2025-07-09 00:45:07 +03:00
  • 2a92b3ecaa Added SBB and CBB defines for SE/tile bases to remove their magic numbers MeirGavish 2025-07-08 22:54:33 +03:00
  • ff4e32ad3e Merge pull request #17 from MeirGavish/bug_fixes Gordie 2025-07-08 13:48:41 -04:00
  • ef973f54fe Another indent fix MeirGavish 2025-07-08 19:19:16 +03:00
  • f392237b68 Fixed indent error from previous commit MeirGavish 2025-07-08 19:15:12 +03:00
  • e65b43e966 Fixed five of a kind bug MeirGavish 2025-07-08 19:11:48 +03:00
  • 2805018463 Merge pull request #16 from GreenNinja2525/main Gordie 2025-07-07 14:33:07 -04:00
  • 8250af122c Add files via upload GreenNinja2525 2025-07-07 14:23:54 -04:00
  • a56bba2c0e implemented shop screen after round end cellos51 2025-07-05 19:34:48 -04:00
  • 8f7f093290 i keep accidentally pushing the game state cellos51 2025-07-05 14:32:08 -04:00
  • 6435b92378 Slight update to graphics and added shop background image cellos51 2025-07-03 21:49:29 -04:00
  • 729aa903be Merge pull request #11 from MeirGavish/replace_vid_sync_with_interrupt Gordie 2025-07-03 01:32:31 -04:00
  • 878a0a24eb Replaced call to vid_sync() with the better VBlankIntrWait() MeirGavish 2025-07-03 04:15:48 +03:00
  • fca36200f1 Added Visual Studio project files to .gitignore MeirGavish 2025-07-03 04:13:10 +03:00
  • 4a8c7d62aa Set game state back to GAME_PLAYING from GAME_ROUND_END cellos51 2025-07-01 17:32:02 -04:00
  • bbd66f2b58 Pretty much finished the round end screen cellos51 2025-07-01 17:31:25 -04:00
  • d7ad34af92 Fixed some oversights cellos51 2025-06-30 21:29:35 -04:00
  • 67b917fc7c Yandere dev style code for the almost finished round end screen cellos51 2025-06-30 21:20:51 -04:00
  • c4594e379c Update README.md to clarify content limitations and replace example GIF cellos51 2025-06-30 12:51:11 -04:00
  • 26d6665e6e Fixed tiles on round end screen cellos51 2025-06-30 12:38:26 -04:00
  • d5db218338 Merge pull request #7 from MeirGavish/graphic_changes Gordie 2025-06-30 12:22:36 -04:00
  • dbfe001091 Merge pull request #9 from expected-ingot/main Gordie 2025-06-30 12:21:56 -04:00
  • ce9e77d201 Fixed E character and "Score Aim" -> "Score Min" according to review MeirGavish 2025-06-30 15:34:37 +03:00
  • c8f2e96572 GAME_LOSE state expected-ingot 2025-06-30 14:16:07 +02:00
  • e65a5cf133 Merge branch 'main' into graphic_changes MeirGavish 2025-06-30 13:26:44 +03:00
  • 3ead483367 Merge branch 'main' into graphic_changes MeirGavish 2025-06-30 13:26:10 +03:00
  • c58b569516 Added more stuff to the end round, made the blind token a sprite and toned dow n the background animation a bit. cellos51 2025-06-30 03:18:04 -04:00
  • 869cec0ecf Merge pull request #6 from MeirGavish/refactors Gordie 2025-06-30 01:15:54 -04:00
  • 2969c8c18c Merge branch 'refactor_addendum' into refactors MeirGavish 2025-06-30 06:33:14 +03:00
  • b04b69e117 Added pixel to small background text height to make it more readable MeirGavish 2025-06-30 06:28:31 +03:00
  • c8c966b459 Missing change from previous refactor magic number commit MeirGavish 2025-06-30 06:12:31 +03:00
  • f476b5efe9 Merge pull request #3 from expected-ingot/main Gordie 2025-06-29 19:24:17 -04:00