diff --git a/graphics/background_gfx.png b/graphics/background_gfx.png index 3107264..759079d 100644 Binary files a/graphics/background_gfx.png and b/graphics/background_gfx.png differ diff --git a/graphics/background_play_gfx.png b/graphics/background_play_gfx.png index d2ba9a8..ebd220f 100644 Binary files a/graphics/background_play_gfx.png and b/graphics/background_play_gfx.png differ diff --git a/graphics/background_round_end_gfx.png b/graphics/background_round_end_gfx.png index fcb79aa..9def564 100644 Binary files a/graphics/background_round_end_gfx.png and b/graphics/background_round_end_gfx.png differ diff --git a/graphics/background_shop_gfx.grit b/graphics/background_shop_gfx.grit new file mode 100644 index 0000000..f57bef6 --- /dev/null +++ b/graphics/background_shop_gfx.grit @@ -0,0 +1 @@ +-gB8 -mR8 -mLs -mRtf \ No newline at end of file diff --git a/graphics/background_shop_gfx.png b/graphics/background_shop_gfx.png new file mode 100644 index 0000000..1a9aa46 Binary files /dev/null and b/graphics/background_shop_gfx.png differ diff --git a/source/game.c b/source/game.c index 709d1ca..c7d8213 100644 --- a/source/game.c +++ b/source/game.c @@ -19,7 +19,7 @@ static int timer = 1; // This might already exist in libtonc but idk so i'm just static int game_speed = 1; static int background = 0; -static enum GameState game_state = GAME_PLAYING; // The current game state, this is used to determine what the game is doing at any given time +static enum GameState game_state = GAME_ROUND_END; // The current game state, this is used to determine what the game is doing at any given time static enum HandState hand_state = HAND_DRAW; static enum PlayState play_state = PLAY_PLAYING; @@ -1238,7 +1238,8 @@ static void game_playing_ui_text_update() void game_playing() { - if (hand_state == HAND_SELECT && hands == 0) { + if (hand_state == HAND_SELECT && hands == 0) + { game_state = GAME_LOSE; } @@ -1465,7 +1466,7 @@ void game_round_end() // Writing this kind a made me want to kms. If somewone wa memcpy(&se_mem[31][32 * y], &tile_map6, sizeof(tile_map6)); y = 4; - const unsigned short tile_map2[10] = {0x002A, 0x001F, 0x001F, 0x001F, 0x001F, 0x001F, 0x001F, 0x001F, 0x042A, se_mem[31][32 * y + 9]}; + const unsigned short tile_map2[10] = {0x046B, 0x001F, 0x001F, 0x001F, 0x001F, 0x001F, 0x001F, 0x001F, 0x006B, se_mem[31][32 * y + 9]}; memcpy(&se_mem[31][32 * y], &tile_map2, sizeof(tile_map2)); } else @@ -1591,8 +1592,6 @@ void game_round_end() // Writing this kind a made me want to kms. If somewone wa tte_printf("#{P:88, 72; cx:0xF000}Cash Out: $%d", hands + blind_get_reward(current_blind)); // Print the cash out amount } - - break; } default: diff --git a/source/main.c b/source/main.c index 4039857..eb6efde 100644 --- a/source/main.c +++ b/source/main.c @@ -126,7 +126,6 @@ void background_update() // This needs to be called before update() and draw() b void update() { - game_update(); }