Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-26 09:56:32 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Save all tilesets

Browse Source 
because the loader wants to have them all
This commit is contained in:
Karathan
2019-03-22 01:56:00 +01:00
committed by huderlem
parent 1b62c15ba4
commit af96054baf
3 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/tileset.cpp
View File

@@ -111,8 +111,6 @@ bool Tileset::appendToHeaders(QString headerFile, QString friendlyName){
}
bool Tileset::appendToGraphics(QString graphicsFile, QString friendlyName, bool primary) {
int startPaletteId = primary ? 0 : Project::getNumPalettesPrimary();
int endPaletteId = primary ? Project::getNumPalettesPrimary() : Project::getNumPalettesTotal();
QString primaryString = primary ? "primary" : "secondary";
QFile file(graphicsFile);
if (!file.open(QIODevice::WriteOnly | QIODevice::Append)) {
@@ -121,7 +119,7 @@ bool Tileset::appendToGraphics(QString graphicsFile, QString friendlyName, bool
}
QString dataString = "\r\n\t.align 2\r\n";
dataString.append(QString("gTilesetPalettes_%1::\r\n").arg(friendlyName));
for(int i = startPaletteId; i < endPaletteId; ++i) {
for(int i = 0; i < Project::getNumPalettesTotal(); ++i) {
QString paletteString;
paletteString.sprintf("%02d.gbapal", i);
dataString.append(QString("\t.incbin \"data/tilesets/%1/%2/palettes/%3\"\r\n").arg(primaryString, friendlyName.toLower(), paletteString));

4
src/project.cpp
View File

@@ -721,9 +721,7 @@ void Project::saveTilesetTilesImage(Tileset *tileset) {
}
void Project::saveTilesetPalettes(Tileset *tileset, bool primary) {
int startPaletteId = primary ? 0 : Project::getNumPalettesPrimary();
int endPaletteId = primary ? Project::getNumPalettesPrimary() : Project::getNumPalettesTotal();
for (int i = startPaletteId; i < endPaletteId; i++) {
for (int i = 0; i < Project::getNumPalettesTotal(); i++) {
QString filepath = tileset->palettePaths.at(i);
QString content = "JASC-PAL\r\n";
content += "0100\r\n";