diff --git a/.clang-format b/.clang-format index 1fd88b4..31fb924 100644 --- a/.clang-format +++ b/.clang-format @@ -34,7 +34,7 @@ SpaceBeforeParensOptions: AlignOperands: AlignAfterOperator BreakBeforeBinaryOperators: None -IndentPPDirectives: AfterHash +IndentPPDirectives: None AlignConsecutiveMacros: Consecutive BinPackArguments: false @@ -48,3 +48,5 @@ ReflowComments: true SpacesInLineCommentPrefix: Minimum: 1 Maximum: 1 + +PenaltyReturnTypeOnItsOwnLine: 99999999 diff --git a/.github/workflows/run_tests_ci_workflow.yml b/.github/workflows/run_tests_ci_workflow.yml index 5897d96..c1ff7d7 100644 --- a/.github/workflows/run_tests_ci_workflow.yml +++ b/.github/workflows/run_tests_ci_workflow.yml @@ -17,7 +17,10 @@ jobs: uses: actions/checkout@v5 - name: Clang Format - run: clang-format --dry-run -Werror include/bitset.h source/bitset.c + run: > + clang-format --dry-run -Werror + include/bitset.h source/bitset.c + include/splash_screen.h source/splash_screen.c # Currently contains only the code that has been formatted to conform # When all existing code conforms, change to this: # run: clang-format --dry-run -Werror include/*.h source/*.c diff --git a/include/splash_screen.h b/include/splash_screen.h index 6436bca..800a629 100644 --- a/include/splash_screen.h +++ b/include/splash_screen.h @@ -3,9 +3,9 @@ #include -#define SPLASH_FPS 60 +#define SPLASH_FPS 60 #define SPLASH_DURATION_SECONDS 10 -#define SPLASH_DURATION_FRAMES (SPLASH_FPS * SPLASH_DURATION_SECONDS) +#define SPLASH_DURATION_FRAMES (SPLASH_FPS * SPLASH_DURATION_SECONDS) void splash_screen_on_init(); void splash_screen_on_update(); diff --git a/source/splash_screen.c b/source/splash_screen.c index 80f4c11..2da30d5 100644 --- a/source/splash_screen.c +++ b/source/splash_screen.c @@ -1,12 +1,12 @@ #include "splash_screen.h" -#include - -#include "graphic_utils.h" #include "game.h" +#include "graphic_utils.h" #include "maxmod.h" #include "soundbank.h" +#include + static const Rect COUNTDOWN_TIMER_RECT = {208, 144, 240, 152}; static uint timer = 0; @@ -15,7 +15,10 @@ void splash_screen_on_init() timer = 0; tte_printf("#{P:72,8; cx:0xF000}DISCLAIMER"); - tte_printf("#{P:8,24; cx:0xF000}This project is NOT endorsed \n by or affiliated with \n Playstack or LocalThunk.\n\n If you have paid for this, \n you have been scammed \n and should request a refund \n IMMEDIATELY. \n\n The only official place \n to obtain this is from: \n\n 'github.com/\n cellos51/balatro-gba'"); + tte_printf( + "#{P:8,24; cx:0xF000}This project is NOT endorsed \n by or affiliated with \n Playstack or LocalThunk.\n\n If " + "you have paid for this, \n you have been scammed \n and should request a refund \n IMMEDIATELY. \n\n The only " + "official place \n to obtain this is from: \n\n 'github.com/\n cellos51/balatro-gba'"); tte_printf("#{P:8,144; cx:0xF000}(Press any key to skip)"); } @@ -26,7 +29,10 @@ void splash_screen_on_update() if (timer < SPLASH_DURATION_FRAMES) { tte_erase_rect_wrapper(COUNTDOWN_TIMER_RECT); - tte_printf("#{P:%d,%d; cx:0xF000}%d", COUNTDOWN_TIMER_RECT.left, COUNTDOWN_TIMER_RECT.top, 1 + (SPLASH_DURATION_FRAMES - timer) / SPLASH_FPS); + tte_printf("#{P:%d,%d; cx:0xF000}%d", + COUNTDOWN_TIMER_RECT.left, + COUNTDOWN_TIMER_RECT.top, + 1 + (SPLASH_DURATION_FRAMES - timer) / SPLASH_FPS); if (!key_hit(KEY_ANY)) {