diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2024-01-06 18:12:53 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2024-01-06 18:12:53 +0100 |
| commit | 560dfa45b16d5da212174423d71c67f638366cce (patch) | |
| tree | fb103ec8abfce76017c37ebb163bd91a8fea1278 /tools/src | |
| parent | 06dc15859867c7f2db22ea6e289e28ff12b0b6c9 (diff) | |
Add more tilemap documentation
Diffstat (limited to 'tools/src')
| -rw-r--r-- | tools/src/asset_processor/assets/subtileset.cpp | 2 | ||||
| -rw-r--r-- | tools/src/asset_processor/main.cpp | 6 | ||||
| -rw-r--r-- | tools/src/gbagfx/lz.c | 2 | ||||
| -rw-r--r-- | tools/src/gbagfx/main.c | 2 |
4 files changed, 6 insertions, 6 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); diff --git a/tools/src/gbagfx/lz.c b/tools/src/gbagfx/lz.c index 97168917..6e8cf520 100644 --- a/tools/src/gbagfx/lz.c +++ b/tools/src/gbagfx/lz.c @@ -37,7 +37,7 @@ unsigned char* LZDecompress(unsigned char* src, int srcSize, int* uncompressedSi int blockPos = destPos - blockDistance; - // Some Ruby/Sapphire tilesets overflow. + // Some Ruby/Sapphire tileSets overflow. if (destPos + blockSize > destSize) { blockSize = destSize - destPos; fprintf(stderr, "Destination buffer overflow.\n"); diff --git a/tools/src/gbagfx/main.c b/tools/src/gbagfx/main.c index 575d91a1..1e557ce4 100644 --- a/tools/src/gbagfx/main.c +++ b/tools/src/gbagfx/main.c @@ -312,7 +312,7 @@ void HandleLZCompressCommand(char* inputPath, char* outputPath, int argc, char** } } - // The overflow option allows a quirk in some of Ruby/Sapphire's tilesets + // The overflow option allows a quirk in some of Ruby/Sapphire's tileSets // to be reproduced. It works by appending a number of zeros to the data // before compressing it and then amending the LZ header's size field to // reflect the expected size. This will cause an overflow when decompressing |
