Read/write MAPSEC values using the region map json

include/config.h

@@ -213,7 +213,6 @@ enum ProjectIdentifier {
     define_map_empty,
     define_map_section_prefix,
     define_map_section_empty,
-    define_map_section_count,
     define_species_prefix,
     regex_behaviors,
     regex_obj_event_gfx,
@@ -269,7 +268,6 @@ enum ProjectFilePath {
     constants_obj_event_movement,
     constants_obj_events,
     constants_event_bg,
-    constants_region_map_sections,
     constants_metatile_labels,
     constants_metatile_behaviors,
     constants_species,

include/core/regionmap.h

@@ -57,8 +57,8 @@ public:
     bool loadLayout(poryjson::Json);
     bool loadEntries();
 
-    void setEntries(tsl::ordered_map<QString, MapSectionEntry> *entries) { this->region_map_entries = entries; }
-    void setEntries(tsl::ordered_map<QString, MapSectionEntry> entries) { *(this->region_map_entries) = entries; }
+    void setEntries(QMap<QString, MapSectionEntry> *entries) { this->region_map_entries = entries; }
+    void setEntries(const QMap<QString, MapSectionEntry> &entries) { *(this->region_map_entries) = entries; }
     void clearEntries() { this->region_map_entries->clear(); }
     MapSectionEntry getEntry(QString section);
     void setEntry(QString section, MapSectionEntry entry);
@@ -114,8 +114,6 @@ public:
     void setLayer(QString layer) { this->current_layer = layer; }
     QString getLayer() { return this->current_layer; }
 
-    QString fixCase(QString);
-
     int padLeft() { return this->offset_left; }
     int padTop() { return this->offset_top; }
     int padRight() { return this->tilemap_width - this->layout_width - this->offset_left; }
@@ -149,14 +147,12 @@ public:
 
     const QString section_prefix;
     const QString default_map_section;
-    const QString count_map_section;
 
 signals:
     void mapNeedsDisplaying();
 
 private:
-    // TODO: defaults needed?
-    tsl::ordered_map<QString, MapSectionEntry> *region_map_entries = nullptr;
+    QMap<QString, MapSectionEntry> *region_map_entries = nullptr;
 
     QString alias = "";
 

include/core/regionmapeditcommands.h

@@ -153,7 +153,7 @@ private:
 /// ClearEntries
 class ClearEntries : public QUndoCommand {
 public:
-    ClearEntries(RegionMap *map, tsl::ordered_map<QString, MapSectionEntry>, QUndoCommand *parent = nullptr);
+    ClearEntries(RegionMap *map, QMap<QString, MapSectionEntry>, QUndoCommand *parent = nullptr);
 
     void undo() override;
     void redo() override;
@@ -163,7 +163,7 @@ public:
 
 private:
     RegionMap *map;
-    tsl::ordered_map<QString, MapSectionEntry> entries;
+    QMap<QString, MapSectionEntry> entries;
 };
 
 #endif // REGIONMAPEDITCOMMANDS_H

include/core/wildmoninfo.h

@@ -8,7 +8,7 @@
 struct WildPokemon {
     int minLevel = 5;
     int maxLevel = 5;
-    QString species = "SPECIES_NONE";
+    QString species = "SPECIES_NONE"; // TODO: Use define_species_prefix
 };
 
 struct WildMonInfo {

include/project.h

@@ -49,9 +49,6 @@ public:
     QMap<QString, QString> layoutIdsToNames;
     QMap<QString, Layout*> mapLayouts;
     QMap<QString, Layout*> mapLayoutsMaster;
-    QMap<QString, QString> mapSecToMapHoverName;
-    QMap<QString, int> mapSectionNameToValue;
-    QMap<int, QString> mapSectionValueToName;
     QMap<QString, EventGraphics*> eventGraphicsMap;
     QMap<QString, int> gfxDefines;
     QString defaultSong;
@@ -68,6 +65,8 @@ public:
     QStringList bgEventFacingDirections;
     QStringList trainerTypes;
     QStringList globalScriptLabels;
+    QStringList mapSectionIdNames;
+    QMap<QString, MapSectionEntry> regionMapEntries;
     QMap<QString, QMap<QString, uint16_t>> metatileLabelsMap;
     QMap<QString, uint16_t> unusedMetatileLabels;
     QMap<QString, uint32_t> metatileBehaviorMap;
@@ -82,9 +81,7 @@ public:
     int pokemonMaxLevel;
     int maxEncounterRate;
     bool wildEncountersLoaded;
-
-    // For files that are read and could contain extra text
-    QMap<QString, QString> extraFileText;
+    bool saveEmptyMapsec;
 
     void set_root(QString);
 
@@ -142,7 +139,7 @@ public:
     bool readSpeciesIconPaths();
     QMap<QString, QString> speciesToIconPath;
 
-    int appendMapsec(QString name);
+    void addNewMapsec(QString name);
 
     bool hasUnsavedChanges();
     bool hasUnsavedDataChanges = false;
@@ -172,7 +169,7 @@ public:
     void saveConfig();
     void saveMapLayouts();
     void saveMapGroups();
-    void saveMapSections();
+    void saveRegionMapSections();
     void saveWildMonData();
     void saveMapConstantsHeader();
     void saveHealLocations(Map*);

include/ui/maplistmodels.h

@@ -132,7 +132,7 @@ public:
 public:
     void setMap(QString mapName) { this->openMap = mapName; }
 
-    QStandardItem *createAreaItem(QString areaName, int areaIndex);
+    QStandardItem *createAreaItem(QString areaName);
     QStandardItem *createMapItem(QString mapName, int areaIndex, int mapIndex);
 
     QStandardItem *insertAreaItem(QString areaName);

include/ui/regionmapeditor.h

@@ -57,7 +57,6 @@ private:
     tsl::ordered_map<QString, RegionMap *> region_maps;
 
     QString configFilepath;
-    QString mapSectionFilepath;
 
     poryjson::Json rmConfigJson;
 
@@ -96,7 +95,7 @@ private:
     void saveConfig();
     bool loadRegionMapEntries();
     bool saveRegionMapEntries();
-    tsl::ordered_map<QString, MapSectionEntry> region_map_entries;
+    QMap<QString, MapSectionEntry> region_map_entries;
 
     bool buildConfigDialog();
     poryjson::Json configRegionMapDialog();