atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Disable RME(temporarily), secret bases, and weather triggers for pokefirered

Browse source
This commit is contained in:
GriffinR 2020-03-12 12:30:37 -04:00
parent a8b381a0b5
commit a5c47b6333
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/ui/neweventtoolbutton.h
View file

@ -10,6 +10,14 @@ class NewEventToolButton : public QToolButton
public: public:
explicit NewEventToolButton(QWidget *parent = nullptr); explicit NewEventToolButton(QWidget *parent = nullptr);
QString getSelectedEventType(); QString getSelectedEventType();
QAction *newObjectAction;
QAction *newWarpAction;
QAction *newHealLocationAction;
QAction *newTriggerAction;
QAction *newWeatherTriggerAction;
QAction *newSignAction;
QAction *newHiddenItemAction;
QAction *newSecretBaseAction;
public slots: public slots:
void newObject(); void newObject();
void newWarp(); void newWarp();
@ -23,14 +31,6 @@ signals:
void newEventAdded(QString); void newEventAdded(QString);
private: private:
QString selectedEventType; QString selectedEventType;
QAction *newObjectAction;
QAction *newWarpAction;
QAction *newHealLocationAction;
QAction *newTriggerAction;
QAction *newWeatherTriggerAction;
QAction *newSignAction;
QAction *newHiddenItemAction;
QAction *newSecretBaseAction;
void init(); void init();
}; };

11
src/mainwindow.cpp
View file

@ -50,7 +50,6 @@ MainWindow::MainWindow(QWidget *parent) :
// Re-initialize everything to a blank slate if opening the recent project failed. // Re-initialize everything to a blank slate if opening the recent project failed.
this->initWindow(); this->initWindow();
} }
on_toolButton_Paint_clicked(); on_toolButton_Paint_clicked();
} }
@ -185,6 +184,11 @@ void MainWindow::setProjectSpecificUIVisibility()
ui->label_AllowBiking->setVisible(true); ui->label_AllowBiking->setVisible(true);
ui->label_AllowEscapeRope->setVisible(true); ui->label_AllowEscapeRope->setVisible(true);
ui->label_FloorNumber->setVisible(true); ui->label_FloorNumber->setVisible(true);
ui->newEventToolButton->newWeatherTriggerAction->setVisible(false);
ui->newEventToolButton->newSecretBaseAction->setVisible(false);
// TODO: pokefirered is not set up for the Region Map Editor and vice versa.
// porymap will crash on attempt. Remove below once resolved
ui->actionRegion_Map_Editor->setVisible(false);
break; break;
} }
} }
@ -639,7 +643,6 @@ bool MainWindow::loadDataStructures() {
&& project->readMapTypes() && project->readMapTypes()
&& project->readMapBattleScenes() && project->readMapBattleScenes()
&& project->readWeatherNames() && project->readWeatherNames()
&& project->readCoordEventWeatherNames()
&& project->readBgEventFacingDirections() && project->readBgEventFacingDirections()
&& project->readMetatileBehaviors() && project->readMetatileBehaviors()
&& project->readTilesetProperties() && project->readTilesetProperties()
@ -648,7 +651,9 @@ bool MainWindow::loadDataStructures() {
&& project->readSpeciesIconPaths() && project->readSpeciesIconPaths()
&& project->readWildMonData(); && project->readWildMonData();
if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokeemerald || projectConfig.getBaseGameVersion() == BaseGameVersion::pokeruby) if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokeemerald || projectConfig.getBaseGameVersion() == BaseGameVersion::pokeruby)
success = success && project->readSecretBaseIds(); success = success
&& project->readSecretBaseIds()
&& project->readCoordEventWeatherNames();
if (!success) { if (!success) {
return false; return false;
} }

2
src/project.cpp
View file

@ -1961,8 +1961,6 @@ bool Project::readWeatherNames() {
} }
bool Project::readCoordEventWeatherNames() { bool Project::readCoordEventWeatherNames() {
if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered)
return true;
coordEventWeatherNames->clear(); coordEventWeatherNames->clear();
QStringList prefixes = (QStringList() << "COORD_EVENT_WEATHER_"); QStringList prefixes = (QStringList() << "COORD_EVENT_WEATHER_");
QString filename = "include/constants/weather.h"; QString filename = "include/constants/weather.h";