summaryrefslogtreecommitdiff
path: root/tools/src/asset_processor
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 18:12:53 +0100
committeroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 18:12:53 +0100
commit560dfa45b16d5da212174423d71c67f638366cce (patch)
treefb103ec8abfce76017c37ebb163bd91a8fea1278 /tools/src/asset_processor
parent06dc15859867c7f2db22ea6e289e28ff12b0b6c9 (diff)
Add more tilemap documentation
Diffstat (limited to 'tools/src/asset_processor')
-rw-r--r--tools/src/asset_processor/assets/subtileset.cpp2
-rw-r--r--tools/src/asset_processor/main.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/src/asset_processor/assets/subtileset.cpp b/tools/src/asset_processor/assets/subtileset.cpp
index 02b52b2a..c8e2a8c2 100644
--- a/tools/src/asset_processor/assets/subtileset.cpp
+++ b/tools/src/asset_processor/assets/subtileset.cpp
@@ -31,7 +31,7 @@ void SubTileSetAsset::convertToHumanReadable(const std::vector<char>& baserom) {
cmd.push_back(toolsPath / "bin" / "gbagfx");
cmd.push_back(decompressedPath);
cmd.push_back(assetPath);
- // This creates a better looking tilemap but in some cases not all tiles are used, so it adds additional data when converting back to binary.
+ // This creates a better looking tileMap but in some cases not all tiles are used, so it adds additional data when converting back to binary.
//cmd.push_back("-mwidth");
//cmd.push_back("32");
check_call(cmd);
diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp
index 4460f6fc..40b10bd3 100644
--- a/tools/src/asset_processor/main.cpp
+++ b/tools/src/asset_processor/main.cpp
@@ -264,7 +264,7 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa
}
std::unique_ptr<BaseAsset> assetHandler;
- if (type == "subtileset") {
+ 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);
@@ -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 == "tilemap" ||
- type == "tileset_types" || type == "tileset" ||
+ } 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);