Merge branch 'master' of https://github.com/huderlem/porymap into custom-images

This commit is contained in:
GriffinR
2023-12-17 16:18:16 -05:00
3 changed files with 83 additions and 80 deletions

View File

@@ -77,6 +77,7 @@ public:
QStringList trainerTypes;
QStringList globalScriptLabels;
QMap<QString, QMap<QString, int>> metatileLabelsMap;
QMap<QString, int> unusedMetatileLabels;
QMap<QString, int> metatileBehaviorMap;
QMap<int, QString> metatileBehaviorMapInverse;
QSet<uint32_t> warpBehaviorValues;
@@ -216,6 +217,10 @@ public:
QString getDefaultPrimaryTilesetLabel();
QString getDefaultSecondaryTilesetLabel();
void updateTilesetMetatileLabels(Tileset *tileset);
QString buildMetatileLabelsText(const QMap<QString, int> defines);
QString findMetatileLabelsTileset(QString label);
void setImportExportPath(QString filename);
void applyParsedLimits();