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

Merge pull request #2 from huderlem/filepaths

Browse source 
Fix songs and map obj gfx
This commit is contained in:
yenatch 2018-02-12 01:10:27 -05:00 committed by GitHub
commit 0452156372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
pretmap.pro.user

85
project.cpp
View file

@ -577,33 +577,31 @@ QStringList Project::getBattleScenes() {
QStringList Project::getSongNames() { QStringList Project::getSongNames() {
QStringList names; QStringList names;
QString text = readTextFile(root + "/constants/songs.inc"); QString text = readTextFile(root + "/include/constants/songs.h");
if (!text.isNull()) { if (!text.isNull()) {
QList<QStringList> *commands = parse(text); QStringList songDefinePrefixes;
for (int i = 0; i < commands->length(); i++) { songDefinePrefixes << "SE_" << "BGM_";
QStringList params = commands->value(i); QMap<QString, int> songDefines = readCDefines(text, songDefinePrefixes);
QString macro = params.value(0); names = songDefines.keys();
if (macro == ".equiv") {
names.append(params.value(1));
}
}
} }
return names; return names;
} }
QString Project::getSongName(int value) { QString Project::getSongName(int songNumber) {
QStringList names; QStringList names;
QString text = readTextFile(root + "/constants/songs.inc"); QString text = readTextFile(root + "/include/constants/songs.h");
if (!text.isNull()) { if (!text.isNull()) {
QList<QStringList> *commands = parse(text); QStringList songDefinePrefixes;
for (int i = 0; i < commands->length(); i++) { songDefinePrefixes << "SE_" << "BGM_";
QStringList params = commands->value(i); QMap<QString, int> songDefines = readCDefines(text, songDefinePrefixes);
QString macro = params.value(0);
if (macro == ".equiv") { // Loop through song defines, and fine the one with the matching song number.
if (value == ((QString)(params.value(2))).toInt(nullptr, 0)) { QMap<QString, int>::iterator iter = songDefines.begin();
return params.value(1); while (iter != songDefines.end()) {
} if (iter.value() == songNumber) {
return iter.key();
} }
iter++;
} }
} }
return ""; return "";
@ -611,20 +609,11 @@ QString Project::getSongName(int value) {
QMap<QString, int> Project::getMapObjGfxConstants() { QMap<QString, int> Project::getMapObjGfxConstants() {
QMap<QString, int> constants; QMap<QString, int> constants;
QString text = readTextFile(root + "/constants/map_object_constants.inc"); QString text = readTextFile(root + "/include/constants/map_objects.h");
if (!text.isNull()) { if (!text.isNull()) {
QList<QStringList> *commands = parse(text); QStringList mapObjGfxPrefixes;
for (int i = 0; i < commands->length(); i++) { mapObjGfxPrefixes << "MAP_OBJ_GFX_";
QStringList params = commands->value(i); constants = readCDefines(text, mapObjGfxPrefixes);
QString macro = params.value(0);
if (macro == ".set") {
QString constant = params.value(1);
if (constant.startsWith("MAP_OBJ_GFX_")) {
int value = params.value(2).toInt(nullptr, 0);
constants.insert(constant, value);
}
}
}
} }
return constants; return constants;
} }
@ -649,9 +638,9 @@ void Project::loadObjectPixmaps(QList<Event*> objects) {
QMap<QString, int> constants = getMapObjGfxConstants(); QMap<QString, int> constants = getMapObjGfxConstants();
QString pointers_text = readTextFile(root + "/include/data/field_map_obj/map_object_graphics_info_pointers.h"); QString pointers_text = readTextFile(root + "/src/data/field_map_obj/map_object_graphics_info_pointers.h");
QString info_text = readTextFile(root + "/include/data/field_map_obj/map_object_graphics_info.h"); QString info_text = readTextFile(root + "/src/data/field_map_obj/map_object_graphics_info.h");
QString pic_text = readTextFile(root + "/include/data/field_map_obj/map_object_pic_tables.h"); QString pic_text = readTextFile(root + "/src/data/field_map_obj/map_object_pic_tables.h");
QString assets_text = readTextFile(root + "/src/field/field_map_obj.c"); QString assets_text = readTextFile(root + "/src/field/field_map_obj.c");
QStringList pointers = readCArray(pointers_text, "gMapObjectGraphicsInfoPointers"); QStringList pointers = readCArray(pointers_text, "gMapObjectGraphicsInfoPointers");
@ -969,3 +958,29 @@ QString Project::readCIncbin(QString text, QString label) {
return path; return path;
} }
QMap<QString, int> Project::readCDefines(QString text, QStringList prefixes) {
QMap<QString, int> defines;
QString combinedPrefixes = "[" + prefixes.join('|') + "]";
QRegularExpression re(QString("#define\\s+(?<defineName>%1\\w+)\\s(?<defineValue>\\w+)").arg(combinedPrefixes));
QRegularExpressionMatchIterator iter = re.globalMatch(text);
while (iter.hasNext()) {
QRegularExpressionMatch match = iter.next();
QString name = match.captured("defineName");
QString value = match.captured("defineValue");
bool valid;
int parsedValue = value.startsWith("0x") ? value.toInt(&valid, 16) : value.toInt(&valid, 10);
if (valid) {
if (!defines.contains(name)) {
defines.insert(name, parsedValue);
} else {
qDebug() << QString("Define '%1' is defined multiple times'").arg(name);
}
} else {
qDebug() << QString("Failed to parse define '%1' value '%2' as base 10 or hexadecimal value").arg(name, value);
}
}
return defines;
}

1
project.h
View file

@ -70,6 +70,7 @@ public:
QStringList readCArray(QString text, QString label); QStringList readCArray(QString text, QString label);
QString readCIncbin(QString text, QString label); QString readCIncbin(QString text, QString label);
QMap<QString, int> readCDefines(QString text, QStringList prefixes);
}; };
#endif // PROJECT_H #endif // PROJECT_H