diff --git a/assets/Stone.png b/assets/decorations/Stone.png similarity index 100% rename from assets/Stone.png rename to assets/decorations/Stone.png diff --git a/assets/stone_grass.png b/assets/decorations/stone_grass.png similarity index 100% rename from assets/stone_grass.png rename to assets/decorations/stone_grass.png diff --git a/assets/strawberry.png b/assets/decorations/strawberry.png similarity index 100% rename from assets/strawberry.png rename to assets/decorations/strawberry.png diff --git a/assets/tile_tall_grass.png b/assets/decorations/tall_grass.png similarity index 100% rename from assets/tile_tall_grass.png rename to assets/decorations/tall_grass.png diff --git a/assets/std_person.png b/assets/std_person.png deleted file mode 100644 index 8a6ae9b..0000000 Binary files a/assets/std_person.png and /dev/null differ diff --git a/assets/std_tile.png b/assets/std_tile.png deleted file mode 100644 index c043eaf..0000000 Binary files a/assets/std_tile.png and /dev/null differ diff --git a/assets/strawberry_paintnet.png b/assets/strawberry_paintnet.png deleted file mode 100644 index aa2b9a2..0000000 Binary files a/assets/strawberry_paintnet.png and /dev/null differ diff --git a/assets/tile_dirt.png b/assets/tile_dirt.png deleted file mode 100644 index 6146edf..0000000 Binary files a/assets/tile_dirt.png and /dev/null differ diff --git a/assets/tile_empty.png b/assets/tile_empty.png deleted file mode 100644 index ab90dcf..0000000 Binary files a/assets/tile_empty.png and /dev/null differ diff --git a/assets/tile_error.png b/assets/tile_error.png deleted file mode 100644 index d6b78e7..0000000 Binary files a/assets/tile_error.png and /dev/null differ diff --git a/assets/tile_grass_1.png b/assets/tile_grass_1.png deleted file mode 100644 index 0163aa3..0000000 Binary files a/assets/tile_grass_1.png and /dev/null differ diff --git a/assets/tile_grass_2.png b/assets/tile_grass_2.png deleted file mode 100644 index 3bc4a21..0000000 Binary files a/assets/tile_grass_2.png and /dev/null differ diff --git a/assets/tile_grass_ground_1.png b/assets/tile_grass_ground_1.png deleted file mode 100644 index 843f1ba..0000000 Binary files a/assets/tile_grass_ground_1.png and /dev/null differ diff --git a/assets/tile_stone_ground.png b/assets/tile_stone_ground.png deleted file mode 100644 index 8042331..0000000 Binary files a/assets/tile_stone_ground.png and /dev/null differ diff --git a/assets/tile_water.png b/assets/tile_water.png deleted file mode 100644 index 2cd5535..0000000 Binary files a/assets/tile_water.png and /dev/null differ diff --git a/assets/tile_water_2.png b/assets/tile_water_2.png deleted file mode 100644 index d214a5b..0000000 Binary files a/assets/tile_water_2.png and /dev/null differ diff --git a/assets/tiles/empty.png b/assets/tiles/empty.png new file mode 100644 index 0000000..21b7d76 Binary files /dev/null and b/assets/tiles/empty.png differ diff --git a/assets/tiles/error.png b/assets/tiles/error.png new file mode 100644 index 0000000..0a7b5ad Binary files /dev/null and b/assets/tiles/error.png differ diff --git a/assets/Mikemon_Tile_Grass_1.png b/assets/tiles/grass_1.png similarity index 100% rename from assets/Mikemon_Tile_Grass_1.png rename to assets/tiles/grass_1.png diff --git a/assets/Mikemon_Tile_Grass_2.png b/assets/tiles/grass_2.png similarity index 100% rename from assets/Mikemon_Tile_Grass_2.png rename to assets/tiles/grass_2.png diff --git a/assets/Mikemon_Tile_Grass_3.png b/assets/tiles/grass_3.png similarity index 100% rename from assets/Mikemon_Tile_Grass_3.png rename to assets/tiles/grass_3.png diff --git a/assets/Mikemon_Tile_GrassToGround_1.png b/assets/tiles/grass_ground_1.png similarity index 100% rename from assets/Mikemon_Tile_GrassToGround_1.png rename to assets/tiles/grass_ground_1.png diff --git a/assets/Mikemon_Tile_Ground_1.png b/assets/tiles/ground_1.png similarity index 100% rename from assets/Mikemon_Tile_Ground_1.png rename to assets/tiles/ground_1.png diff --git a/assets/Mikemon_Tile_Water_1.png b/assets/tiles/water_1.png similarity index 100% rename from assets/Mikemon_Tile_Water_1.png rename to assets/tiles/water_1.png diff --git a/assets/tiles/water_2.png b/assets/tiles/water_2.png new file mode 100644 index 0000000..56edc80 Binary files /dev/null and b/assets/tiles/water_2.png differ diff --git a/bin/font_creator.exe b/bin/font_creator.exe deleted file mode 100644 index 68442af..0000000 Binary files a/bin/font_creator.exe and /dev/null differ diff --git a/bin/font_creator.pdb b/bin/font_creator.pdb deleted file mode 100644 index 8c7f24f..0000000 Binary files a/bin/font_creator.pdb and /dev/null differ diff --git a/bin/pokemon.exe b/bin/pokemon.exe deleted file mode 100644 index 5e71e2b..0000000 Binary files a/bin/pokemon.exe and /dev/null differ diff --git a/bin/pokemon.pdb b/bin/pokemon.pdb deleted file mode 100644 index 8198d10..0000000 Binary files a/bin/pokemon.pdb and /dev/null differ diff --git a/src/main.cpp b/src/main.cpp index ea9d06b..198b387 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -681,20 +681,14 @@ int main(int argc, char **argv) { } } - const char *player_texture_array[] = { "../assets/strawberry.png" }; + const char *player_texture_array[] = { "../assets/decorations/strawberry.png" }; SDL_GPUTexture *player_texture = create_shader_texture_array(SDL_arraysize(player_texture_array), player_texture_array, "player_textures"); if (!player_texture) { log_error("Failed to create shader texture. Exiting."); return 1; } - SDL_GPUTexture *quad_texture = create_shader_texture("../assets/tile_grass_2.png"); - if (!player_texture) { - log_error("Failed to create shader texture. Exiting."); - return 1; - } - - const char *tile_texture_array[] = { "../assets/tile_empty.png", "../assets/tile_grass_2.png" , "../assets/tile_dirt.png" , "../assets/tile_water.png", "../assets/tile_error.png" }; + const char *tile_texture_array[] = { "../assets/tiles/empty.png", "../assets/tiles/grass_1.png" , "../assets/tiles/ground_1.png" , "../assets/tiles/water_1.png", "../assets/tiles/error.png" }; SDL_GPUTexture *tile_texture = create_shader_texture_array(SDL_arraysize(tile_texture_array), tile_texture_array, "tile_textures"); if (!player_texture) { log_error("Failed to create shader texture array. Exiting.");