Clean up custom Block layouts

include/config.h

@@ -286,10 +286,10 @@ public:
     int getNumTilesInMetatile();
     void setDefaultMetatileId(uint16_t metatileId);
     uint16_t getDefaultMetatileId();
-    void setDefaultElevation(int elevation);
-    int getDefaultElevation();
-    void setDefaultCollision(int collision);
-    int getDefaultCollision();
+    void setDefaultElevation(uint16_t elevation);
+    uint16_t getDefaultElevation();
+    void setDefaultCollision(uint16_t collision);
+    uint16_t getDefaultCollision();
     void setNewMapBorderMetatileIds(QList<uint16_t> metatileIds);
     QList<uint16_t> getNewMapBorderMetatileIds();
     QString getDefaultPrimaryTileset();

include/core/bitpacker.h

@@ -2,7 +2,6 @@
 #define BITPACKER_H
 
 #include <QList>
-//#include <cstdint>
 
 class BitPacker
 {

include/core/metatile.h

@@ -11,7 +11,6 @@
 
 class Project;
 
-// TODO: Reevaluate enums
 enum {
     METATILE_LAYER_MIDDLE_TOP,
     METATILE_LAYER_BOTTOM_MIDDLE,
@@ -72,6 +71,7 @@ public:
     static int getIndexInTileset(int);
     static QPoint coordFromPixmapCoord(const QPointF &pixelCoord);
     static uint32_t getDefaultAttributesMask(BaseGameVersion version, Metatile::Attr attr);
+    static uint32_t getMaxAttributesMask();
     static int getDefaultAttributesSize(BaseGameVersion version);
     static void setLayout(Project*);
     static QString getMetatileIdString(uint16_t metatileId) {

include/mainwindow.h

@@ -372,7 +372,7 @@ private:
     void initMapSortOrder();
     void initShortcuts();
     void initExtraShortcuts();
-    bool setProjectSpecificUI();
+    void setProjectSpecificUI();
     void setWildEncountersUIEnabled(bool enabled);
     void loadUserSettings();
     void applyMapListFilter(QString filterText);

include/project.h

@@ -216,6 +216,7 @@ public:
     QString getDefaultSecondaryTilesetLabel();
 
     void setImportExportPath(QString filename);
+    void applyParsedLimits();
 
     static int getNumTilesPrimary();
     static int getNumTilesTotal();

include/ui/projectsettingseditor.h

@@ -3,6 +3,7 @@
 
 #include <QMainWindow>
 #include "project.h"
+#include "ui_projectsettingseditor.h"
 
 class NoScrollComboBox;
 class QAbstractButton;
@@ -55,6 +56,7 @@ private:
     void chooseFile(QLineEdit * filepathEdit, const QString &description, const QString &extensions);
     QString stripProjectDir(QString s);
     void disableParsedSetting(QWidget * widget, const QString &name, const QString &filepath);
+    void updateMaskOverlapWarning(QLabel * warning, QList<UIntSpinBox*> masks);
 
 private slots:
     void dialogButtonClicked(QAbstractButton *button);
@@ -63,6 +65,8 @@ private slots:
     void updatePokemonIconPath(const QString &species);
     void markEdited();
     void on_mainTabs_tabBarClicked(int index);
+    void updateBlockMaskOverlapWarning();
+    void updateAttributeMaskOverlapWarning();
 };
 
 #endif // PROJECTSETTINGSEDITOR_H