Skip to content

Commit

Permalink
optimized text pngs
Browse files Browse the repository at this point in the history
  • Loading branch information
savaughn committed Nov 20, 2023
1 parent 284c6d2 commit 87f859d
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 8 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified assets/images/evolve.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/logo-text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/quit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/trade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/screens/EvolveScreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void draw_evolve(PokemonSave *pkmn_save, char *save_path, struct trainer_info *t
BeginDrawing();
ClearBackground(RED);
draw_background_grid();
DrawTextureEx(*evolve_texture, (Vector2){50, 10}, 0, 0.4, WHITE);
DrawTextureEx(*evolve_texture, (Vector2){50, 10}, 0, 0.8, WHITE);

const int NONE = -1;
static int selected_index = NONE;
Expand Down
10 changes: 5 additions & 5 deletions src/screens/MainMenuScreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ void draw_main_menu(struct save_file_data *save_file_data, GameScreen *current_s
} rand_console[CONSOLE_COUNT] = {CONSOLE_NONE};

// Draw image pkrom_trader_logo header
DrawTextureEx(textures[T_LOGO], (Vector2){50, 50}, 0, 0.62, WHITE);
DrawTextureEx(textures[T_LOGO], (Vector2){50, 50}, 0, 1, WHITE);

// On Hover/Click Trade button
if (draw_menu_button(text_position_start.x, text_position_start.y, "Trade", text_size))
Expand All @@ -196,7 +196,7 @@ void draw_main_menu(struct save_file_data *save_file_data, GameScreen *current_s
// Move left/right
slide_animate_details_pane(BUTTON_TRADE);
// Trade texture logo
DrawTextureEx(textures[T_TRADE], (Vector2){details_rec.x + anim_from_right[BUTTON_TRADE], details_rec.y + 25}, 0, 0.5, WHITE);
DrawTextureEx(textures[T_TRADE], (Vector2){details_rec.x + anim_from_right[BUTTON_TRADE], details_rec.y + 25}, 0, 1, WHITE);
// Left console texture
DrawTextureEx(textures[rand_console[CONSOLE_LEFT]], (Vector2){details_rec.x + anim_from_right[BUTTON_TRADE] - 40, details_rec.y + 150}, 0, 3, WHITE);
// Arrow animation
Expand Down Expand Up @@ -235,7 +235,7 @@ void draw_main_menu(struct save_file_data *save_file_data, GameScreen *current_s
// Move left/right
slide_animate_details_pane(BUTTON_EVOLVE);
// Evolve texture logo
DrawTextureEx(textures[T_EVOLVE], (Vector2){details_rec.x + anim_from_right[BUTTON_EVOLVE], details_rec.y + 25}, 0, 0.5, WHITE);
DrawTextureEx(textures[T_EVOLVE], (Vector2){details_rec.x + anim_from_right[BUTTON_EVOLVE], details_rec.y + 25}, 0, 1, WHITE);
// Pokeball texture
DrawTextureEx(textures[rand_pokeball_index], (Vector2){details_rec.x + anim_from_right[BUTTON_EVOLVE] + 15, details_rec.y + 80}, 0, 0.25, WHITE);
// Arrow animation
Expand Down Expand Up @@ -263,7 +263,7 @@ void draw_main_menu(struct save_file_data *save_file_data, GameScreen *current_s
// Move left/right
slide_animate_details_pane(BUTTON_SETTINGS);
// Draw settings texture logo
DrawTextureEx(textures[T_SETTINGS], (Vector2){details_rec.x + anim_from_right[BUTTON_SETTINGS] - 25, details_rec.y + 100}, 0, 0.5, WHITE);
DrawTextureEx(textures[T_SETTINGS], (Vector2){details_rec.x + anim_from_right[BUTTON_SETTINGS] - 25, details_rec.y + 100}, 0, 1, WHITE);
// Bottom details text
DrawText("Change trade and evolution settings", details_text.x + anim_from_right[BUTTON_SETTINGS] + 40, details_text.y, 20, BLACK);
}
Expand All @@ -285,7 +285,7 @@ void draw_main_menu(struct save_file_data *save_file_data, GameScreen *current_s
// Move left/right
slide_animate_details_pane(BUTTON_QUIT);
// Draw quit texture logo
DrawTextureEx(textures[T_QUIT], (Vector2){details_rec.x + anim_from_right[BUTTON_QUIT], details_rec.y + 100}, 0, 0.5, WHITE);
DrawTextureEx(textures[T_QUIT], (Vector2){details_rec.x + anim_from_right[BUTTON_QUIT], details_rec.y + 100}, 0, 1, WHITE);
// Bottom details text
DrawText("Quit Pokerom Trader", details_text.x + anim_from_right[BUTTON_QUIT] + 80, details_text.y, 20, BLACK);
}
Expand Down
2 changes: 1 addition & 1 deletion src/screens/SettingsScreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void draw_settings(struct save_file_data *save_file_data, GameScreen *current_sc
DrawCircle(SCREEN_WIDTH / 2, SCREEN_HEIGHT * 3.5, 1350, BLACK);
DrawCircle(SCREEN_WIDTH / 2, SCREEN_HEIGHT * 3.5, 1320, WHITE);

DrawTextureEx(*settings_texture, (Vector2){50, 50}, 0, 0.4, WHITE);
DrawTextureEx(*settings_texture, (Vector2){50, 50}, 0, 0.8, WHITE);
// Toggle for random ivs on trade boolean
DrawText("Disable random DVs on trade", 50, start_y - 25, 20, settings_text_color);
// Checkbox for random ivs on trade
Expand Down
2 changes: 1 addition & 1 deletion src/screens/TradeScreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void draw_trade(PokemonSave *save_player1, PokemonSave *save_player2, char *play
ClearBackground(RED);
draw_background_grid();

DrawTextureEx(*trade_texture, (Vector2){50, 10}, 0, 0.4, WHITE);
DrawTextureEx(*trade_texture, (Vector2){50, 10}, 0, 0.8, WHITE);

bool is_valid_trade[2] = {true, true};
draw_trainer_info(trainer1, 25, (SCREEN_HEIGHT - 100) / 2 - 75, trainerSelection, *is_same_generation, is_valid_trade);
Expand Down

0 comments on commit 87f859d

Please sign in to comment.