Rename metaTiles

Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.

3 files changed, 11 insertions, 11 deletions

diff --git a/tools/src/asset_processor/assets/tileset.cpp b/tools/src/asset_processor/assets/subtileset.cpp
index 84321b80..02b52b2a 100644
--- a/tools/src/asset_processor/assets/tileset.cpp
+++ b/tools/src/asset_processor/assets/subtileset.cpp
@@ -1,7 +1,7 @@
-#include "tileset.h"
+#include "subtileset.h"
 #include "util.h"
 
-std::filesystem::path TilesetAsset::generateAssetPath() {
+std::filesystem::path SubTileSetAsset::generateAssetPath() {
     std::filesystem::path pngPath = path;
     if (pngPath.extension() == ".lz") {
         pngPath.replace_extension("");
@@ -10,7 +10,7 @@ std::filesystem::path TilesetAsset::generateAssetPath() {
     return pngPath;
 }
 
-void TilesetAsset::convertToHumanReadable(const std::vector<char>& baserom) {
+void SubTileSetAsset::convertToHumanReadable(const std::vector<char>& baserom) {
     (void)baserom;
 
     std::filesystem::path toolsPath = "tools";
@@ -37,7 +37,7 @@ void TilesetAsset::convertToHumanReadable(const std::vector<char>& baserom) {
     check_call(cmd);
 }
 
-void TilesetAsset::buildToBinary() {
+void SubTileSetAsset::buildToBinary() {
     std::filesystem::path toolsPath = "tools";
     std::vector<std::string> cmd;
 
@@ -61,6 +61,6 @@ void TilesetAsset::buildToBinary() {
     }
 }
 
-bool TilesetAsset::isCompressed() {
+bool SubTileSetAsset::isCompressed() {
     return path.extension() == ".lz";
 }
\ No newline at end of file
diff --git a/tools/src/asset_processor/assets/tileset.h b/tools/src/asset_processor/assets/subtileset.h
index f2d6fb9a..0e80e9bd 100644
--- a/tools/src/asset_processor/assets/tileset.h
+++ b/tools/src/asset_processor/assets/subtileset.h
@@ -1,6 +1,6 @@
 #include "asset.h"
 
-class TilesetAsset : public BaseAsset {
+class SubTileSetAsset : public BaseAsset {
   public:
     using BaseAsset::BaseAsset;
     virtual void convertToHumanReadable(const std::vector<char>& baserom);
diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp
index eddce2b0..4460f6fc 100644
--- a/tools/src/asset_processor/main.cpp
+++ b/tools/src/asset_processor/main.cpp
@@ -8,7 +8,7 @@
 #include "assets/midi.h"
 #include "assets/palette.h"
 #include "assets/spriteframe.h"
-#include "assets/tileset.h"
+#include "assets/subtileset.h"
 #include "offsets.h"
 #include <filesystem>
 #include <fstream>
@@ -264,8 +264,8 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa
     }
 
     std::unique_ptr<BaseAsset> assetHandler;
-    if (type == "tileset") {
-        assetHandler = std::make_unique<TilesetAsset>(path, start, size, asset);
+    if (type == "subtileset") {
+        assetHandler = std::make_unique<SubTileSetAsset>(path, start, size, asset);
     } else if (type == "animation") {
         assetHandler = std::make_unique<AnimationAsset>(path, start, size, asset);
     } else if (type == "sprite_frame") {
@@ -280,8 +280,8 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa
         assetHandler = std::make_unique<GfxAsset>(path, start, size, asset);
     } else if (type == "palette") {
         assetHandler = std::make_unique<PaletteAsset>(path, start, size, asset);
-    } else if (type == "metatilemap" ||
-               type == "metatileset_types" || type == "metatileset" ||
+    } else if (type == "tilemap" ||
+               type == "tileset_types" || type == "tileset" ||
                type == "map_mapping1" || type == "map_mapping2" ||
                type == "map_collision") {
         assetHandler = std::make_unique<MapAsset>(path, start, size, asset);