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

Skip MUS_DAN02 for pokefirered

Browse source
This commit is contained in:
GriffinR 2020-03-11 02:35:24 -04:00
parent 3eca227d07
commit eb44201f5b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/project.cpp
View file

@ -403,20 +403,22 @@ QString Project::readMapLocation(QString map_name) {
} }
void Project::setNewMapHeader(Map* map, int mapIndex) { void Project::setNewMapHeader(Map* map, int mapIndex) {
map->song = "MUS_DAN02";
map->layoutId = QString("%1").arg(mapIndex); map->layoutId = QString("%1").arg(mapIndex);
map->location = "MAPSEC_LITTLEROOT_TOWN"; map->location = "MAPSEC_LITTLEROOT_TOWN";
map->requiresFlash = "FALSE"; map->requiresFlash = "FALSE";
map->weather = "WEATHER_SUNNY"; map->weather = "WEATHER_SUNNY";
map->type = "MAP_TYPE_TOWN"; map->type = "MAP_TYPE_TOWN";
if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokeruby) { if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokeruby) {
map->song = "MUS_DAN02";
map->show_location = "TRUE"; map->show_location = "TRUE";
} else if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokeemerald) { } else if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokeemerald) {
map->song = "MUS_DAN02";
map->allowBiking = "1"; map->allowBiking = "1";
map->allowEscapeRope = "0"; map->allowEscapeRope = "0";
map->allowRunning = "1"; map->allowRunning = "1";
map->show_location = "1"; map->show_location = "1";
} else if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) { } else if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) {
map->song = "MUS_MASARA";
map->allowBiking = "1"; map->allowBiking = "1";
map->allowEscapeRope = "0"; map->allowEscapeRope = "0";
map->allowRunning = "1"; map->allowRunning = "1";

6
src/ui/newmappopup.cpp
View file

@ -135,7 +135,11 @@ void NewMapPopup::on_pushButton_NewMap_Accept_clicked() {
newMap->name = newMapName; newMap->name = newMapName;
newMap->type = this->ui->comboBox_NewMap_Type->currentText(); newMap->type = this->ui->comboBox_NewMap_Type->currentText();
newMap->location = this->ui->comboBox_NewMap_Location->currentText(); newMap->location = this->ui->comboBox_NewMap_Location->currentText();
newMap->song = "MUS_DAN02"; if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) {
newMap->song = "MUS_MASARA";
} else {
newMap->song = "MUS_DAN02";
}
newMap->requiresFlash = "0"; newMap->requiresFlash = "0";
newMap->weather = "WEATHER_SUNNY"; newMap->weather = "WEATHER_SUNNY";
newMap->show_location = "1"; newMap->show_location = "1";