diff -Nru makoureactor-1.7.2/appveyor.yml makoureactor-1.8.0/appveyor.yml
--- makoureactor-1.7.2/appveyor.yml	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/appveyor.yml	2020-08-08 18:46:56.000000000 +0000
@@ -1,16 +1,21 @@
+image: Visual Studio 2019
+
 environment:
   matrix:
     - USE_MSVC: 1
-      QTDIR: C:\Qt\5.6\msvc2013
+      QTDIR: C:\Qt\5.14\msvc2017
+      QTTOOLS: C:\Qt\Tools\QtCreator
     - USE_MINGW: 1
-      QTDIR: C:\Qt\5.6\mingw49_32
+      QTDIR: C:\Qt\5.14\mingw73_32
+      QTTOOLS: C:\Qt\Tools\mingw730_32
 
 install:
-  - if "%USE_MINGW%"=="1" set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw492_32\bin;%PATH%
-  - if "%USE_MSVC%"=="1" set PATH=%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin;%PATH%
-  - '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"'
-  - curl -L -o upx.zip http://upx.sourceforge.net/download/upx391w.zip &&
-    7z e upx.zip *.exe -r
+  - DIR C:\Qt
+  - DIR C:\Qt\Tools
+  - DIR %QTDIR%\..
+  - DIR %QTTOOLS%
+  - set PATH=%QTDIR%\bin;%QTTOOLS%\bin;%PATH%
+  - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"'
 
 before_build:
   - qmake -config release Makou_Reactor.pro
@@ -37,7 +42,8 @@
   description: Description # Mandatory
   provider: GitHub
   auth_token:
-    secure: hC7ZT9txiEAgKU9m2PzmUNe/eDYz1dNPT2DketUKF+8CwuDiXQgNzKSx33Rek2CF
+    secure: Q8v2IrepAs+HGD3atYI/0cI52LrxaYzRZKDBaFMSjsz1NPoUrj+Q4lZaZzFaLa4v
   artifact: /makoureactor-.*\.zip/
   on:
+    branch: develop
     appveyor_repo_tag: true # deploy on tag push only
diff -Nru makoureactor-1.7.2/compat/QtWidgets makoureactor-1.8.0/compat/QtWidgets
--- makoureactor-1.7.2/compat/QtWidgets	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/compat/QtWidgets	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-// Compatibility layer for Qt 4
-#include <QtGui>
-// QHeaderView changes (incompatibility with Qt 5)
-#define setSectionResizeMode setResizeMode
diff -Nru makoureactor-1.7.2/core/Archive.cpp makoureactor-1.8.0/core/Archive.cpp
--- makoureactor-1.7.2/core/Archive.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/Archive.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -65,8 +65,9 @@
 QByteArray Archive::fileData(const QString &filePath)
 {
 	QIODevice *io = file(filePath);
-	if(io == NULL || !io->open(QIODevice::ReadOnly)) {
-		qWarning() << "Archive::fileData error";
+	if (io == nullptr || !io->open(QIODevice::ReadOnly)) {
+		qWarning() << "Archive::fileData error"
+		           << filePath << (io ? io->errorString() : "null");
 		return QByteArray();
 	}
 	QByteArray data = io->readAll();
@@ -81,8 +82,9 @@
 QByteArray Archive::modifiedFileData(const QString &filePath)
 {
 	QIODevice *io = modifiedFile(filePath);
-	if(io == NULL || !io->open(QIODevice::ReadOnly)) {
-		qWarning() << "Archive::modifiedFileData error";
+	if (io == nullptr || !io->open(QIODevice::ReadOnly)) {
+		qWarning() << "Archive::modifiedFileData error"
+		           << filePath << (io ? io->errorString() : "null");
 		return QByteArray();
 	}
 	QByteArray data = io->readAll();
diff -Nru makoureactor-1.7.2/core/Archive.h makoureactor-1.8.0/core/Archive.h
--- makoureactor-1.7.2/core/Archive.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/Archive.h	2020-08-08 18:46:56.000000000 +0000
@@ -26,6 +26,7 @@
 	virtual bool observerWasCanceled() const=0;
 	virtual void setObserverMaximum(unsigned int max)=0;
 	virtual void setObserverValue(int value)=0;
+	virtual bool observerRetry(const QString &message)=0;
 };
 
 class Archive
@@ -71,7 +72,7 @@
 	virtual void close();
 	QString fileName() const;
 	void setFileName(const QString &fileName);
-	virtual bool pack(const QString &destination=QString(), ArchiveObserver *observer=NULL)=0;
+	virtual bool pack(const QString &destination=QString(), ArchiveObserver *observer=nullptr)=0;
 	ArchiveError error() const;
 	QString errorString() const;
 protected:
diff -Nru makoureactor-1.7.2/core/Clipboard.cpp makoureactor-1.8.0/core/Clipboard.cpp
--- makoureactor-1.7.2/core/Clipboard.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/Clipboard.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -12,7 +12,7 @@
 
 Clipboard *Clipboard::instance()
 {
-	if(!_instance) {
+	if (!_instance) {
 		_instance = new Clipboard();
 	}
 
@@ -28,7 +28,7 @@
 QByteArray Clipboard::data(const QString &mimeType)
 {
 	const QMimeData *mimeData = QApplication::clipboard()->mimeData();
-	if(mimeData && mimeData->hasFormat(mimeType)) {
+	if (mimeData && mimeData->hasFormat(mimeType)) {
 		return mimeData->data(mimeType);
 	}
 	return QByteArray();
@@ -51,12 +51,12 @@
 	QList<Opcode *> opcodes;
 
 	QByteArray data = Clipboard::data(MIME_FF7_FIELD_SCRIPT_OPCODES);
-	if(!data.isEmpty()) {
+	if (!data.isEmpty()) {
 		QDataStream stream(data);
 		quint16 version;
 		stream >> version;
 		// Check version
-		if(version != VERSION_FF7_FIELD_SCRIPT_OPCODES) {
+		if (version != VERSION_FF7_FIELD_SCRIPT_OPCODES) {
 			return opcodes;
 		}
 		stream >> opcodes;
@@ -71,6 +71,7 @@
 	QDataStream stream(&data, QIODevice::WriteOnly);
 	stream << quint16(VERSION_FF7_FIELD_SCRIPT_OPCODES)
 	       << opcodes;
+
 	setData(MIME_FF7_FIELD_SCRIPT_OPCODES, data);
 }
 
@@ -84,12 +85,12 @@
 	QList<GrpScript *> groups;
 
 	QByteArray data = Clipboard::data(MIME_FF7_FIELD_SCRIPT_GROUPS);
-	if(!data.isEmpty()) {
+	if (!data.isEmpty()) {
 		QDataStream stream(data);
 		quint16 version;
 		stream >> version;
 		// Check version
-		if(version != VERSION_FF7_FIELD_SCRIPT_GROUPS) {
+		if (version != VERSION_FF7_FIELD_SCRIPT_GROUPS) {
 			return groups;
 		}
 		stream >> groups;
diff -Nru makoureactor-1.7.2/core/Config.cpp makoureactor-1.8.0/core/Config.cpp
--- makoureactor-1.7.2/core/Config.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/Config.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -31,7 +31,7 @@
 }
 
 void Config::set() {
-	if(!settings) {
+	if (!settings) {
 #ifdef Q_OS_WIN
 		settings = new QSettings(qApp->applicationDirPath()
 								 .append("/Makou_Reactor.ini"),
@@ -46,7 +46,7 @@
 }
 
 void Config::remove() {
-	if(settings)	delete settings;
+	if (settings)	delete settings;
 }
 
 QVariant Config::value(const QString &key, const QVariant &defaultValue)
diff -Nru makoureactor-1.7.2/core/FF7Font.cpp makoureactor-1.8.0/core/FF7Font.cpp
--- makoureactor-1.7.2/core/FF7Font.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/FF7Font.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -43,7 +43,7 @@
 
 void FF7Font::setChar(int tableId, int charId, const QString &c)
 {
-	if(tableId < _tables.size() && charId < 224) {
+	if (tableId < _tables.size() && charId < 224) {
 		_tables[tableId][charId] = c;
 		modified = true;
 	}
@@ -80,7 +80,7 @@
 {
 	_txtPath = txtPath;
 	_windowBinFilePath = windowBinFilePath;
-	if(_name.isEmpty()) {
+	if (_name.isEmpty()) {
 		_name = txtPath.mid(txtPath.lastIndexOf('/')+1);
 		_name = _name.left(_name.size() - 4);
 	}
@@ -115,28 +115,28 @@
 	// letterRegExp:	"Foo", "Foo","Foo"
 	QStringList table;
 
-	if(tableCount < 1) {
+	if (tableCount < 1) {
 		qWarning() << "invalid windowBinFile!";
 		return;
 	}
 
-	foreach(const QString &line, lines) {
-		if(line.startsWith("#")) {
-			if(nameRegExp.indexIn(line) != -1) {
+	for (const QString &line : qAsConst(lines)) {
+		if (line.startsWith("#")) {
+			if (nameRegExp.indexIn(line) != -1) {
 				QStringList capturedTexts = nameRegExp.capturedTexts();
 				_name = capturedTexts.at(1).trimmed();
 			}
 		}
 		else {
 			int offset=0;
-			while((offset = letterRegExp.indexIn(line, offset)) != -1) {
+			while ((offset = letterRegExp.indexIn(line, offset)) != -1) {
 				QStringList capturedTexts = letterRegExp.capturedTexts();
 				table.append(capturedTexts.at(1));
 				offset += capturedTexts.first().size();
 
-				if(table.size() == 224) {
+				if (table.size() == 224) {
 					_tables.append(table);
-					if(_tables.size() > tableCount) {
+					if (_tables.size() > tableCount) {
 						//print();
 						return;
 					}
@@ -146,9 +146,9 @@
 		}
 	}
 
-	if(!table.isEmpty()) {
-		if(table.size() < 224) {
-			for(int i=table.size() ; i<224 ; ++i) {
+	if (!table.isEmpty()) {
+		if (table.size() < 224) {
+			for (int i=table.size(); i<224; ++i) {
 				table.append(QString());
 			}
 		}
@@ -163,19 +163,19 @@
 {
 	QString data;
 
-	if(!_name.isEmpty()) {
+	if (!_name.isEmpty()) {
 		data.append("#NAME\t").append(_name).append("\n");
 	}
 
-	foreach(const QStringList &t, _tables) {
-		for(int j=0 ; j<14 ; ++j) {
-			for(int i=0 ; i<16 ; ++i) {
+	for (const QStringList &t : qAsConst(_tables)) {
+		for (int j=0; j<14; ++j) {
+			for (int i=0; i<16; ++i) {
 				data.append(QString("\"%1\"").arg(t[j*16 + i]));
-				if(i<15) {
+				if (i<15) {
 					data.append(",");
 				}
 			}
-			if(j<13) {
+			if (j<13) {
 				data.append(",");
 			}
 			data.append("\n");
@@ -190,11 +190,11 @@
 void FF7Font::print()
 {
 	int tid=1;
-	foreach(const QStringList &t, _tables) {
+	for (const QStringList &t : _tables) {
 		qDebug() << QString("table %1").arg(tid++).toLatin1().data();
-		for(int j=0 ; j<14 ; ++j) {
+		for (int j=0; j<14; ++j) {
 			QString buf;
-			for(int i=0 ; i<16 ; ++i) {
+			for (int i=0; i<16; ++i) {
 				buf += QString("\"%1\",").arg(t[j*16 + i]);
 			}
 			qDebug() << buf.toLatin1().data();
@@ -226,7 +226,7 @@
 	FF7Font *latinFont = openFont(":/fonts/sysfnt.windowBinFile", ":/fonts/sysfnt.txt");
 	FF7Font *jpFont = openFont(":/fonts/sysfnt_jp.windowBinFile", ":/fonts/sysfnt_jp.txt");
 
-	if(!latinFont || !jpFont) {
+	if (!latinFont || !jpFont) {
 		if (latinFont) delete latinFont;
 		if (jpFont)    delete jpFont;
 		return false;
@@ -238,9 +238,9 @@
 	fonts.insert("00", latinFont);
 	fonts.insert("01", jpFont);
 
-	foreach(const QString &str, stringList) {
+	for (const QString &str : qAsConst(stringList)) {
 		int index = str.lastIndexOf('.');
-		fonts.insert(str.left(index), NULL);
+		fonts.insert(str.left(index), nullptr);
 	}
 
 	return true;
@@ -253,25 +253,25 @@
 
 FF7Font *FF7Font::openFont(const QString &windowBinFilePath, const QString &txtPath)
 {
-	WindowBinFile *windowBinFile = NULL;
+	WindowBinFile *windowBinFile = nullptr;
 	QFile f(windowBinFilePath);
-	if(f.open(QIODevice::ReadOnly)) {
+	if (f.open(QIODevice::ReadOnly)) {
 		windowBinFile = new WindowBinFile();
-		if(!windowBinFile->open(f.readAll())) {
+		if (!windowBinFile->open(f.readAll())) {
 			qWarning() << "Cannot open windowBinFile file!" << f.fileName();
 			delete windowBinFile;
-			windowBinFile = NULL;
+			windowBinFile = nullptr;
 		}
 		f.close();
 	}
 
-	if(!windowBinFile) {
-		return NULL;
+	if (!windowBinFile) {
+		return nullptr;
 	}
 
 	FF7Font *ff7Font;
 	QFile f2(txtPath);
-	if(f2.open(QIODevice::ReadOnly)) {
+	if (f2.open(QIODevice::ReadOnly)) {
 		ff7Font = new FF7Font(windowBinFile, f2.readAll());
 		f2.close();
 	} else {
@@ -283,15 +283,15 @@
 
 FF7Font *FF7Font::font(QString name)
 {
-	if(name.isEmpty()) {
+	if (name.isEmpty()) {
 		name = "00";
 	}
 
-	if(fonts.contains(name)) {
+	if (fonts.contains(name)) {
 		FF7Font *ff7Font = fonts.value(name);
-		if(!ff7Font) {
+		if (!ff7Font) {
 			ff7Font = openFont(font_dirPath + "/" + name + ".windowBinFile", font_dirPath + "/" + name + ".txt");
-			if(!ff7Font) {
+			if (!ff7Font) {
 				fonts.remove(name);// Bad font, we can remove it
 			} else {
 				fonts.insert(name, ff7Font);
@@ -300,7 +300,7 @@
 		return ff7Font;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 FF7Font *FF7Font::getCurrentConfigFont()
@@ -308,7 +308,7 @@
 	QString fnt = Config::value("encoding", "00").toString();
 
 	QStringList fontL = fontList();
-	if(fontL.contains(fnt)) {
+	if (fontL.contains(fnt)) {
 		return font(fnt);
 	}
 	return font(fontL.first());
@@ -318,20 +318,20 @@
 {
 	bool ok = true;
 
-	foreach(FF7Font *font, fonts) {
-		if(font && !font->isReadOnly() && font->isModified()) {
+	for (FF7Font *font : qAsConst(fonts)) {
+		if (font && !font->isReadOnly() && font->isModified()) {
 			QFile f1(font->txtPath());
-			if(f1.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+			if (f1.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 				f1.write(font->saveTxt().toUtf8());
 				f1.close();
 			} else {
 				ok = false;
 			}
 			QFile f2(font->windowBinFilePath());
-			if(f2.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+			if (f2.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 				//TODO
 				/*QByteArray tdwData;
-				if(font->windowBinFile()->save(tdwData)) {
+				if (font->windowBinFile()->save(tdwData)) {
 					f2.write(tdwData);
 				} else {
 					ok = false;
@@ -340,7 +340,7 @@
 			} else {
 				ok = false;
 			}
-			if(ok) {
+			if (ok) {
 				font->setModified(false);
 			}
 		}
@@ -349,24 +349,25 @@
 	return ok;
 }
 
-bool FF7Font::copyFont(const QString &name, const QString &from, const QString &name2)
+bool FF7Font::addFont(const QString &name, const QString &from,
+                      const QString &displayName)
 {
-	if(fonts.contains(name) || !fonts.contains(from)) {
+	if (fonts.contains(name)) {
 		return false;
 	}
 
 	FF7Font *ff7Font = font(from);
-	if(!ff7Font) {
+	if (!ff7Font) {
 		return false;
 	}
 
 	QFile ftxt(font_dirPath + "/" + name + ".txt");
-	if(!ftxt.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+	if (!ftxt.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 		return false;
 	}
 
 	QFile ftxt2(ff7Font->txtPath());
-	if(!ftxt2.open(QIODevice::ReadOnly)) {
+	if (!ftxt2.open(QIODevice::ReadOnly)) {
 		return false;
 	}
 
@@ -376,12 +377,12 @@
 	ftxt2.close();
 
 	QFile ftdw(font_dirPath + "/" + name + ".windowBinFile");
-	if(!ftdw.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+	if (!ftdw.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 		return false;
 	}
 
 	QFile ftdw2(ff7Font->windowBinFilePath());
-	if(!ftdw2.open(QIODevice::ReadOnly)) {
+	if (!ftdw2.open(QIODevice::ReadOnly)) {
 		return false;
 	}
 
@@ -390,14 +391,14 @@
 	ftdw.close();
 	ftdw2.close();
 
-	fonts.insert(name, NULL);
+	fonts.insert(name, nullptr);
 
 	ff7Font = font(name);
-	if(!ff7Font) {
+	if (!ff7Font) {
 		return false;
 	}
 
-	ff7Font->setName(name2);
+	ff7Font->setName(displayName);
 	ff7Font->setReadOnly(false);
 
 	return true;
@@ -408,11 +409,11 @@
 
 	FF7Font *ff7Font = font(name);
 
-	if(!ff7Font || ff7Font->isReadOnly()) {
+	if (!ff7Font || ff7Font->isReadOnly()) {
 		return false;
 	}
 
-	if(!QFile::remove(ff7Font->txtPath())
+	if (!QFile::remove(ff7Font->txtPath())
 	|| !QFile::remove(ff7Font->windowBinFilePath())) {
 		return false;
 	}
diff -Nru makoureactor-1.7.2/core/FF7Font.h makoureactor-1.8.0/core/FF7Font.h
--- makoureactor-1.7.2/core/FF7Font.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/FF7Font.h	2020-08-08 18:46:56.000000000 +0000
@@ -45,7 +45,7 @@
 	static FF7Font *font(QString name);
 	static FF7Font *getCurrentConfigFont();
 	static bool saveFonts();
-	static bool copyFont(const QString &name, const QString &from, const QString &name2);
+	static bool addFont(const QString &name, const QString &from, const QString &displayName);
 	static bool removeFont(const QString &name);
 	static const QString &fontDirPath();
 private:
diff -Nru makoureactor-1.7.2/core/FF7Text.cpp makoureactor-1.8.0/core/FF7Text.cpp
--- makoureactor-1.7.2/core/FF7Text.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/FF7Text.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -40,17 +40,17 @@
 //	bool jp = Config::value("jp_txt", false).toBool();
 	int size = _data.size();
 
-	for(quint16 i=0 ; i<size ; ++i) {
+	for (quint16 i=0; i<size; ++i) {
 		quint8 index = (quint8)_data.at(i);
-		if(index == 0xFF)	break;
+		if (index == 0xFF)	break;
 		QString character;
-		switch(index) {
+		switch (index) {
 		case 0xFA:
 			++i;
-			if(size<=i)	return trad.append(simplified ? "¶" : "{xfa}");
-			if(jp) {
+			if (size<=i)	return trad.append(simplified ? "¶" : "{xfa}");
+			if (jp) {
 				character = getCaract(_data.at(i), 3);
-				if(character.isEmpty()) {
+				if (character.isEmpty()) {
 					character = simplified ? "¶" : QString("{xfa}{x%1}").arg((quint8)_data.at(i), 2, 16, QChar('0'));
 				}
 				trad.append(character);
@@ -60,10 +60,10 @@
 		break;
 		case 0xFB:
 			++i;
-			if(size<=i)	return trad.append(simplified ? "¶" : "{xfb}");
-			if(jp) {
+			if (size<=i)	return trad.append(simplified ? "¶" : "{xfb}");
+			if (jp) {
 				character = getCaract(_data.at(i), 4);
-				if(character.isEmpty()) {
+				if (character.isEmpty()) {
 					character = simplified ? "¶" : QString("{xfb}{x%1}").arg((quint8)_data.at(i), 2, 16, QChar('0'));
 				}
 				trad.append(character);
@@ -73,10 +73,10 @@
 		break;
 		case 0xFC:
 			++i;
-			if(size<=i)	return trad.append(simplified ? "¶" : "{xfc}");
-			if(jp) {
+			if (size<=i)	return trad.append(simplified ? "¶" : "{xfc}");
+			if (jp) {
 				character = getCaract(_data.at(i), 5);
-				if(character.isEmpty()) {
+				if (character.isEmpty()) {
 					character = simplified ? "¶" : QString("{xfc}{x%1}").arg((quint8)_data.at(i), 2, 16, QChar('0'));
 				}
 				trad.append(character);
@@ -86,10 +86,10 @@
 		break;
 		case 0xFD:
 			++i;
-			if(size<=i)	return trad.append(simplified ? "¶" : "{xfd}");
-			if(jp) {
+			if (size<=i)	return trad.append(simplified ? "¶" : "{xfd}");
+			if (jp) {
 				character = getCaract(_data.at(i), 6);
-				if(character.isEmpty()) {
+				if (character.isEmpty()) {
 					character = simplified ? "¶" : QString("{xfd}{x%1}").arg((quint8)_data.at(i), 2, 16, QChar('0'));
 				}
 				trad.append(character);
@@ -99,14 +99,14 @@
 		break;
 		case 0xFE:
 			++i;
-			if(size<=i) 	return trad.append(simplified ? "¶" : "{xfe}");;
+			if (size<=i) 	return trad.append(simplified ? "¶" : "{xfe}");;
 			index = (quint8)_data.at(i);
 
-			if(index == 0xE2) {
-				if(!simplified) {
-					if(i+4 < size && (quint8)_data.at(i+4)==0 && (quint8)_data.at(i+2) <= 4) {
+			if (index == 0xE2) {
+				if (!simplified) {
+					if (i+4 < size && (quint8)_data.at(i+4)==0 && (quint8)_data.at(i+2) <= 4) {
 						quint8 bank;
-						switch((quint8)_data.at(i+2)) {
+						switch ((quint8)_data.at(i+2)) {
 						case 0:     bank = 1;	break; // 1 & 2
 						case 1:     bank = 3;	break; // 3 & 4
 						case 2:     bank = 11;	break; // 11 & 12
@@ -123,8 +123,8 @@
 					} else {
 						trad.append("{xfe}{xe2}");
 						++i;
-						for(int i2=i+4 ; i<i2 ; ++i) {
-							if(size<=i) 	return trad;
+						for (int i2=i+4; i<i2; ++i) {
+							if (size<=i) 	return trad;
 							trad.append(QString("{x%1}").arg((quint8)_data.at(i), 2, 16, QChar('0')));
 						}
 						--i;
@@ -132,27 +132,27 @@
 				} else {
 					i+=4;
 				}
-			} else if(index == 0xDD) {
+			} else if (index == 0xDD) {
 				++i;
-				if(!simplified) {
-					if(size<=i)	return trad.append("{xfe}{xdd}");
+				if (!simplified) {
+					if (size<=i)	return trad.append("{xfe}{xdd}");
 					trad.append(QString("{PAUSE%1}").arg((quint8)_data.at(i), 3, 10, QChar('0')));
 				}
 			} else {
-				if(jp) {
+				if (jp) {
 					character = getCaract(index, 7);
-					if(index >= 0xd2 && simplified) {
+					if (index >= 0xd2 && simplified) {
 						character = "¶";
-					} else if(character.isEmpty()) {
+					} else if (character.isEmpty()) {
 						character = simplified ? "¶" : QString("{xfe}{x%1}").arg(index, 2, 16, QChar('0'));
 					}
 					trad.append(character);
 				} else {
 					character = QString();
-					if(index >= 0xd2 && !simplified) {
+					if (index >= 0xd2 && !simplified) {
 						character = getCaract(index, 7);
 					}
-					if(character.isEmpty()) {
+					if (character.isEmpty()) {
 						character = simplified ? "¶" : QString("{xfe}{x%1}").arg(index, 2, 16, QChar('0'));
 					}
 					trad.append(character);
@@ -161,10 +161,10 @@
 		break;
 		default:
 			character = getCaract(index, jp ? 2 : 0);
-			if((index == 0xe0 || index == 0xe1 || index == 0xe7 || index == 0xe8) && simplified) {
+			if ((index == 0xe0 || index == 0xe1 || index == 0xe7 || index == 0xe8) && simplified) {
 				character = " ";
 			}
-			else if(character.isEmpty()) {
+			else if (character.isEmpty()) {
 				character = simplified ? "¶" : QString("{x%1}").arg(index, 2, 16, QChar('0'));
 			}
 			trad.append(character);
@@ -184,15 +184,15 @@
 
 	_data.clear();
 
-	for(int c=0 ; c<stringSize ; ++c)
+	for (int c=0; c<stringSize; ++c)
 	{
 		comp = string.at(c);
-		if(comp=='\n') {//\n{New Page}\n,\n
-			if(string.mid(c+1, 11).compare("{New Page}\n", Qt::CaseInsensitive) == 0) {
+		if (comp=='\n') {//\n{New Page}\n,\n
+			if (string.mid(c+1, 11).compare("{New Page}\n", Qt::CaseInsensitive) == 0) {
 				_data.append('\xe8');
 				c += 11;
 			}
-			else if(string.mid(c+1, 13).compare("{New Page 2}\n", Qt::CaseInsensitive) == 0) {
+			else if (string.mid(c+1, 13).compare("{New Page 2}\n", Qt::CaseInsensitive) == 0) {
 				_data.append('\xe9');
 				c += 13;
 			}
@@ -201,38 +201,45 @@
 			}
 			continue;
 		}
-		else if(comp=='{') {
+		else if (comp=='{') {
 			QString rest = string.mid(c);
-			for(i=0 ; i<16 ; ++i) {
-				if(rest.startsWith(getCaract(0xea + i), Qt::CaseInsensitive)) {//{Name},{Key}
+			for (i=0; i<16; ++i) {
+				if (rest.startsWith(getCaract(0xea + i), Qt::CaseInsensitive)) {//{Name},{Key}
 					_data.append((char)(0xea + i));
 					c += getCaract(0xea + i).size()-1;
 					goto end;
 				}
 			}
 
-			for(i=0 ; i<11 ; ++i) {
-				if(rest.startsWith(getCaract(0xd2 + i, 7), Qt::CaseInsensitive)) {//{Colors},{PAUSE}
+			// Keep the old typo for compatibility
+			if (rest.startsWith("{AERIS}", Qt::CaseInsensitive)) {
+				_data.append((char)(0xed));
+				c += getCaract(0xed).size()-1;
+				goto end;
+			}
+
+			for (i=0; i<11; ++i) {
+				if (rest.startsWith(getCaract(0xd2 + i, 7), Qt::CaseInsensitive)) {//{Colors},{PAUSE}
 					_data.append('\xfe').append((char)(0xd2 + i));
 					c += getCaract(0xd2 + i, 7).size()-1;
 					goto end;
 				}
 			}
 
-			for(i=0 ; i<4 ; ++i) {
-				if(rest.startsWith(getCaract(0xde + i, 7), Qt::CaseInsensitive)) {//{Vars}
+			for (i=0; i<4; ++i) {
+				if (rest.startsWith(getCaract(0xde + i, 7), Qt::CaseInsensitive)) {//{Vars}
 					_data.append('\xfe').append((char)(0xde + i));
 					c += getCaract(0xde + i, 7).size()-1;
 					goto end;
 				}
 			}
 
-			if(rest.startsWith(QString("{MEMORY:var["))) {
+			if (rest.startsWith(QString("{MEMORY:var["))) {
 				QRegExp rx("^\\{MEMORY:var\\[(\\d+)\\]\\[(\\d+)\\];size=(\\d+)\\}");
-				if(rx.indexIn(rest) != -1) {
+				if (rx.indexIn(rest) != -1) {
 					QStringList list = rx.capturedTexts();
 					quint8 bank;
-					switch(list.at(1).toInt()) {
+					switch (list.at(1).toInt()) {
 					case 1:case 2:
 						bank = 0;
 						break;
@@ -258,30 +265,30 @@
 				}
 			}
 
-			if(rest.startsWith(getCaract(0xe9, 7), Qt::CaseInsensitive)) {//{SPACED CHARACTERS}
+			if (rest.startsWith(getCaract(0xe9, 7), Qt::CaseInsensitive)) {//{SPACED CHARACTERS}
 				_data.append("\xfe\xe9", 2);
 				c += getCaract(0xe9, 7).size()-1;
 				goto end;
 			}
 
-			if(rest.startsWith("{PAUSE", Qt::CaseInsensitive) && 9<rest.size() && rest.at(9)=='}') {//{PAUSE000}
+			if (rest.startsWith("{PAUSE", Qt::CaseInsensitive) && 9<rest.size() && rest.at(9)=='}') {//{PAUSE000}
 				value = rest.mid(6,3).toUShort(&ok);
-				if(ok) {
+				if (ok) {
 					_data.append("\xfe\xdd", 2).append((char)value);
 					c += 9;
 					goto end;
 				}
 			}
 
-			if(!jp) {
-				if(rest.startsWith(getCaract(0xe0), Qt::CaseInsensitive)) {//{CHOICE}
+			if (!jp) {
+				if (rest.startsWith(getCaract(0xe0), Qt::CaseInsensitive)) {//{CHOICE}
 					_data.append('\xe0');
 					c += 7;
 					goto end;
 				}
 
-				for(i=0 ; i<3 ; ++i) {
-					if(rest.startsWith(getCaract(0xe2 + i))) {//{, }{."}{?"}
+				for (i=0; i<3; ++i) {
+					if (rest.startsWith(getCaract(0xe2 + i))) {//{, }{."}{?"}
 						_data.append((char)(0xe2 + i));
 						c += 3;
 						goto end;
@@ -289,9 +296,9 @@
 				}
 			}
 
-			if(string.at(c+1)=='x' && string.at(c+4)=='}') {//{x00}
+			if (string.at(c+1)=='x' && string.at(c+4)=='}') {//{x00}
 				value = string.mid(c+2,2).toUShort(&ok,16);
-				if(ok && value != 0xff) {
+				if (ok && value != 0xff) {
 					_data.append((char)value);
 					c += 4;
 					continue;
@@ -303,23 +310,23 @@
 			continue;
 		}
 
-		for(i=0x00 ; i<=0xfe ; ++i)
+		for (i=0x00; i<=0xfe; ++i)
 		{
-			if(QString::compare(comp, getCaract(i, jp ? 2 : 0))==0)
+			if (QString::compare(comp, getCaract(i, jp ? 2 : 0))==0)
 			{
 				_data.append((char)i);
 				goto end;
 			}
 		}
 
-		if(jp) {
-			for(table=3 ; table<8 ; ++table)
+		if (jp) {
+			for (table=3; table<8; ++table)
 			{
-				for(i=0x00 ; i<=0xfe ; ++i)
+				for (i=0x00; i<=0xfe; ++i)
 				{
-					if(QString::compare(comp, getCaract(i, table))==0)
+					if (QString::compare(comp, getCaract(i, table))==0)
 					{
-						switch(table) {
+						switch (table) {
 						case 3:
 							_data.append('\xfa');
 							break;
@@ -349,7 +356,7 @@
 
 QString FF7Text::getCaract(quint8 ord, quint8 table)
 {
-	switch(table) {
+	switch (table) {
 	case 2:
 		return QString::fromUtf8(FF7Text::caract_jp[ord]);
 	case 3:
@@ -376,7 +383,7 @@
 int FF7Text::indexOf(const QRegExp &regExp, int from, int &size) const
 {
 	int index = regExp.indexIn(text(Config::value("jp_txt", false).toBool()), from);
-	if(index != -1)		size = regExp.matchedLength();
+	if (index != -1)		size = regExp.matchedLength();
 	return index;
 }
 
@@ -384,7 +391,7 @@
 {
 	QString t = text(Config::value("jp_txt", false).toBool());
 	int index = regExp.lastIndexIn(t, from);
-	if(index != -1) {
+	if (index != -1) {
 		from = index - t.size();
 		size = regExp.matchedLength();
 	}
diff -Nru makoureactor-1.7.2/core/field/AFile.cpp makoureactor-1.8.0/core/field/AFile.cpp
--- makoureactor-1.7.2/core/field/AFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/AFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -22,6 +22,21 @@
 {
 }
 
+bool AFile::readHeader(AHeader &header) const
+{
+	if (!canRead()) {
+		return false;
+	}
+
+	if (device()->read((char *)&header, 36) != 36
+	    || header.framesCount == 0
+	    || device()->pos() + header.framesCount * (24 + 12 * header.boneCount) > device()->size()) {
+		return false;
+	}
+
+	return true;
+}
+
 bool AFile::read(FieldModelAnimation &animation, int maxFrames) const
 {
 	if (!canRead()) {
@@ -31,9 +46,7 @@
 	AHeader header;
 	PolyVertex rot, trans;
 
-	if (device()->read((char *)&header, 36) != 36
-			|| header.framesCount == 0
-			|| device()->pos() + header.framesCount * (24 + 12 * header.boneCount) > device()->size()) {
+	if (!readHeader(header)) {
 		return false;
 	}
 
@@ -56,7 +69,7 @@
 		QList<PolyVertex> rotationCoords;
 
 		for (quint32 j = 0; j < header.boneCount; ++j) {
-			if(device()->read((char *)&rot, 12) != 12) {
+			if (device()->read((char *)&rot, 12) != 12) {
 				return false;
 			}
 			rotationCoords.append(rot);
diff -Nru makoureactor-1.7.2/core/field/AFile.h makoureactor-1.8.0/core/field/AFile.h
--- makoureactor-1.7.2/core/field/AFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/AFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -37,6 +37,7 @@
 	explicit AFile(QIODevice *device);
 	virtual ~AFile() {}
 
+	bool readHeader(AHeader &header) const;
 	bool read(FieldModelAnimation &animation, int maxFrames = -1) const;
 	bool write(const FieldModelAnimation &animation) const;
 };
diff -Nru makoureactor-1.7.2/core/field/BackgroundFile.cpp makoureactor-1.8.0/core/field/BackgroundFile.cpp
--- makoureactor-1.7.2/core/field/BackgroundFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -32,7 +32,7 @@
 BackgroundFile::~BackgroundFile()
 {
 	qDeleteAll(_palettes);
-	if(_textures) {
+	if (_textures) {
 		delete _textures;
 	}
 }
@@ -41,28 +41,33 @@
 {
 	qDeleteAll(_palettes);
 	_palettes.clear();
-	if(_textures) {
+	if (_textures) {
 		delete _textures;
 		_textures = 0;
 	}
 	_tiles.clear();
 }
 
+void BackgroundFile::initEmpty()
+{
+
+}
+
 QImage BackgroundFile::openBackground(bool *warning)
 {
 	// Search default background params
 	QHash<quint8, quint8> paramActifs;
 	qint16 z[] = {-1, -1};
 	field()->scriptsAndTexts()->bgParamAndBgMove(paramActifs, z);
-	return openBackground(paramActifs, z, NULL, NULL, warning);
+	return openBackground(paramActifs, z, nullptr, nullptr, warning);
 }
 
 QImage BackgroundFile::openBackground(const QHash<quint8, quint8> &paramActifs, const qint16 *z,
                                       const bool *layers, const QSet<quint16> *IDs,
                                       bool *warning)
 {
-	if(!isOpen() && !open()) {
-		if(warning) {
+	if (!isOpen() && !open()) {
+		if (warning) {
 			*warning = false;
 		}
 		return QImage();
@@ -73,8 +78,8 @@
 
 QImage BackgroundFile::backgroundPart(quint16 ID, bool *warning)
 {
-	if(!isOpen() && !open()) {
-		if(warning) {
+	if (!isOpen() && !open()) {
+		if (warning) {
 			*warning = false;
 		}
 		return QImage();
@@ -85,8 +90,8 @@
 
 QImage BackgroundFile::drawBackground(const BackgroundTiles &tiles, bool *warning) const
 {
-	if(tiles.isEmpty() || !_textures) {
-		if(warning) {
+	if (tiles.isEmpty() || !_textures) {
+		if (warning) {
 			*warning = false;
 		}
 		return QImage();
@@ -102,11 +107,11 @@
 	QRgb *pixels = (QRgb *)image.bits();
 	bool warned = false; // To prevent verbosity of warnings
 
-	foreach(const Tile &tile, tiles) {
+	for (const Tile &tile : tiles) {
 		QVector<uint> indexOrColorList = _textures->tile(tile);
 
-		if(indexOrColorList.isEmpty()) {
-			if(!warned) {
+		if (indexOrColorList.isEmpty()) {
+			if (!warned) {
 				qWarning() << "Texture ID overflow" << tile.textureID << tile.textureID2;
 				warned = true;
 			}
@@ -116,17 +121,17 @@
 		quint8 depth = _textures->depth(tile);
 		Palette *palette = 0;
 
-		if(depth <= 1) {
-			if(tile.paletteID >= _palettes.size()) {
-				if(!warned) {
+		if (depth <= 1) {
+			if (tile.paletteID >= _palettes.size()) {
+				if (!warned) {
 					qWarning() << "Palette ID overflow" << tile.paletteID << _palettes.size();
 					warned = true;
 				}
 				continue;
 			}
 			palette = _palettes.at(tile.paletteID);
-		} else if(depth != 2) {
-			if(!warned) {
+		} else if (depth != 2) {
+			if (!warned) {
 				qWarning() << "Unknown depth" << _textures->depth(tile);
 				warned = true;
 			}
@@ -137,14 +142,14 @@
 		quint32 top = (minHeight + tile.dstY) * width;
 		quint16 baseX = minWidth + tile.dstX;
 
-		foreach(uint indexOrColor, indexOrColorList) {
-			if(!palette) {
-				if(indexOrColor != 0) {
+		for (uint indexOrColor : qAsConst(indexOrColorList)) {
+			if (!palette) {
+				if (indexOrColor != 0) {
 					pixels[baseX + right + top] = indexOrColor;
 				}
 			} else {
-				if(palette->notZero(indexOrColor)) {
-					if(tile.blending) {
+				if (palette->notZero(indexOrColor)) {
+					if (tile.blending) {
 						pixels[baseX + right + top] = blendColor(tile.typeTrans,
 						                                         pixels[baseX + right + top],
 						                                         palette->color(indexOrColor));
@@ -154,7 +159,7 @@
 				}
 			}
 
-			if(++right == tile.size) {
+			if (++right == tile.size) {
 				right = 0;
 				top += width;
 			}
@@ -170,7 +175,7 @@
 
 bool BackgroundFile::usedParams(QHash<quint8, quint8> &usedParams, bool *layerExists, QSet<quint16> *usedIDs)
 {
-	if(!isOpen() && !open()) {
+	if (!isOpen() && !open()) {
 		return false;
 	}
 
@@ -181,11 +186,11 @@
 
 bool BackgroundFile::layerExists(int num)
 {
-	if(num == 0) {
+	if (num == 0) {
 		return true;
 	}
 
-	if(!isOpen() && !open()) {
+	if (!isOpen() && !open()) {
 		return false;
 	}
 
@@ -199,30 +204,30 @@
 {
 	int r, g, b;
 
-	switch(type) {
+	switch (type) {
 	case 1:
 		r = qRed(color0) + qRed(color1);
-		if(r>255)	r = 255;
+		if (r>255)	r = 255;
 		g = qGreen(color0) + qGreen(color1);
-		if(g>255)	g = 255;
+		if (g>255)	g = 255;
 		b = qBlue(color0) + qBlue(color1);
-		if(b>255)	b = 255;
+		if (b>255)	b = 255;
 		break;
 	case 2:
 		r = qRed(color0) - qRed(color1);
-		if(r<0)	r = 0;
+		if (r<0)	r = 0;
 		g = qGreen(color0) - qGreen(color1);
-		if(g<0)	g = 0;
+		if (g<0)	g = 0;
 		b = qBlue(color0) - qBlue(color1);
-		if(b<0)	b = 0;
+		if (b<0)	b = 0;
 		break;
 	case 3:
 		r = qRed(color0) + 0.25*qRed(color1);
-		if(r>255)	r = 255;
+		if (r>255)	r = 255;
 		g = qGreen(color0) + 0.25*qGreen(color1);
-		if(g>255)	g = 255;
+		if (g>255)	g = 255;
 		b = qBlue(color0) + 0.25*qBlue(color1);
-		if(b>255)	b = 255;
+		if (b>255)	b = 255;
 		break;
 	default://0
 		r = (qRed(color0) + qRed(color1))/2;
diff -Nru makoureactor-1.7.2/core/field/BackgroundFile.h makoureactor-1.8.0/core/field/BackgroundFile.h
--- makoureactor-1.7.2/core/field/BackgroundFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -32,16 +32,17 @@
 	BackgroundFile(const BackgroundFile &other);
 	virtual ~BackgroundFile();
 
+	virtual void initEmpty();
 	using FieldPart::open;
 	using FieldPart::save;
 	virtual inline bool canSave() const { return false; }
 	void clear();
-	QImage openBackground(bool *warning = NULL);
+	QImage openBackground(bool *warning = nullptr);
 	QImage openBackground(const QHash<quint8, quint8> &paramActifs, const qint16 z[2],
-	                      const bool *layers = NULL, const QSet<quint16> *IDs = NULL,
-	                      bool *warning = NULL);
+	                      const bool *layers = nullptr, const QSet<quint16> *IDs = nullptr,
+	                      bool *warning = nullptr);
 	// Draw background tiles with ID
-	QImage backgroundPart(quint16 ID, bool *warning = NULL);
+	QImage backgroundPart(quint16 ID, bool *warning = nullptr);
 	bool usedParams(QHash<quint8, quint8> &usedParams, bool *layerExists, QSet<quint16> *usedIDs);
 	bool layerExists(int num);
 
@@ -60,11 +61,11 @@
 		_palettes = palettes;
 	}
 
-	inline BackgroundTextures *textures() const {
+	inline virtual BackgroundTextures *textures() const {
 		return _textures;
 	}
 	inline void setTextures(BackgroundTextures *textures) {
-		if(_textures) {
+		if (_textures) {
 			delete _textures;
 		}
 		_textures = textures;
@@ -75,7 +76,7 @@
 	}
 
 protected:
-	QImage drawBackground(const BackgroundTiles &tiles, bool *warning = NULL) const;
+	QImage drawBackground(const BackgroundTiles &tiles, bool *warning = nullptr) const;
 	static QRgb blendColor(quint8 type, QRgb color0, QRgb color1);
 	inline BackgroundTiles &tilesRef() {
 		return _tiles;
diff -Nru makoureactor-1.7.2/core/field/BackgroundFilePC.cpp makoureactor-1.8.0/core/field/BackgroundFilePC.cpp
--- makoureactor-1.7.2/core/field/BackgroundFilePC.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundFilePC.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -30,17 +30,56 @@
 BackgroundFilePC::BackgroundFilePC(const BackgroundFilePC &other) :
 	BackgroundFile(other)
 {
-	setTextures(new BackgroundTexturesPC(*static_cast<BackgroundTexturesPC *>(other.textures())));
+	setTextures(new BackgroundTexturesPC(*other.textures()));
 	PalettesPC palettes;
-	foreach(Palette *pal, other.palettes()) {
+	for (Palette *pal : other.palettes()) {
 		palettes.append(new PalettePC(*pal));
 	}
 	setPalettes(palettes);
 }
 
+void BackgroundFilePC::initEmpty()
+{
+	clear();
+
+	BackgroundTexturesPC *textures = new BackgroundTexturesPC();
+	BackgroundTexturesPCInfos infos;
+	infos.pos = 0;
+	infos.size = 0; // 16x16 tiles
+	infos.depth = 2; // No palettes
+	// Black
+	textures->setTex(0, QVector<uint>(256 * 256, qRgb(0, 0, 0)).toList(), infos);
+	setTextures(textures);
+
+	quint16 tileID = 0;
+	QList<Tile> tiles;
+
+	for (qint16 y = 128; y >= -256; y -= 128) {
+		for (qint16 dstY = 0; dstY < 128; dstY += 16) {
+			for (qint16 dstX = -256; dstX < 256; dstX += 16) {
+				Tile t = Tile();
+				t.ID = 4095;
+				// Data optimization: always the same source
+				t.srcX = 0;
+				t.srcY = 0;
+				t.dstX = dstX;
+				t.dstY = y + dstY;
+				t.size = 16;
+				t.depth = 2;
+				t.tileID = tileID++;
+				tiles.append(t);
+			}
+		}
+	}
+
+	setTiles(BackgroundTiles(tiles));
+
+	BackgroundFile::initEmpty();
+}
+
 bool BackgroundFilePC::open()
 {
-	if(isOpen() || isModified()) {
+	if (isOpen() || isModified()) {
 		setOpen(true);
 		return true;
 	}
@@ -57,7 +96,7 @@
 	palBuff.setData(palData);
 
 	BackgroundIOPC io(&buff, &palBuff);
-	if(!io.read(*this)) {
+	if (!io.read(*this)) {
 		return false;
 	}
 
@@ -71,7 +110,7 @@
 	QBuffer buff, palBuff;
 
 	BackgroundIOPC io(&buff, &palBuff);
-	if(!io.write(*this)) {
+	if (!io.write(*this)) {
 		return QByteArray();
 	}
 
@@ -83,7 +122,7 @@
 	QBuffer buff, palBuff;
 
 	PaletteIOPC io(&palBuff, &buff);
-	if(!io.write(palettes())) {
+	if (!io.write(palettes())) {
 		return QByteArray();
 	}
 
@@ -94,7 +133,7 @@
 {
 	PalettesPS palettesPS = ((PalettesPC *)&palettes())->toPS();
 	BackgroundTiles tilesPS;
-	BackgroundTexturesPS texturesPS = (static_cast<BackgroundTexturesPC *>(textures()))->toPS(tiles(), tilesPS, palettesPS);
+	BackgroundTexturesPS texturesPS = textures()->toPS(tiles(), tilesPS, palettesPS);
 
 	BackgroundFilePS filePS(field);
 	filePS.setPalettes(palettesPS);
@@ -107,39 +146,60 @@
 
 bool BackgroundFilePC::repair()
 {
-	int paletteCount = palettes().size();
+	// PC field file contains PS tiles format
+	// Altough it is unused by the game, we can use it to repair the PC format
+	BackgroundTilesFile *psTiles = field()->tiles();
+	QMap<quint16, Tile> &tiles = (QMap<quint16, Tile> &)tilesRef();
+	QMutableMapIterator<quint16, Tile> it(tiles);
 	bool modified = false;
 
-	QSet<quint8> usedPalettes = this->tiles().usedPalettes();
-	QList<quint8> unusedPalettes;
+	if (psTiles && psTiles->isOpen()) {
+		const QMap<qint32, Tile> &psTilesList = psTiles->tiles().sortedTiles();
 
-	// List unused palettes
-	for(int palID = 0; palID < paletteCount; ++palID) {
-		if(!usedPalettes.contains(palID)) {
-			unusedPalettes.append(palID);
+		while (it.hasNext()) {
+			it.next();
+			Tile &tile = it.value();
+			const Tile tilePs = psTilesList.value((tile.layerID << 16) | tile.tileID);
+
+			if (tile.depth < 2 && tile.paletteID != tilePs.paletteID) {
+				tile.paletteID = tilePs.paletteID;
+				tile.typeTrans = tilePs.typeTrans;
+				modified = true;
+			}
+		}
+	} else { // By hand
+		int paletteCount = palettes().size();
+		QSet<quint8> usedPalettes = this->tiles().usedPalettes();
+		QList<quint8> unusedPalettes;
+
+		// List unused palettes
+		for (int palID = 0; palID < paletteCount; ++palID) {
+			if (!usedPalettes.contains(palID)) {
+				unusedPalettes.append(palID);
+			}
 		}
-	}
 
-	std::sort(unusedPalettes.begin(), unusedPalettes.end(), qLess<quint8>());
+		std::sort(unusedPalettes.begin(), unusedPalettes.end(), std::less<quint8>());
 
-	QMap<quint16, Tile> &tiles = (QMap<quint16, Tile> &)tilesRef();
-	QMap<quint8, quint8> texToPalette;
-	QMutableMapIterator<quint16, Tile> it(tiles);
-	while(it.hasNext()) {
-		it.next();
-		Tile &tile = it.value();
-		if (tile.depth < 2 && tile.blending && tile.typeTrans != 2 && tile.paletteID >= paletteCount) {
-			tile.typeTrans = 2; // Modification in place
-			if(texToPalette.contains(tile.textureID)) {
-				tile.paletteID = texToPalette.value(tile.textureID);
-				modified = true;
-			} else if (!unusedPalettes.isEmpty()) {
-				tile.paletteID = unusedPalettes.first();
-				unusedPalettes.removeFirst();
-				texToPalette.insert(tile.textureID, tile.paletteID);
-				modified = true;
-			} else {
-				qWarning() << "BackgroundFilePC::repair cannot detect palette ID to use";
+		QMap<quint8, quint8> texToPalette;
+
+		while (it.hasNext()) {
+			it.next();
+			Tile &tile = it.value();
+
+			if (tile.depth < 2 && tile.blending && tile.typeTrans != 2 && tile.paletteID >= paletteCount) {
+				tile.typeTrans = 2; // Modification in place
+				if (texToPalette.contains(tile.textureID)) {
+					tile.paletteID = texToPalette.value(tile.textureID);
+					modified = true;
+				} else if (!unusedPalettes.isEmpty()) {
+					tile.paletteID = unusedPalettes.first();
+					unusedPalettes.removeFirst();
+					texToPalette.insert(tile.textureID, tile.paletteID);
+					modified = true;
+				} else {
+					qWarning() << "BackgroundFilePC::repair cannot detect palette ID to use";
+				}
 			}
 		}
 	}
diff -Nru makoureactor-1.7.2/core/field/BackgroundFilePC.h makoureactor-1.8.0/core/field/BackgroundFilePC.h
--- makoureactor-1.7.2/core/field/BackgroundFilePC.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundFilePC.h	2020-08-08 18:46:56.000000000 +0000
@@ -35,11 +35,15 @@
 	explicit BackgroundFilePC(FieldPC *field);
 	BackgroundFilePC(const BackgroundFilePC &other);
 
+	void initEmpty();
 	bool open();
 	bool open(const QByteArray &data, const QByteArray &palData);
 	QByteArray save() const;
 	QByteArray savePal() const;
 	virtual inline bool canSave() const { return true; }
+	inline virtual BackgroundTexturesPC *textures() const {
+		return static_cast<BackgroundTexturesPC *>(BackgroundFile::textures());
+	}
 	BackgroundFilePS toPS(FieldPS *field) const;
 	bool repair();
 };
diff -Nru makoureactor-1.7.2/core/field/BackgroundFilePS.cpp makoureactor-1.8.0/core/field/BackgroundFilePS.cpp
--- makoureactor-1.7.2/core/field/BackgroundFilePS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundFilePS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -29,17 +29,24 @@
 BackgroundFilePS::BackgroundFilePS(const BackgroundFilePS &other) :
 	BackgroundFile(other)
 {
-	setTextures(new BackgroundTexturesPS(*static_cast<BackgroundTexturesPS *>(other.textures())));
+	setTextures(new BackgroundTexturesPS(*other.textures()));
 	PalettesPS palettes;
-	foreach(Palette *pal, other.palettes()) {
+	for (Palette *pal : other.palettes()) {
 		palettes.append(new PalettePS(*pal));
 	}
 	setPalettes(palettes);
 }
 
+void BackgroundFilePS::initEmpty()
+{
+	clear();
+	setTextures(new BackgroundTexturesPS());
+	BackgroundFile::initEmpty();
+}
+
 bool BackgroundFilePS::open()
 {
-	if(isOpen() || isModified()) {
+	if (isOpen() || isModified()) {
 		setOpen(true);
 		return true;
 	}
@@ -56,7 +63,7 @@
 	tilesBuff.setData(tilesData);
 
 	BackgroundIOPS io(&mimBuff, &tilesBuff);
-	if(!io.read(*this)) {
+	if (!io.read(*this)) {
 		return false;
 	}
 
@@ -70,7 +77,7 @@
 	QBuffer buff, tilesBuff;
 
 	BackgroundIOPS io(&buff, &tilesBuff);
-	if(!io.write(*this)) {
+	if (!io.write(*this)) {
 		return QByteArray();
 	}
 
@@ -81,7 +88,7 @@
 {
 	PalettesPC palettesPC = ((PalettesPS *)&palettes())->toPC();
 	BackgroundTiles tilesPC;
-	BackgroundTexturesPC texturesPC = static_cast<BackgroundTexturesPS *>(textures())->toPC(tiles(), tilesPC, palettesPC);
+	BackgroundTexturesPC texturesPC = textures()->toPC(tiles(), tilesPC, palettesPC);
 
 	BackgroundFilePC filePC(field);
 	filePC.setPalettes(palettesPC);
diff -Nru makoureactor-1.7.2/core/field/BackgroundFilePS.h makoureactor-1.8.0/core/field/BackgroundFilePS.h
--- makoureactor-1.7.2/core/field/BackgroundFilePS.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundFilePS.h	2020-08-08 18:46:56.000000000 +0000
@@ -35,9 +35,13 @@
 	explicit BackgroundFilePS(FieldPS *field);
 	BackgroundFilePS(const BackgroundFilePS &other);
 
+	void initEmpty();
 	bool open();
 	bool open(const QByteArray &mimData, const QByteArray &tilesData);
 	QByteArray save() const;
+	inline virtual BackgroundTexturesPS *textures() const {
+		return static_cast<BackgroundTexturesPS *>(BackgroundFile::textures());
+	}
 	BackgroundFilePC toPC(FieldPC *field) const;
 };
 
diff -Nru makoureactor-1.7.2/core/field/BackgroundIO.cpp makoureactor-1.8.0/core/field/BackgroundIO.cpp
--- makoureactor-1.7.2/core/field/BackgroundIO.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundIO.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -32,8 +32,8 @@
 
 bool BackgroundIOPC::canReadPal() const
 {
-	if(_devicePal) {
-		if(!_devicePal->isOpen()) {
+	if (_devicePal) {
+		if (!_devicePal->isOpen()) {
 			return _devicePal->open(QIODevice::ReadOnly);
 		}
 		return _devicePal->isReadable();
@@ -43,8 +43,8 @@
 
 bool BackgroundIOPC::canWritePal() const
 {
-	if(_devicePal) {
-		if(!_devicePal->isOpen()) {
+	if (_devicePal) {
+		if (!_devicePal->isOpen()) {
 			return _devicePal->open(QIODevice::WriteOnly);
 		}
 		return _devicePal->isWritable();
@@ -54,13 +54,13 @@
 
 bool BackgroundIOPC::openPalettes(PalettesPC &palettes) const
 {
-	if(!_devicePal->reset() ||
+	if (!_devicePal->reset() ||
 			!device()->seek(12)) {
 		return false;
 	}
 
 	PaletteIOPC io(_devicePal, device());
-	if(!io.read(palettes)) {
+	if (!io.read(palettes)) {
 		return false;
 	}
 
@@ -69,12 +69,12 @@
 
 bool BackgroundIOPC::openTiles(BackgroundTiles &tiles) const
 {
-	if(!device()->reset()) {
+	if (!device()->reset()) {
 		return false;
 	}
 
 	BackgroundTilesIOPC io(device());
-	if(!io.read(tiles)) {
+	if (!io.read(tiles)) {
 		return false;
 	}
 
@@ -83,12 +83,12 @@
 
 bool BackgroundIOPC::openTextures(BackgroundTexturesPC &textures) const
 {
-	if(!device()->seek(device()->pos() + 7)) {
+	if (!device()->seek(device()->pos() + 7)) {
 		return false;
 	}
 
 	BackgroundTexturesIOPC io(device());
-	if(!io.read(&textures)) {
+	if (!io.read(&textures)) {
 		return false;
 	}
 
@@ -97,7 +97,7 @@
 
 bool BackgroundIOPC::read(BackgroundFile &background) const
 {
-	if(!canRead()
+	if (!canRead()
 			|| !canReadPal()) {
 		return false;
 	}
@@ -108,7 +108,7 @@
 	BackgroundTiles tiles;
 	BackgroundTexturesPC textures;
 
-	if(!openPalettes(palettes)
+	if (!openPalettes(palettes)
 			|| !openTiles(tiles)
 			|| !openTextures(textures)) {
 		qDeleteAll(palettes);
@@ -124,7 +124,7 @@
 
 bool BackgroundIOPC::write(const BackgroundFile &background) const
 {
-	if(!canWrite()
+	if (!canWrite()
 			|| !canWritePal()) {
 		return false;
 	}
@@ -132,7 +132,7 @@
 	quint16 unknown1 = 0, depth = 1;
 	quint8 unknown2 = 1;
 
-	if(device()->write((char *)&unknown1, 2) != 2
+	if (device()->write((char *)&unknown1, 2) != 2
 			|| device()->write((char *)&depth, 2) != 2
 			|| device()->write((char *)&unknown2, 1) != 1
 			|| device()->write("PALETTE", 7) != 7) {
@@ -140,35 +140,35 @@
 	}
 
 	PaletteIOPC paletteIO(devicePal(), device());
-	if(!paletteIO.write(background.palettes())) {
+	if (!paletteIO.write(background.palettes())) {
 		return false;
 	}
 
-	if(device()->write("BACK", 4) != 4) {
+	if (device()->write("BACK", 4) != 4) {
 		return false;
 	}
 
 	BackgroundTilesIOPC backgroundTiles(device());
 
-	if(!backgroundTiles.write(background.tiles())) {
+	if (!backgroundTiles.write(background.tiles())) {
 		return false;
 	}
 
-	if(device()->write("TEXTURE", 7) != 7) {
+	if (device()->write("TEXTURE", 7) != 7) {
 		return false;
 	}
 
 	BackgroundTexturesIOPC backgroundTextures(device());
 
-	if(!backgroundTextures.write(static_cast<BackgroundTexturesPC *>(background.textures()))) {
+	if (!backgroundTextures.write(static_cast<BackgroundTexturesPC *>(background.textures()))) {
 		return false;
 	}
 
-	if(device()->write("END", 3) != 3) {
+	if (device()->write("END", 3) != 3) {
 		return false;
 	}
 
-	if(device()->write("FINAL FANTASY7", 14) != 14) {
+	if (device()->write("FINAL FANTASY7", 14) != 14) {
 		return false;
 	}
 
@@ -182,8 +182,8 @@
 
 bool BackgroundIOPS::canReadTiles() const
 {
-	if(_deviceTiles) {
-		if(!_deviceTiles->isOpen()) {
+	if (_deviceTiles) {
+		if (!_deviceTiles->isOpen()) {
 			return _deviceTiles->open(QIODevice::ReadOnly);
 		}
 		return _deviceTiles->isReadable();
@@ -193,8 +193,8 @@
 
 bool BackgroundIOPS::canWriteTiles() const
 {
-	if(_deviceTiles) {
-		if(!_deviceTiles->isOpen()) {
+	if (_deviceTiles) {
+		if (!_deviceTiles->isOpen()) {
 			return _deviceTiles->open(QIODevice::WriteOnly);
 		}
 		return _deviceTiles->isWritable();
@@ -204,7 +204,7 @@
 
 bool BackgroundIOPS::openPalettes(PalettesPS &palettes) const
 {
-	if(!device()->reset()) {
+	if (!device()->reset()) {
 		return false;
 	}
 
@@ -213,7 +213,7 @@
 
 bool BackgroundIOPS::openTiles(BackgroundTiles &tiles) const
 {
-	if(!deviceTiles()->reset()) {
+	if (!deviceTiles()->reset()) {
 		return false;
 	}
 
@@ -222,7 +222,7 @@
 
 bool BackgroundIOPS::openTextures(BackgroundTexturesPS &textures) const
 {
-	if(!device()->reset()) {
+	if (!device()->reset()) {
 		return false;
 	}
 
@@ -231,7 +231,7 @@
 
 bool BackgroundIOPS::savePalettes(const Palettes &palettes) const
 {
-	if(!device()->reset()) {
+	if (!device()->reset()) {
 		return false;
 	}
 
@@ -240,7 +240,7 @@
 
 bool BackgroundIOPS::saveTiles(const BackgroundTiles &tiles) const
 {
-	if(!deviceTiles()->reset()) {
+	if (!deviceTiles()->reset()) {
 		return false;
 	}
 
@@ -255,7 +255,7 @@
 
 bool BackgroundIOPS::read(BackgroundFile &background) const
 {
-	if(!canRead()
+	if (!canRead()
 			|| !canReadTiles()) {
 		return false;
 	}
@@ -264,26 +264,26 @@
 
 	PalettesPS palettes;
 	BackgroundTiles tiles;
-	BackgroundTexturesPS textures;
+	BackgroundTexturesPS *textures = new BackgroundTexturesPS();
 
-	if(!openPalettes(palettes)
+	if (!openPalettes(palettes)
 			|| !openTiles(tiles)
-			|| !openTextures(textures)) {
+			|| !openTextures(*textures)) {
 		qDeleteAll(palettes);
+		delete textures;
 		return false;
 	}
 
 	background.setPalettes(palettes);
 	background.setTiles(tiles);
-	BackgroundTexturesPS *texPtr = new BackgroundTexturesPS(textures);
-	background.setTextures(texPtr);
+	background.setTextures(textures);
 
 	return true;
 }
 
 bool BackgroundIOPS::write(const BackgroundFile &background) const
 {
-	if(!canWrite()
+	if (!canWrite()
 			|| !canWriteTiles()) {
 		return false;
 	}
diff -Nru makoureactor-1.7.2/core/field/BackgroundTextures.cpp makoureactor-1.8.0/core/field/BackgroundTextures.cpp
--- makoureactor-1.7.2/core/field/BackgroundTextures.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundTextures.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -45,7 +45,7 @@
 	}
 	lastByte = qMin(origin + tile.size * texWidth, maxByte);
 
-	for(quint32 i=origin ; i<lastByte ; ++i) {
+	for (quint32 i=origin; i<lastByte; ++i) {
 		if(depth == 0) {
 			quint8 index = data().at(i);
 			indexOrRgbList.append(index & 0xF);
@@ -132,7 +132,7 @@
 	BackgroundTexturesPCInfos infos = texInfos(texID);
 	int size = infos.depth == 0 ? 32768 : infos.depth * 65536;
 
-	for(int i=0 ; i<size ; ++i) {
+	for (int i=0; i<size; ++i) {
 		if(infos.depth == 0) {
 			quint8 index = data().at(infos.pos + i);
 			indexOrRgbList.append(index & 0xF);
@@ -158,7 +158,7 @@
 	BackgroundTexturesPCInfos infos = _infos;
 	QByteArray texData;
 
-	foreach(uint indexOrRgb, indexOrRgbList) {
+	for (uint indexOrRgb : indexOrRgbList) {
 		if(infos.depth == 0 || infos.depth == 1) {
 			texData.append(char(indexOrRgb));
 		} else if(infos.depth == 2) {
@@ -175,7 +175,7 @@
 		setData(_data.replace(oldInfos.pos, oldDataSize, texData));
 		int diff = texData.size() - oldDataSize;
 		QHashIterator<quint8, BackgroundTexturesPCInfos> it(_texInfos);
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			it.next();
 
 			if(it.value().pos > oldInfos.pos) {
@@ -218,10 +218,12 @@
 
 QRgb BackgroundTexturesPC::directColor(quint16 color) const
 {
-	return qRgba(qRound(COEFF_COLOR * (color >> 11)),
-				qRound(COEFF_COLOR * (color >> 6 & 31)),
-				qRound(COEFF_COLOR * (color & 31)),
-				 color == 0 ? 0 : 255); // special PC RGB16 color
+	quint8 b = color & 31,
+	       g = (color >> 6) & 31,
+	       r = color >> 11;
+
+	// special PC RGB16 color
+	return qRgba((r << 3) + (r >> 2), (g << 3) + (g >> 2), (b << 3) + (b >> 2), color == 0 ? 0 : 255);
 }
 
 quint16 BackgroundTexturesPC::toPcColor(const QRgb &color)
@@ -240,7 +242,7 @@
 	img.fill(Qt::black);
 	QRgb *bits = (QRgb *)img.bits();
 
-	foreach(uint indexOrRgb, indexOrRgbList) {
+	for (uint indexOrRgb : qAsConst(indexOrRgbList)) {
 		if(infos.depth != 2) {
 			*bits = qRgb(indexOrRgb, indexOrRgb, indexOrRgb);
 		} else {
@@ -264,7 +266,7 @@
 	img.fill(Qt::black);
 	QRgb *bits = (QRgb *)img.bits();
 
-	foreach(const Tile &tile, tiles) {
+	for (const Tile &tile : tiles) {
 		if(tile.textureID == texID) {
 			QVector<uint> indexOrRgbList = this->tile(tile);
 			Palette *palette = 0;
@@ -275,7 +277,7 @@
 				palette = palettes.at(tile.paletteID);
 			}
 
-			foreach(uint indexOrRgb, indexOrRgbList) {
+			for (uint indexOrRgb : qAsConst(indexOrRgbList)) {
 //				if(tile.depth == 0) {
 //					bits[pos + y * 256 + x] = qRgb(0, 255, 0);
 //				} else if(tile.depth == 1) {
@@ -351,8 +353,8 @@
 	int curPos;
 	quint16 pageTexW = pageTexWidth(y);
 
-	for(int texY=0 ; texY<256 ; ++texY) {
-		for(int texX=0 ; texX<256 ; ++texX) {
+	for (int texY=0; texY<256; ++texY) {
+		for (int texX=0; texX<256; ++texX) {
 			curPos = pos + texY * pageTexW + (depth == 0 ? texX/2 : texX * depth);
 
 			if(depth == 0) {
@@ -417,7 +419,7 @@
 {
 	QMap<quint16, QList<BackgroundConversionTexture> > groupedTextures;
 
-	foreach(const Tile &tile, psTiles.sortedTiles()) {
+	for (const Tile &tile : psTiles.sortedTiles()) {
 
 		if((tile.textureID2 == 0 && _headerImg.w <= 0)
 			 || (tile.textureID2 == 1 && _headerEffect.w <= 0)) {
@@ -433,7 +435,7 @@
 		 */
 
 		quint8 depthKey = 0;
-		switch(tile.depth & 3) {
+		switch (tile.depth & 3) {
 		case 0:		depthKey = 1;	break;
 		case 1:		depthKey = 0;	break;
 		default:	depthKey = 2;   break;
@@ -452,7 +454,7 @@
 
 				// Detection of transparency PC flag: true if one of used indexes is transparent
 				const QList<bool> &areZero = palette->areZero();
-				foreach(uint index, tileData) {
+				for (uint index : qAsConst(tileData)) {
 					if(areZero.at(index)) {
 						palette->setTransparency(true);
 						break;
@@ -475,7 +477,7 @@
 	BackgroundTiles pcTiles2;
 	BackgroundTexturesPC ret;
 
-	while(it.hasNext()) {
+	while (it.hasNext()) {
 		it.next();
 		QList<BackgroundConversionTexture> &texture = it.value();
 		BackgroundTexturesPCInfos info;
@@ -490,7 +492,7 @@
 			/* On PC version, only the first palette color can be transparent
 			 * So we need to change all indexes to a transparent color to 0
 			 * And relocate when index=0 */
-			for(int texConvId=0 ; texConvId < texture.size() ; ++texConvId) {
+			for (int texConvId=0; texConvId < texture.size(); ++texConvId) {
 				BackgroundConversionTexture &tileConversion = texture[texConvId];
 				if (tileConversion.tile.depth >= 2) {
 					continue; // No palette here
@@ -504,7 +506,7 @@
 					int indexOfFirstZero = areZero.indexOf(true, 1);
 					if(firstIsZero || indexOfFirstZero > -1) {
 						int i = 0;
-						foreach(uint index, tileConversion.data) {
+						for (uint index : qAsConst(tileConversion.data)) {
 							if(index > 0 && areZero.at(index)) {
 								// When the index refer to a transparent color, change this index to 0
 
@@ -533,7 +535,7 @@
 		QSet<quint8> usedTextures;
 		usedTextures.reserve(BACKGROUND_TEXTURE_PC_MAX_COUNT);
 
-		for(int i=0 ; i<textureCount ; ++i) {
+		for (int i=0; i<textureCount; ++i) {
 
 			if(representativeTile.depth == 2) {
 				texID = curTexID5++;
@@ -550,7 +552,7 @@
 				texID = curTexID++;
 			}
 			if(usedTextures.contains(texID)) {
-				for(int j=0 ; j<BACKGROUND_TEXTURE_PC_MAX_COUNT; ++j) {
+				for (int j=0; j<BACKGROUND_TEXTURE_PC_MAX_COUNT; ++j) {
 					int newTexID = (texID + j) % BACKGROUND_TEXTURE_PC_MAX_COUNT;
 					if(!usedTextures.contains(newTexID)) {
 						texID = newTexID;
@@ -566,10 +568,10 @@
 
 			QList<uint> flatten;
 
-			for(quint8 tileY=0 ; tileY<tileCount ; ++tileY) {
-				for(quint8 y=0 ; y<representativeTile.size ; ++y) {
-					for(quint8 tileX=0 ; tileX<tileCount ; ++tileX) {
-						for(quint8 x=0 ; x<representativeTile.size ; ++x) {
+			for (quint8 tileY=0; tileY<tileCount; ++tileY) {
+				for (quint8 y=0; y<representativeTile.size; ++y) {
+					for (quint8 tileX=0; tileX<tileCount; ++tileX) {
+						for (quint8 x=0; x<representativeTile.size; ++x) {
 							flatten.append(texture.value(i * tilesPerTexture +
 														 tileY * tileCount + tileX)
 										   .data.value(y * representativeTile.size + x));
diff -Nru makoureactor-1.7.2/core/field/BackgroundTexturesIO.cpp makoureactor-1.8.0/core/field/BackgroundTexturesIO.cpp
--- makoureactor-1.7.2/core/field/BackgroundTexturesIO.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundTexturesIO.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -29,26 +29,26 @@
 
 bool BackgroundTexturesIOPC::read(BackgroundTexturesPC *textures) const
 {
-	if(!canRead()) {
+	if (!canRead()) {
 		return false;
 	}
 
 	textures->clear();
 	qint64 initPos = device()->pos();
 
-	for(quint8 texID=0 ; texID<BACKGROUND_TEXTURE_PC_MAX_COUNT ; ++texID) {
+	for (quint8 texID=0; texID<BACKGROUND_TEXTURE_PC_MAX_COUNT; ++texID) {
 
 		quint16 exists;
 
-		if(device()->read((char *)&exists, 2) != 2) {
+		if (device()->read((char *)&exists, 2) != 2) {
 			qWarning() << "BackgroundTexturesIOPC::read cannot read exists" << texID;
 			return false;
 		}
 
-		if(bool(exists)) {
+		if (bool(exists)) {
 			quint16 size, depth;
 
-			if(device()->read((char *)&size, 2) != 2 ||
+			if (device()->read((char *)&size, 2) != 2 ||
 					device()->read((char *)&depth, 2) != 2) {
 				qWarning() << "BackgroundTexturesIOPC::read cannot read size or depth" << texID;
 				return false;
@@ -60,14 +60,14 @@
 			infos.pos = device()->pos() - initPos;
 			textures->addTexInfos(texID, infos);
 
-			if(!device()->seek(device()->pos() + (depth == 0 ? 32768 : depth * 65536))) {
+			if (!device()->seek(device()->pos() + (depth == 0 ? 32768 : depth * 65536))) {
 				qWarning() << "BackgroundTexturesIOPC::read cannot seek texture" << texID;
 				return false;
 			}
 		}
 	}
 
-	if(!device()->seek(initPos)) {
+	if (!device()->seek(initPos)) {
 		qWarning() << "BackgroundTexturesIOPC::read cannot reset";
 		return false;
 	}
@@ -78,30 +78,31 @@
 
 bool BackgroundTexturesIOPC::write(const BackgroundTexturesPC *textures) const
 {
-	if(!canWrite()) {
+	if (!canWrite() || !textures) {
 		return false;
 	}
 
-	for(quint8 texID=0 ; texID<BACKGROUND_TEXTURE_PC_MAX_COUNT ; ++texID) {
+	for (quint8 texID=0; texID<BACKGROUND_TEXTURE_PC_MAX_COUNT; ++texID) {
 
 		quint16 exists = textures->hasTex(texID);
 
-		if(device()->write((char *)&exists, 2) != 2) {
+		if (device()->write((char *)&exists, 2) != 2) {
 			return false;
 		}
 
-		if(bool(exists)) {
+		if (bool(exists)) {
 			BackgroundTexturesPCInfos infos = textures->texInfos(texID);
 
 			quint16 size = infos.size, depth = infos.depth;
 
-			if(device()->write((char *)&size, 2) != 2 ||
+			if (device()->write((char *)&size, 2) != 2 ||
 					device()->write((char *)&depth, 2) != 2) {
 				return false;
 			}
 
-			if(device()->write(textures->data().mid(infos.pos, infos.depth * 65536))
-					!= infos.depth * 65536) {
+			int dataSize = infos.depth == 0 ? 32768 : infos.depth * 65536;
+
+			if (device()->write(textures->data().mid(infos.pos, dataSize)) != dataSize) {
 				return false;
 			}
 		}
@@ -117,7 +118,7 @@
 
 bool BackgroundTexturesIOPS::read(BackgroundTexturesPS *textures) const
 {
-	if(!canRead()) {
+	if (!canRead()) {
 		return false;
 	}
 
@@ -128,7 +129,7 @@
 
 	memcpy(&headerPalSize, constMimData, 4);
 
-	if(mimDataSize < headerPalSize + 12) {
+	if (mimDataSize < headerPalSize + 12) {
 		return false;
 	}
 
@@ -136,7 +137,7 @@
 
 	headerImg.w *= 2;
 
-	if(headerPalSize+headerImg.size+12 <= mimDataSize) {
+	if (headerPalSize+headerImg.size+12 <= mimDataSize) {
 		memcpy(&headerEffect, constMimData + headerPalSize+headerImg.size, 12);
 		headerEffect.w *= 2;
 	} else {
@@ -156,7 +157,7 @@
 
 bool BackgroundTexturesIOPS::write(const BackgroundTexturesPS *textures) const
 {
-	if(!canWrite()) {
+	if (!canWrite()) {
 		return false;
 	}
 
diff -Nru makoureactor-1.7.2/core/field/BackgroundTiles.cpp makoureactor-1.8.0/core/field/BackgroundTiles.cpp
--- makoureactor-1.7.2/core/field/BackgroundTiles.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundTiles.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -24,8 +24,8 @@
 
 BackgroundTiles::BackgroundTiles(const QList<Tile> &tiles)
 {
-	foreach (const Tile &tile, tiles) {
-		switch(tile.layerID) {
+	for (const Tile &tile : tiles) {
+		switch (tile.layerID) {
 		case 0:
 			insert(1, tile);
 			break;
@@ -52,28 +52,28 @@
 {
 	BackgroundTiles ret;
 
-	foreach(const Tile &tile, *this) {
-		switch(tile.layerID) {
+	for (const Tile &tile : *this) {
+		switch (tile.layerID) {
 		case 0:
-			if((layers == NULL || layers[0]) && (IDs == NULL || IDs->contains(1))) {
+			if ((layers == nullptr || layers[0]) && (IDs == nullptr || IDs->contains(1))) {
 				ret.insert(1, tile);
 			}
 			break;
 		case 1:
-			if((tile.state == 0 || paramActifs.value(tile.param, 0) & tile.state)
-					&& (layers == NULL || layers[1]) && (IDs == NULL || IDs->contains(tile.ID))) {
+			if ((tile.state == 0 || paramActifs.value(tile.param, 0) & tile.state)
+					&& (layers == nullptr || layers[1]) && (IDs == nullptr || IDs->contains(tile.ID))) {
 				ret.insert(4096 - tile.ID, tile);
 			}
 			break;
 		case 2:
-			if((tile.state == 0 || paramActifs.value(tile.param, 0) & tile.state)
-					&& (layers == NULL || layers[2]) && (IDs == NULL || IDs->contains(tile.ID))) {
+			if ((tile.state == 0 || paramActifs.value(tile.param, 0) & tile.state)
+					&& (layers == nullptr || layers[2]) && (IDs == nullptr || IDs->contains(tile.ID))) {
 				ret.insert(4096 - ((z && z[0] != -1) ? z[0] : tile.ID), tile);
 			}
 			break;
 		case 3:
-			if((tile.state == 0 || paramActifs.value(tile.param, 0) & tile.state)
-					&& (layers == NULL || layers[3]) && (IDs == NULL || IDs->contains(tile.ID))) {
+			if ((tile.state == 0 || paramActifs.value(tile.param, 0) & tile.state)
+					&& (layers == nullptr || layers[3]) && (IDs == nullptr || IDs->contains(tile.ID))) {
 				ret.insert(4096 - ((z && z[1] != -1) ? z[1] : tile.ID), tile);
 			}
 			break;
@@ -87,8 +87,8 @@
 {
 	BackgroundTiles ret;
 
-	foreach(const Tile &tile, *this) {
-		if(tile.layerID == layerID) {
+	for (const Tile &tile : *this) {
+		if (tile.layerID == layerID) {
 			ret.insert(orderedForSaving
 					   ? tile.tileID
 					   : 4096 - tile.ID,
@@ -103,8 +103,8 @@
 {
 	BackgroundTiles ret;
 
-	foreach(const Tile &tile, *this) {
-		if(tile.ID == ID) {
+	for (const Tile &tile : *this) {
+		if (tile.ID == ID) {
 			ret.insert(orderedForSaving
 					   ? tile.tileID
 					   : 4096 - tile.ID,
@@ -119,8 +119,8 @@
 {
 	QMap<qint32, Tile> ret;
 
-	foreach(const Tile &tile, *this) {
-		if(ret.contains((tile.layerID << 16) | tile.tileID)) {
+	for (const Tile &tile : *this) {
+		if (ret.contains((tile.layerID << 16) | tile.tileID)) {
 			qWarning() << "BackgroundTiles::sortedTiles() tile not unique!" << tile.layerID << tile.tileID;
 		}
 		ret.insert((tile.layerID << 16) | tile.tileID, tile);
@@ -134,28 +134,28 @@
 	QHash<quint8, quint8> ret;
 	layerExists[0] = layerExists[1] = layerExists[2] = false;
 
-	foreach(const Tile &tile, *this) {
-		switch(tile.layerID) {
+	for (const Tile &tile : *this) {
+		switch (tile.layerID) {
 		case 0:
 			break;
 		case 1:
 			layerExists[0] = true;
-			if(tile.param) {
+			if (tile.param) {
 				ret.insert(tile.param, ret.value(tile.param) | tile.state);
 			}
-			if(usedIDs) {
+			if (usedIDs) {
 				usedIDs->insert(tile.ID);
 			}
 			break;
 		case 2:
 			layerExists[1] = true;
-			if(tile.param) {
+			if (tile.param) {
 				ret.insert(tile.param, ret.value(tile.param) | tile.state);
 			}
 			break;
 		case 3:
 			layerExists[2] = true;
-			if(tile.param) {
+			if (tile.param) {
 				ret.insert(tile.param, ret.value(tile.param) | tile.state);
 			}
 			break;
@@ -169,7 +169,7 @@
 {
 	QSet<quint8> ret;
 
-	foreach(const Tile &tile, *this) {
+	for (const Tile &tile : *this) {
 		if (tile.depth < 2) {
 			ret.insert(tile.paletteID);
 		}
@@ -184,15 +184,15 @@
 	quint16 maxWidth=0, maxHeight=0;
 	minWidth = minHeight = 0;
 
-	foreach(const Tile &tile, *this) {
+	for (const Tile &tile : *this) {
 		quint8 toAdd = tile.size - 16;
-		if(tile.dstX >= 0 && tile.dstX+toAdd > maxWidth)
+		if (tile.dstX >= 0 && tile.dstX+toAdd > maxWidth)
 			maxWidth = tile.dstX+toAdd;
-		else if(tile.dstX < 0 && -tile.dstX > minWidth)
+		else if (tile.dstX < 0 && -tile.dstX > minWidth)
 			minWidth = -tile.dstX;
-		if(tile.dstY >= 0 && tile.dstY+toAdd > maxHeight)
+		if (tile.dstY >= 0 && tile.dstY+toAdd > maxHeight)
 			maxHeight = tile.dstY+toAdd;
-		else if(tile.dstY < 0 && -tile.dstY > minHeight)
+		else if (tile.dstY < 0 && -tile.dstY > minHeight)
 			minHeight = -tile.dstY;
 	}
 
@@ -213,8 +213,8 @@
 Tile BackgroundTiles::search(quint8 textureID1, quint8 textureID2,
 							 quint8 srcX, quint8 srcY) const
 {
-	foreach(const Tile &tile, *this) {
-		if(tile.textureID == textureID1 &&
+	for (const Tile &tile : *this) {
+		if (tile.textureID == textureID1 &&
 				(textureID2 == quint8(-1) || tile.textureID2 == textureID2) &&
 				tile.srcX == srcX &&
 				tile.srcY == srcY) {
@@ -226,3 +226,8 @@
 	nullTile.tileID = quint16(-1);
 	return nullTile;
 }
+
+int operator==(const Tile &tile, const Tile &other)
+{
+	return memcmp(&tile, &other, sizeof(tile) - 4);
+}
diff -Nru makoureactor-1.7.2/core/field/BackgroundTilesFile.cpp makoureactor-1.8.0/core/field/BackgroundTilesFile.cpp
--- makoureactor-1.7.2/core/field/BackgroundTilesFile.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundTilesFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,45 @@
+#include "BackgroundTilesFile.h"
+#include "BackgroundTilesIO.h"
+#include "Field.h"
+
+BackgroundTilesFile::BackgroundTilesFile(Field *field) :
+      FieldPart(field)
+{
+}
+
+BackgroundTilesFile::~BackgroundTilesFile()
+{
+}
+
+bool BackgroundTilesFile::open()
+{
+	return open(field()->sectionData(Field::Tiles));
+}
+
+bool BackgroundTilesFile::open(const QByteArray &data)
+{
+	QBuffer buffer;
+	buffer.setData(data);
+
+	if (BackgroundTilesIOPS(&buffer).read(_tiles)) {
+		setOpen(true);
+
+		return true;
+	}
+
+	return false;
+}
+
+QByteArray BackgroundTilesFile::save() const
+{
+	QBuffer buffer;
+
+	BackgroundTilesIOPS(&buffer).write(_tiles);
+
+	return buffer.data();
+}
+
+void BackgroundTilesFile::clear()
+{
+	_tiles.clear();
+}
diff -Nru makoureactor-1.7.2/core/field/BackgroundTilesFile.h makoureactor-1.8.0/core/field/BackgroundTilesFile.h
--- makoureactor-1.7.2/core/field/BackgroundTilesFile.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundTilesFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef BACKGROUNDTILESFILE_H
+#define BACKGROUNDTILESFILE_H
+
+#include <QtCore>
+#include "FieldPart.h"
+#include "BackgroundTiles.h"
+
+// This class is only used for repairing PC backgrounds
+class BackgroundTilesFile : public FieldPart
+{
+public:
+	explicit BackgroundTilesFile(Field *field);
+	virtual ~BackgroundTilesFile();
+
+	bool open();
+	bool open(const QByteArray &data);
+	QByteArray save() const;
+	void clear();
+
+	inline const BackgroundTiles &tiles() const {
+		return _tiles;
+	}
+
+private:
+	BackgroundTiles _tiles;
+};
+
+#endif // BACKGROUNDTILESFILE_H
diff -Nru makoureactor-1.7.2/core/field/BackgroundTiles.h makoureactor-1.8.0/core/field/BackgroundTiles.h
--- makoureactor-1.7.2/core/field/BackgroundTiles.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundTiles.h	2020-08-08 18:46:56.000000000 +0000
@@ -47,7 +47,7 @@
 	BackgroundTiles tiles(quint8 layerID, bool orderedForSaving = false) const;
 	BackgroundTiles tilesByID(quint16 ID, bool orderedForSaving = false) const;
 	QMap<qint32, Tile> sortedTiles() const;
-	QHash<quint8, quint8> usedParams(bool *layerExists, QSet<quint16> *usedIDs = NULL) const;
+	QHash<quint8, quint8> usedParams(bool *layerExists, QSet<quint16> *usedIDs = nullptr) const;
 	QSet<quint8> usedPalettes() const;
 	void area(quint16 &minWidth, quint16 &minHeight,
 			  int &width, int &height) const;
@@ -55,4 +55,6 @@
 	Tile search(quint8 textureID1, quint8 textureID2, quint8 srcX, quint8 srcY) const;
 };
 
+int operator==(const Tile &tile, const Tile &other);
+
 #endif // BACKGROUNDTILES_H
diff -Nru makoureactor-1.7.2/core/field/BackgroundTilesIO.cpp makoureactor-1.8.0/core/field/BackgroundTilesIO.cpp
--- makoureactor-1.7.2/core/field/BackgroundTilesIO.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BackgroundTilesIO.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -24,7 +24,7 @@
 
 bool BackgroundTilesIO::read(BackgroundTiles &tiles) const
 {
-	if(!canRead()) {
+	if (!canRead()) {
 		return false;
 	}
 
@@ -35,7 +35,7 @@
 
 bool BackgroundTilesIO::write(const BackgroundTiles &tiles) const
 {
-	if(!canWrite()) {
+	if (!canWrite()) {
 		return false;
 	}
 
@@ -57,41 +57,41 @@
 	char exists;
 	const quint8 sizeofTile = sizeof(TilePC);
 
-	if(!device()->seek(44)) {
+	if (!device()->seek(44)) {
 		qWarning() << "BackgroundTilesIOPC::readData device size too short";
 		return false;
 	}
 
-	if(device()->read((char *)&nbTiles1, 2) != 2) {
+	if (device()->read((char *)&nbTiles1, 2) != 2) {
 		qWarning() << "BackgroundTilesIOPC::readData cannot read nbTiles1";
 		return false;
 	}
 
-	if(!device()->seek(52)) {
+	if (!device()->seek(52)) {
 		qWarning() << "BackgroundTilesIOPC::readData cannot seek (1)";
 		return false;
 	}
 
-	if(nbTiles1 > 0) {
+	if (nbTiles1 > 0) {
 		data = device()->read(nbTiles1 * 52 - 52 + sizeofTile);
 
-		if(data.size() != nbTiles1 * 52 - 52 + sizeofTile) {
+		if (data.size() != nbTiles1 * 52 - 52 + sizeofTile) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot read tiles data (1)";
 			return false;
 		}
 
 		// BG 0
-		for(i=0 ; i<nbTiles1 ; ++i) {
+		for (i=0; i<nbTiles1; ++i) {
 			memcpy(&tile, data.constData() + i*52, sizeofTile);
 
-			if(qAbs(tile.dstX) < MAX_TILE_DST && qAbs(tile.dstY) < MAX_TILE_DST) {
+			if (qAbs(tile.dstX) < MAX_TILE_DST && qAbs(tile.dstY) < MAX_TILE_DST) {
 				tiles.insert(1, tilePC2Tile(tile, 0, i));
 			} else {
-				qWarning() << "Tile destination overflow 0" << tile.dstX << tile.dstY;
+				qWarning() << "Tile destination overflow 0" << i << tile.dstX << tile.dstY;
 			}
 		}
 
-		if(!device()->seek(52 + nbTiles1 * 52)) {
+		if (!device()->seek(52 + nbTiles1 * 52)) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot seek (2)";
 			return false;
 		}
@@ -99,50 +99,50 @@
 
 	cur = device()->pos();
 
-	if(!device()->getChar(&exists)) {
+	if (!device()->getChar(&exists)) {
 		qWarning() << "BackgroundTilesIOPC::readData cannot read exists2";
 		return false;
 	}
 
 	// BG 1
-	if(bool(exists)) {
+	if (bool(exists)) {
 
-		if(!device()->seek(cur + 5)) {
+		if (!device()->seek(cur + 5)) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot seek (3)";
 			return false;
 		}
 
-		if(device()->read((char *)&nbTiles2, 2) != 2) {
+		if (device()->read((char *)&nbTiles2, 2) != 2) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot read nbTiles2";
 			return false;
 		}
 
-		if(nbTiles2 > 0) {
+		if (nbTiles2 > 0) {
 
-			if(!device()->seek(cur + 27)) {
+			if (!device()->seek(cur + 27)) {
 				qWarning() << "BackgroundTilesIOPC::readData cannot seek (4)";
 				return false;
 			}
 
 			data = device()->read(nbTiles2 * 52 - 52 + sizeofTile);
 
-			if(data.size() != nbTiles2 * 52 - 52 + sizeofTile) {
+			if (data.size() != nbTiles2 * 52 - 52 + sizeofTile) {
 				qWarning() << "BackgroundTilesIOPC::readData cannot read tiles data (2)";
 				return false;
 			}
 
-			for(i=0 ; i<nbTiles2 ; ++i) {
+			for (i=0; i<nbTiles2; ++i) {
 				memcpy(&tile, data.constData() + i*52, sizeofTile);
 
-				if(qAbs(tile.dstX) < MAX_TILE_DST && qAbs(tile.dstY) < MAX_TILE_DST) {
+				if (qAbs(tile.dstX) < MAX_TILE_DST && qAbs(tile.dstY) < MAX_TILE_DST) {
 					tiles.insert(4096 - tile.ID, tilePC2Tile(tile, 1, i));
 				} else {
-					qWarning() << "Tile destination overflow 1" << tile.dstX << tile.dstY;
+					qWarning() << "Tile destination overflow 1" << i << tile.dstX << tile.dstY;
 				}
 			}
 		}
 
-		if(!device()->seek(cur + 27 + nbTiles2 * 52)) {
+		if (!device()->seek(cur + 27 + nbTiles2 * 52)) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot seek (5)";
 			return false;
 		}
@@ -150,51 +150,51 @@
 
 	cur = device()->pos();
 
-	if(!device()->getChar(&exists)) {
+	if (!device()->getChar(&exists)) {
 		qWarning() << "BackgroundTilesIOPC::readData cannot read exists3";
 		return false;
 	}
 
 	// BG 2
-	if(bool(exists)) {
+	if (bool(exists)) {
 
-		if(!device()->seek(cur + 5)) {
+		if (!device()->seek(cur + 5)) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot seek (6)";
 			return false;
 		}
 
-		if(device()->read((char *)&nbTiles3, 2) != 2) {
+		if (device()->read((char *)&nbTiles3, 2) != 2) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot read nbTiles3";
 			return false;
 		}
 
-		if(nbTiles3 > 0) {
+		if (nbTiles3 > 0) {
 
-			if(!device()->seek(cur + 21)) {
+			if (!device()->seek(cur + 21)) {
 				qWarning() << "BackgroundTilesIOPC::readData cannot seek (7)";
 				return false;
 			}
 
 			data = device()->read(nbTiles3 * 52 - 52 + sizeofTile);
 
-			if(data.size() != nbTiles3 * 52 - 52 + sizeofTile) {
+			if (data.size() != nbTiles3 * 52 - 52 + sizeofTile) {
 				qWarning() << "BackgroundTilesIOPC::readData cannot read tiles data (3)";
 				return false;
 			}
 
-			for(i=0 ; i<nbTiles3 ; ++i) {
+			for (i=0; i<nbTiles3; ++i) {
 				memcpy(&tile, data.constData() + i*52, sizeofTile);
 
-				if(qAbs(tile.dstX) < MAX_TILE_DST && qAbs(tile.dstY) < MAX_TILE_DST) {
+				if (qAbs(tile.dstX) < MAX_TILE_DST && qAbs(tile.dstY) < MAX_TILE_DST) {
 					tiles.insert(0, tilePC2Tile(tile, 2, i));
 				} else {
-					qWarning() << "Tile destination overflow 2" << tile.dstX << tile.dstY;
+					qWarning() << "Tile destination overflow 2" << i << tile.dstX << tile.dstY;
 				}
 			}
 
 		}
 
-		if(!device()->seek(cur + 21 + nbTiles3 * 52)) {
+		if (!device()->seek(cur + 21 + nbTiles3 * 52)) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot seek (8)";
 			return false;
 		}
@@ -202,50 +202,50 @@
 
 	cur = device()->pos();
 
-	if(!device()->getChar(&exists)) {
+	if (!device()->getChar(&exists)) {
 		qWarning() << "BackgroundTilesIOPC::readData cannot read exists4";
 		return false;
 	}
 
 	// BG 3
-	if(bool(exists)) {
+	if (bool(exists)) {
 
-		if(!device()->seek(cur + 5)) {
+		if (!device()->seek(cur + 5)) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot seek (9)";
 			return false;
 		}
 
-		if(device()->read((char *)&nbTiles4, 2) != 2) {
+		if (device()->read((char *)&nbTiles4, 2) != 2) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot read nbTiles4";
 			return false;
 		}
 
-		if(nbTiles4 > 0) {
+		if (nbTiles4 > 0) {
 
-			if(!device()->seek(cur + 21)) {
+			if (!device()->seek(cur + 21)) {
 				qWarning() << "BackgroundTilesIOPC::readData cannot seek (10)";
 				return false;
 			}
 
 			data = device()->read(nbTiles4 * 52 - 52 + sizeofTile);
 
-			if(data.size() != nbTiles4 * 52 - 52 + sizeofTile) {
+			if (data.size() != nbTiles4 * 52 - 52 + sizeofTile) {
 				qWarning() << "BackgroundTilesIOPC::readData cannot read tiles data (4)";
 				return false;
 			}
 
-			for(i=0 ; i<nbTiles4 ; ++i) {
+			for (i=0; i<nbTiles4; ++i) {
 				memcpy(&tile, data.constData() + i*52, sizeofTile);
 
-				if(qAbs(tile.dstX) < MAX_TILE_DST && qAbs(tile.dstY) < MAX_TILE_DST) {
+				if (qAbs(tile.dstX) < MAX_TILE_DST && qAbs(tile.dstY) < MAX_TILE_DST) {
 					tiles.insert(4096, tilePC2Tile(tile, 3, i));
 				} else {
-					qWarning() << "Tile destination overflow 3" << tile.dstX << tile.dstY;
+					qWarning() << "Tile destination overflow 3" << i << tile.dstX << tile.dstY;
 				}
 			}
 		}
 
-		if(!device()->seek(cur + 21 + nbTiles4 * 52)) {
+		if (!device()->seek(cur + 21 + nbTiles4 * 52)) {
 			qWarning() << "BackgroundTilesIOPC::readData cannot seek (11)";
 			return false;
 		}
@@ -291,7 +291,7 @@
 	device()->write((char *)&depth, 2);
 	device()->write("\0\0", 2);
 
-	foreach(const Tile &tile, tiles1) {
+	for (const Tile &tile : qAsConst(tiles1)) {
 		writeTile(tile);
 	}
 
@@ -304,7 +304,7 @@
 
 	BackgroundTiles tiles2 = tiles.tiles(1, true);
 
-	if(!tiles2.isEmpty()) {
+	if (!tiles2.isEmpty()) {
 		nbTiles = tiles2.size();
 
 		device()->putChar('\x01');
@@ -314,7 +314,7 @@
 		device()->write(QByteArray(16, '\0')); // Unknown but unused
 		device()->write("\0\0", 2);
 
-		foreach(const Tile &tile, tiles2) {
+		for (const Tile &tile : qAsConst(tiles2)) {
 			writeTile(tile);
 		}
 
@@ -327,7 +327,7 @@
 
 	BackgroundTiles tiles3 = tiles.tiles(2, true);
 
-	if(!tiles3.isEmpty()) {
+	if (!tiles3.isEmpty()) {
 		nbTiles = tiles3.size();
 
 		device()->putChar('\x01');
@@ -337,7 +337,7 @@
 		device()->write(QByteArray(10, '\0'));
 		device()->write("\0\0", 2);
 
-		foreach(const Tile &tile, tiles3) {
+		for (const Tile &tile : qAsConst(tiles3)) {
 			writeTile(tile);
 		}
 
@@ -350,7 +350,7 @@
 
 	BackgroundTiles tiles4 = tiles.tiles(3, true);
 
-	if(!tiles4.isEmpty()) {
+	if (!tiles4.isEmpty()) {
 		nbTiles = tiles4.size();
 
 		device()->putChar('\x01');
@@ -360,7 +360,7 @@
 		device()->write(QByteArray(10, '\0')); // Unknown but unused
 		device()->write("\0\0", 2);
 
-		foreach(const Tile &tile, tiles4) {
+		for (const Tile &tile : qAsConst(tiles4)) {
 			writeTile(tile);
 		}
 
@@ -376,7 +376,7 @@
 {
 	Tile ret;
 
-	if(layerID > 0 && tile.textureID2 > 0) {
+	if (layerID > 0 && tile.textureID2 > 0) {
 		ret.srcX = tile.srcX2;
 		ret.srcY = tile.srcY2;
 		ret.textureID = tile.textureID2;
@@ -388,14 +388,14 @@
 	ret.dstX = tile.dstX;
 	ret.dstY = tile.dstY;
 	ret.paletteID = tile.paletteID;
-	if(layerID > 0) {
+	if (layerID > 0) {
 		ret.param = tile.param;
 		ret.state = tile.state;
 		ret.blending = tile.blending;
 	} else {
 		ret.param = ret.state = ret.blending = 0;
 	}
-	switch(layerID) {
+	switch (layerID) {
 	case 0:		ret.ID = 4095;		break;
 	case 2:		ret.ID = 4096;		break;
 	case 3:		ret.ID = 0;			break;
@@ -452,7 +452,7 @@
 	qint64 i;
 	bool isDemoFormat = _demo;
 
-	if(datDataSize < 16) {
+	if (datDataSize < 16) {
 		return false;
 	}
 
@@ -481,8 +481,8 @@
 	quint8 layerID=0;
 
 	i = isDemoFormat ? 12 : 16;
-	while(i < start1) {
-		if(start1 < i+2) {
+	while (i < start1) {
+		if (start1 < i+2) {
 			return false;
 		}
 
@@ -490,12 +490,12 @@
 
 		memcpy(&type, constDatData + i, 2);
 
-		if(type == 0x7FFF) {
+		if (type == 0x7FFF) {
 			nbTilesLayer.append(tilePos + tileCount);
 			++layerID;
 		} else {
-			if(type == 0x7FFE) {
-				if(i - 4 < 16) {
+			if (type == 0x7FFE) {
+				if (i - 4 < 16) {
 					qWarning() << "BackgroundTilesIOPS::readData 0x7FFE positionned too early";
 					return false;
 				}
@@ -505,7 +505,7 @@
 
 				nbTilesTex.append(tilePos + tileCount);
 			} else {
-				if(start1 < i+6) {
+				if (start1 < i+6) {
 					return false;
 				}
 
@@ -532,7 +532,7 @@
 		qWarning() << "BackgroundTilesIOPS::open padding after (1)" << ((start3-start2) % 2);
 	}
 
-	for(i=0 ; i<size ; ++i) {
+	for (i=0; i<size; ++i) {
 		quint16 tile2data; // Note: we can't use bitfields directly
 		memcpy(&tile2data, constDatData + start2+i*2, 2);
 		tile2.page_x = tile2data & 0xF;
@@ -551,16 +551,16 @@
 		qWarning() << "BackgroundTilesIOPS::open padding after (2)" << ((start2-start1) % 8);
 	}
 
-	for(i=0 ; i<size && hasTiles2 ; ++i) {
+	for (i=0; i<size && hasTiles2; ++i) {
 		memcpy(&tile1, constDatData + start1+i*8, 8);
-		if(qAbs(tile1.dstX) < MAX_TILE_DST && qAbs(tile1.dstY) < MAX_TILE_DST) {
+		if (qAbs(tile1.dstX) < MAX_TILE_DST && qAbs(tile1.dstY) < MAX_TILE_DST) {
 			tile.dstX = tile1.dstX;
 			tile.dstY = tile1.dstY;
 			tile.srcX = tile1.srcX;
 			tile.srcY = tile1.srcY;
 			tile.paletteID = (tile1.palID >> 6) & 0xF;
 
-			if(texID+1<tiles2.size() && texID+1<nbTilesTex.size() && tileID>=nbTilesTex.at(texID)) {
+			if (texID+1<tiles2.size() && texID+1<nbTilesTex.size() && tileID>=nbTilesTex.at(texID)) {
 				++texID;
 				tile2 = tiles2.at(texID);
 			}
@@ -590,9 +590,9 @@
 		qWarning() << "BackgroundTilesIOPS::open padding after (3)" << ((start4-start3) % 14);
 	}
 
-	for(i=0 ; i<size ; ++i) {
+	for (i=0; i<size; ++i) {
 		memcpy(&tile1, constDatData + start3+i*14, 8);
-		if(qAbs(tile1.dstX) < MAX_TILE_DST || qAbs(tile1.dstY) < MAX_TILE_DST) {
+		if (qAbs(tile1.dstX) < MAX_TILE_DST || qAbs(tile1.dstY) < MAX_TILE_DST) {
 			tile.dstX = tile1.dstX;
 			tile.dstY = tile1.dstY;
 			tile.srcX = tile1.srcX;
@@ -619,11 +619,13 @@
 			// Used for conversion to PC format 
 			if (tile.ID == 0) {
 				tile.IDBig = 999;
-			} else if (tile.ID < 16) {
+			} else if (tile.ID < 50) { // all: 50 (42480000h) | 466: 1 (3F800000h) | 138: 16 (41800000h) | 139: 30 (41F00000h) | 253: 56 (42600000h) | <= 55???: 512 (44000000h)
 				tile.IDBig = 10000 * tile.ID;
+			} else if (tile.ID >= 4095) {
+				tile.IDBig = 9998999;
 			} else {
 				// FIXME: approximation
-				tile.IDBig = quint32((float(tile.ID) / 4096.0f) * 10000000.0f + i);
+				tile.IDBig = quint32((float(tile.ID) / 4096.0f) * 10000000.0f);
 			}
 
 			tiles.insert(4096 - tile.ID, tile);
@@ -644,9 +646,9 @@
 
 	quint32 j=0;
 
-	for(i=0 ; i<size ; ++i) {
+	for (i=0; i<size; ++i) {
 		memcpy(&tile1, constDatData + start4+i*10, 8);
-		if(qAbs(tile1.dstX) < MAX_TILE_DST || qAbs(tile1.dstY) < MAX_TILE_DST) {
+		if (qAbs(tile1.dstX) < MAX_TILE_DST || qAbs(tile1.dstY) < MAX_TILE_DST) {
 			tile.dstX = tile1.dstX;
 			tile.dstY = tile1.dstY;
 			tile.srcX = tile1.srcX;
@@ -658,12 +660,12 @@
 			tile.param = tile4.param & 0x7F;
 			tile.state = tile4.state;
 
-			if(texID+1<tiles2.size() && texID+1<nbTilesTex.size() && tileID>=nbTilesTex.at(texID)) {
+			if (texID+1<tiles2.size() && texID+1<nbTilesTex.size() && tileID>=nbTilesTex.at(texID)) {
 				++texID;
 				tile2 = tiles2.at(texID);
 			}
 
-			if(layerID+1<nbTilesLayer.size() && tileID>=nbTilesLayer.at(layerID)) {
+			if (layerID+1<nbTilesLayer.size() && tileID>=nbTilesLayer.at(layerID)) {
 				++layerID;
 				j = 0;
 			}
@@ -695,13 +697,13 @@
 {
 	qint64 beginPos = device()->pos();
 
-	if(!device()->seek(beginPos + (_demo ? 12 : 16))) {
+	if (!device()->seek(beginPos + (_demo ? 12 : 16))) {
 		return false;
 	}
 
 	QMultiMap< quint8, QMultiMap< qint16, QMultiMap<qint16, Tile> > > tilesByDst;
 
-	foreach(const Tile &tile, tiles) {
+	for (const Tile &tile : tiles) {
 		QMultiMap< qint16, QMultiMap<qint16, Tile> > tilesByDstY = tilesByDst.value(tile.layerID);
 		QMultiMap<qint16, Tile> tilesByDstX = tilesByDstY.value(tile.dstY);
 		tilesByDstX.insert(tile.dstX, tile);
@@ -712,31 +714,31 @@
 	quint32 pos = 0;
 	qint16 currentLayer = -1;
 	QMapIterator<quint8, QMultiMap< qint16, QMultiMap<qint16, Tile> > > itLayer(tilesByDst);
-	while(itLayer.hasNext()) {
+	while (itLayer.hasNext()) {
 		itLayer.next();
 		quint8 layerID = itLayer.key();
 		const QMultiMap<qint16, QMultiMap<qint16, Tile> > &tilesByDstY = itLayer.value();
 		quint16 line = 0;
 
 		QMapIterator< qint16, QMultiMap<qint16, Tile> > itDstY(tilesByDstY);
-		while(itDstY.hasNext()) {
+		while (itDstY.hasNext()) {
 			itDstY.next();
 			const QMultiMap<qint16, Tile> &tilesByDstX = itDstY.value();
 
-			foreach(qint16 dstX, tilesByDstX.keys()) {
+			for (qint16 dstX : tilesByDstX.keys()) {
 				int count = tilesByDstX.count(dstX);
 
-				if(pos > 65535) {
+				if (pos > 65535) {
 					qWarning() << "BackgroundTilesIOPS::writeData Tile pos overflow" << pos;
 					return false;
 				}
-				if(count > 65535 || count < 0) {
+				if (count > 65535 || count < 0) {
 					qWarning() << "BackgroundTilesIOPS::writeData Tile count overflow" << count;
 					return false;
 				}
 
 				// Separation between layers
-				if(currentLayer >= 0 && layerID != currentLayer) {
+				if (currentLayer >= 0 && layerID != currentLayer) {
 					quint16 flag = 0x7FFF;
 					device()->write((char *)&flag, 2);
 					// Infos about the next tile
@@ -752,7 +754,7 @@
 			}
 
 			// Separation between Y (only when several lines)
-			if(tilesByDstY.keys().size() > 1) {
+			if (tilesByDstY.keys().size() > 1) {
 				quint16 flag = 0x7FFE;
 				device()->write((char *)&flag, 2);
 				device()->write((char *)&line, 2);
@@ -780,21 +782,21 @@
 	qint16 dstY;
 	bool firstTurn = true;
 
-	foreach(const Tile &tile, tiles.tiles(0, true)) {
+	for (const Tile &tile : tiles.tiles(0, true)) {
 		writeTileBase(tile);
 
-		if(firstTurn || tile.dstY != dstY) {
+		if (firstTurn || tile.dstY != dstY) {
 			tiles2.append(tile);
 			dstY = tile.dstY;
 			firstTurn = false;
 		}
 	}
 
-	if(!_demo) {
+	if (!_demo) {
 		// Collect tiles2 for layers 2 and 3
 		firstTurn = true;
-		foreach(const Tile &tile, tilesLayers2And3) {
-			if(firstTurn || tile.dstY != dstY) {
+		for (const Tile &tile : qAsConst(tilesLayers2And3)) {
+			if (firstTurn || tile.dstY != dstY) {
 				tiles2.append(tile);
 				dstY = tile.dstY;
 				firstTurn = false;
@@ -804,34 +806,34 @@
 
 	positions[1] = device()->pos();
 
-	foreach(const Tile &tile, tiles2) {
+	for (const Tile &tile : tiles2) {
 		writeTileTex(tile);
 	}
 
 	positions[2] = device()->pos();
 
-	foreach(const Tile &tile, tiles.tiles(1, true)) {
+	for (const Tile &tile : tiles.tiles(1, true)) {
 		writeTileBase(tile);
 		writeTileTex(tile);
 		writeTileID(tile);
 		writeTileParam(tile);
 	}
 
-	if(!_demo) {
+	if (!_demo) {
 		positions[3] = device()->pos();
 
-		foreach(const Tile &tile, tilesLayers2And3) {
+		for (const Tile &tile : qAsConst(tilesLayers2And3)) {
 			writeTileBase(tile);
 			writeTileParam(tile);
 		}
 	}
 
 	// Write pointers to sections
-	if(!device()->seek(beginPos)) {
+	if (!device()->seek(beginPos)) {
 		return false;
 	}
 
-	foreach(quint32 pos, positions) {
+	for (quint32 pos : qAsConst(positions)) {
 		device()->write((char *)&pos, 4);
 	}
 
diff -Nru makoureactor-1.7.2/core/field/BsxFile.cpp makoureactor-1.8.0/core/field/BsxFile.cpp
--- makoureactor-1.7.2/core/field/BsxFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/BsxFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -159,7 +159,7 @@
 
 	QList<QRect> rects;
 
-	foreach (const BsxTextureHeader &h, headers) {
+	for (const BsxTextureHeader &h : qAsConst(headers)) {
 		rects.append(QRect(h.vramX, h.vramY,
 						   h.width, h.height));
 	}
@@ -289,7 +289,7 @@
 
 bool BsxFile::readMesh(const QList<FieldModelPartPSHeader> &partsHeaders, FieldModelSkeleton &skeleton) const
 {
-	foreach (const FieldModelPartPSHeader &header, partsHeaders) {
+	for (const FieldModelPartPSHeader &header : partsHeaders) {
 		FieldModelPart *part = new FieldModelPart();
 
 		if (!readPart(header, part)) {
@@ -516,7 +516,7 @@
 		for (quint8 j = 0; j < 4; ++j) {
 			quint8 vertexIndex = monochromeTexturedQuad.vertexIndex[j];
 			quint8 texCoordIndex = monochromeTexturedQuad.texCoordId[j];
-			if(vertexIndex < vertices.size() && texCoordIndex < texCoords.size()) {
+			if (vertexIndex < vertices.size() && texCoordIndex < texCoords.size()) {
 				polyVertices.append(vertices.at(vertexIndex));
 				polyTexCoords.append(texCoords.at(texCoordIndex));
 			} else {
@@ -678,7 +678,7 @@
 
 		for (quint8 j = 0; j < 4; ++j) {
 			quint8 vertexIndex = colorQuad.vertexIndex[j];
-			if(vertexIndex < vertices.size()) {
+			if (vertexIndex < vertices.size()) {
 				polyVertices.append(vertices.at(vertexIndex));
 				const ColorRGBA &color = colorQuad.color[j];
 				polyColors.append(qRgb(color.red, color.green, color.blue));
@@ -719,7 +719,7 @@
 bool BsxFile::readAnimations(const QList<FieldModelAnimationPSHeader> &animationHeaders,
 							 QList<FieldModelAnimation> &animations) const
 {
-	foreach (const FieldModelAnimationPSHeader &header, animationHeaders) {
+	for (const FieldModelAnimationPSHeader &header : animationHeaders) {
 		FieldModelAnimation animation;
 
 		if (!readAnimation(header, animation)) {
@@ -922,7 +922,7 @@
 {
 	qint64 offsetTextures = _offsetModels + _offsetTextures;
 
-	foreach (const BsxTextureHeader &header, headers) {
+	for (const BsxTextureHeader &header : headers) {
 		if (device()->pos() != offsetTextures + header.offsetData) {
 			qWarning() << "BsxFile::readTexturesData error pos" << _offsetModels << _offsetTextures << header.offsetData << device()->pos();
 			return false;
diff -Nru makoureactor-1.7.2/core/field/CaFile.cpp makoureactor-1.8.0/core/field/CaFile.cpp
--- makoureactor-1.7.2/core/field/CaFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/CaFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -23,6 +23,26 @@
 {
 }
 
+void CaFile::initEmpty()
+{
+	cameras.clear();
+	Camera ca = Camera();
+	ca.camera_axis[0].x = 4094;
+	ca.camera_axis[0].y = -101;
+	ca.camera_axis[0].z = -1;
+	ca.camera_axis[1].x = -59;
+	ca.camera_axis[1].y = -2390;
+	ca.camera_axis[1].z = -3327;
+	ca.camera_axis[2].x = 81;
+	ca.camera_axis[2].y = 3325;
+	ca.camera_axis[2].z = -2391;
+	ca.camera_position[0] = -42;
+	ca.camera_position[1] = -255;
+	ca.camera_position[2] = 1476;
+	ca.camera_zoom = 525;
+	cameras.append(ca);
+}
+
 bool CaFile::open()
 {
 	return open(field()->sectionData(Field::Camera));
@@ -34,14 +54,14 @@
 	int caSize = data.size();
 	bool isPC;
 
-	if(sizeof(Camera) != 40) {
+	if (sizeof(Camera) != 40) {
 		qWarning() << "sizeof ca struct error" << sizeof(Camera);
 		return false;
 	}
 
-	if(caSize == 40 || ((caSize - 38) > 0 && (caSize - 38) % 18 == 0)) {
+	if (caSize == 40 || ((caSize - 38) > 0 && (caSize - 38) % 18 == 0)) {
 		isPC = false;
-	} else if(caSize == 38 || caSize % 38 == 0) {
+	} else if (caSize == 38 || caSize % 38 == 0) {
 		isPC = true;
 	} else {
 		qWarning() << "invalid ca size" << caSize;
@@ -56,20 +76,20 @@
 	memcpy(&camera, constData, caSize != 40 ? 38 : 40);
 	cameras.append(camera);
 
-	if(caSize > 40) {
+	if (caSize > 40) {
 		/* The structure can be partially filled
 		 * In that case, values of the first camera
 		 * are implicitly used to complete. */
 		quint32 caCount;
-		if(isPC) {
+		if (isPC) {
 			caCount = caSize/38;
-			for(quint32 i=1 ; i<caCount ; ++i) {
+			for (quint32 i=1; i<caCount; ++i) {
 				memcpy(&camera, constData + i * 38, 38);
 				cameras.append(camera);
 			}
 		} else {
 			caCount = (caSize - 38) / 18;
-			for(quint32 i=0 ; i<caCount ; ++i) {
+			for (quint32 i=0; i<caCount; ++i) {
 				memcpy(&camera, constData + 38 + i * 18, 18);
 				cameras.append(camera);
 			}
@@ -87,9 +107,9 @@
 
 	// Camera(s)
 	int camId = 0;
-	foreach(Camera camera, cameras) {
+	for (Camera camera : cameras) {
 
-		if(field()->isPS() && camId > 0) {
+		if (field()->isPS() && camId > 0) {
 			ca.append((char *)&camera, 18);
 		} else {
 			camera.camera_axis2z = camera.camera_axis[2].z;
@@ -136,7 +156,7 @@
 
 bool CaFile::removeCamera(int camID)
 {
-	if(cameras.size() > 1) {
+	if (cameras.size() > 1) {
 		cameras.removeAt(camID);
 		setModified(true);
 		return true;
diff -Nru makoureactor-1.7.2/core/field/CaFile.h makoureactor-1.8.0/core/field/CaFile.h
--- makoureactor-1.7.2/core/field/CaFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/CaFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -38,6 +38,7 @@
 {
 public:
 	explicit CaFile(Field *field);
+	void initEmpty();
 	bool open();
 	bool open(const QByteArray &data);
 	QByteArray save() const;
diff -Nru makoureactor-1.7.2/core/field/CharArchive.cpp makoureactor-1.8.0/core/field/CharArchive.cpp
--- makoureactor-1.7.2/core/field/CharArchive.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/CharArchive.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -1,15 +1,29 @@
 #include "CharArchive.h"
+#include "AFile.h"
 #include "Data.h"
 
-CharArchive::CharArchive()
+CharArchive::CharArchive() :
+    _io(new Lgp()), _delete(true)
+{
+}
+
+CharArchive::CharArchive(Lgp *io) :
+      _io(io), _delete(false)
 {
 }
 
 CharArchive::CharArchive(const QString &filename) :
-	_io(filename)
+      _io(new Lgp(filename)), _delete(true)
 {
 }
 
+CharArchive::~CharArchive()
+{
+	if (_delete) {
+		delete _io;
+	}
+}
+
 CharArchive *CharArchive::_instance = 0;
 
 CharArchive *CharArchive::instance()
@@ -25,8 +39,8 @@
 
 void CharArchive::close()
 {
-	_io.clear();
-	_io.close();
+	_io->clear();
+	_io->close();
 	_animBoneCount.clear();
 }
 
@@ -34,8 +48,8 @@
 {
 	QStringList files;
 
-	foreach(const QString &file, _io.fileList()) {
-		if(file.endsWith(".hrc", Qt::CaseInsensitive)) {
+	for (const QString &file : _io->fileList()) {
+		if (file.endsWith(".hrc", Qt::CaseInsensitive)) {
 			files.append(file.toUpper());
 		}
 	}
@@ -45,14 +59,14 @@
 
 QStringList CharArchive::aFiles(int boneCount)
 {
-	if(boneCount >= 0 && openAnimBoneCount()) {
+	if (boneCount >= 0 && openAnimBoneCount()) {
 		return _animBoneCount.values(boneCount);
 	}
 
 	QStringList files;
 
-	foreach(const QString &file, _io.fileList()) {
-		if(file.endsWith(".a", Qt::CaseInsensitive)) {
+	for (const QString &file : _io->fileList()) {
+		if (file.endsWith(".a", Qt::CaseInsensitive)) {
 			files.append(file.left(file.size()-2).toUpper());
 		}
 	}
@@ -62,7 +76,7 @@
 
 QIODevice *CharArchive::fileIO(const QString &filename)
 {
-	return _io.file(filename.toLower());
+	return _io->file(filename.toLower());
 }
 
 bool CharArchive::openAnimBoneCount()
@@ -74,21 +88,22 @@
 
 	_animBoneCount.clear();
 
-	LgpIterator it = _io.iterator();
-	while(it.hasNext()) {
+	LgpIterator it = _io->iterator();
+	while (it.hasNext()) {
 		it.next();
 		const QString &fileName = it.fileName();
-		if(fileName.endsWith(".a", Qt::CaseInsensitive)) {
-			QCoreApplication::processEvents();
+		if (fileName.endsWith(".a", Qt::CaseInsensitive)) {
 			QIODevice *aFile = it.file();
-			if(aFile && aFile->open(QIODevice::ReadOnly)) {
-				quint32 boneCount;
-				if(!aFile->seek(8) ||
-						aFile->read((char *)&boneCount, 4) != 4) {
+			if (aFile && aFile->open(QIODevice::ReadOnly)) {
+				AFile a(aFile);
+				AHeader header;
+
+				if (!a.readHeader(header)) {
 					qWarning() << "CharArchive::openAnimBoneCount" << "animation error" << fileName;
 					continue;
 				}
-				_animBoneCount.insert(boneCount, fileName.left(fileName.size()-2).toUpper());
+
+				_animBoneCount.insert(header.boneCount, fileName.left(fileName.size()-2).toUpper());
 			} else {
 				return false;
 			}
diff -Nru makoureactor-1.7.2/core/field/CharArchive.h makoureactor-1.8.0/core/field/CharArchive.h
--- makoureactor-1.7.2/core/field/CharArchive.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/CharArchive.h	2020-08-08 18:46:56.000000000 +0000
@@ -7,22 +7,24 @@
 {
 public:
 	CharArchive();
+	explicit CharArchive(Lgp *io);
 	explicit CharArchive(const QString &filename);
+	virtual ~CharArchive();
 
 	static CharArchive *instance();
 
 	inline bool isOpen() const {
-		return _io.isOpen();
+		return _io->isOpen();
 	}
 	inline bool open() {
-		return _io.open();
+		return _io->open();
 	}
 	void close();
 	inline QString filename() const {
-		return _io.fileName();
+		return _io->fileName();
 	}
 	inline void setFilename(const QString &filename) {
-		_io.setFileName(filename);
+		_io->setFileName(filename);
 	}
 	QStringList hrcFiles() const;
 	QStringList aFiles(int boneCount = -1);
@@ -30,8 +32,9 @@
 
 private:
 	bool openAnimBoneCount();
-	Lgp _io;
+	Lgp *_io;
 	QMultiHash<int, QString> _animBoneCount;
+	bool _delete;
 	static CharArchive *_instance;
 };
 
diff -Nru makoureactor-1.7.2/core/field/EncounterFile.cpp makoureactor-1.8.0/core/field/EncounterFile.cpp
--- makoureactor-1.7.2/core/field/EncounterFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/EncounterFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -23,6 +23,12 @@
 {
 }
 
+void EncounterFile::initEmpty()
+{
+	tables[0] = EncounterTable();
+	tables[1] = EncounterTable();
+}
+
 bool EncounterFile::open()
 {
 	return open(field()->sectionData(Field::Encounter));
@@ -30,12 +36,12 @@
 
 bool EncounterFile::open(const QByteArray &data)
 {
-	if(sizeof(EncounterTable) != 24) {
+	if (sizeof(EncounterTable) != 24) {
 		qWarning() << "Encounter invalid struct size" << sizeof(EncounterTable);
 		Q_ASSERT(false);
 	}
 
-	if(data.size() != 48) {
+	if (data.size() != 48) {
 		qWarning() << "Encounter invalid data size" << data.size();
 		return false;
 	}
diff -Nru makoureactor-1.7.2/core/field/EncounterFile.h makoureactor-1.8.0/core/field/EncounterFile.h
--- makoureactor-1.7.2/core/field/EncounterFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/EncounterFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -40,6 +40,7 @@
 	};
 
 	explicit EncounterFile(Field *field);
+	void initEmpty();
 	bool open();
 	bool open(const QByteArray &data);
 	QByteArray save() const;
diff -Nru makoureactor-1.7.2/core/field/FieldArchive.cpp makoureactor-1.8.0/core/field/FieldArchive.cpp
--- makoureactor-1.7.2/core/field/FieldArchive.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchive.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,35 +19,56 @@
 #include "FieldPS.h"
 #include "FieldPC.h"
 #include "Data.h"
+#include "core/PsfFile.h"
+#include "Parameters.h"
 
 FieldArchiveIterator::FieldArchiveIterator(const FieldArchive &archive) :
-	QListIterator<Field *>(archive.fileList)
+    QMapIterator<int, Field *>(archive.fileList), mapList(archive.fileList)
 {
 }
 
+bool FieldArchiveIterator::seek(int mapId)
+{
+	toFront();
+
+	if (mapId < 0) {
+		return true;
+	}
+
+	Field *f = mapList.value(mapId);
+	if (nullptr != f && findNext(f)) {
+		previous();
+		return true;
+	}
+
+	toFront();
+
+	return false;
+}
+
 Field *FieldArchiveIterator::next(bool open, bool dontOptimize)
 {
-	return openField(QListIterator<Field *>::next(), open, dontOptimize);
+	return openField(QMapIterator<int, Field *>::next().value(), open, dontOptimize);
 }
 
 Field *FieldArchiveIterator::peekNext(bool open, bool dontOptimize) const
 {
-	return openField(QListIterator<Field *>::peekNext(), open, dontOptimize);
+	return openField(QMapIterator<int, Field *>::peekNext().value(), open, dontOptimize);
 }
 
 Field *FieldArchiveIterator::peekPrevious(bool open, bool dontOptimize) const
 {
-	return openField(QListIterator<Field *>::peekPrevious(), open, dontOptimize);
+	return openField(QMapIterator<int, Field *>::peekPrevious().value(), open, dontOptimize);
 }
 
 Field *FieldArchiveIterator::previous(bool open, bool dontOptimize)
 {
-	return openField(QListIterator<Field *>::previous(), open, dontOptimize);
+	return openField(QMapIterator<int, Field *>::previous().value(), open, dontOptimize);
 }
 
 Field *FieldArchiveIterator::openField(Field *field, bool open, bool dontOptimize)
 {
-	if(field != NULL && open && !field->isOpen()) {
+	if (field != nullptr && open && !field->isOpen()) {
 		field->open(dontOptimize);
 	}
 	return field;
@@ -69,28 +90,28 @@
 FieldArchive::~FieldArchive()
 {
 	qDeleteAll(fileList);
-	if(_io)		delete _io;
+	if (_io)		delete _io;
 }
 
 FieldArchiveIO::ErrorCode FieldArchive::open()
 {
-	if(!_io)	return FieldArchiveIO::Invalid;
+	if (!_io)	return FieldArchiveIO::Invalid;
 //	qDebug() << "FieldArchive::open()";
 	clear();
 
 	FieldArchiveIO::ErrorCode error = _io->open(observer());
-	if(error != FieldArchiveIO::Ok) {
+	if (error != FieldArchiveIO::Ok) {
 		return error;
 	}
 
-	if(fileList.isEmpty())	return FieldArchiveIO::FieldNotFound;
+	if (fileList.isEmpty())	return FieldArchiveIO::FieldNotFound;
 
-	if(Data::field_names.isEmpty()) {
+	if (Data::maplist().isEmpty()) {
 		Data::openMaplist(_io->isPC());
 	}
 
 	int fieldID=0;
-	foreach(Field *f, fileList) {
+	for (Field *f : qAsConst(fileList)) {
 		updateFieldLists(f, fieldID);
 		++fieldID;
 	}
@@ -102,10 +123,10 @@
 
 FieldArchiveIO::ErrorCode FieldArchive::save(const QString &path)
 {
-	if(!_io)	return FieldArchiveIO::Invalid;
+	if (!_io)	return FieldArchiveIO::Invalid;
 
 	FieldArchiveIO::ErrorCode error = _io->save(path, observer());
-	if(error == FieldArchiveIO::Ok) {
+	if (error == FieldArchiveIO::Ok) {
 		// Clear "isModified" state
 		setSaved();
 	}
@@ -114,7 +135,7 @@
 
 void FieldArchive::close()
 {
-	if(_io)	_io->close();
+	if (_io)	_io->close();
 }
 
 void FieldArchive::clear()
@@ -122,8 +143,7 @@
 	qDeleteAll(fileList);
 	fileList.clear();
 	fieldsSortByName.clear();
-	fieldsSortByMapId.clear();
-	Data::field_names.clear();
+	Data::setMaplist(QStringList());
 }
 
 FieldArchiveIO *FieldArchive::io() const
@@ -138,7 +158,7 @@
 
 bool FieldArchive::openField(Field *field, bool dontOptimize)
 {
-	if(!field->isOpen()) {
+	if (!field->isOpen()) {
 		return field->open(dontOptimize);
 	}
 	return true;
@@ -149,16 +169,16 @@
 	return fieldsSortByName.value(name.toLower(), -1);
 }
 
-const Field *FieldArchive::field(quint32 id) const
+const Field *FieldArchive::field(quint32 mapId) const
 {
-	return fileList.value(id, NULL);
+	return fileList.value(mapId, nullptr);
 }
 
-Field *FieldArchive::field(quint32 id, bool open, bool dontOptimize)
+Field *FieldArchive::field(quint32 mapId, bool open, bool dontOptimize)
 {
-	Field *field = fileList.value(id, NULL);
-	if(field!=NULL && open && !openField(field, dontOptimize)) {
-		return NULL;
+	Field *field = fileList.value(mapId, nullptr);
+	if (field != nullptr && open && !openField(field, dontOptimize)) {
+		return nullptr;
 	}
 	return field;
 }
@@ -173,74 +193,83 @@
 	return field(indexOfField(name), open, dontOptimize);
 }
 
-void FieldArchive::updateFieldLists(Field *field, int fieldID)
+void FieldArchive::updateFieldLists(Field *field, int mapId)
 {
-	const QString &name = field->name();
-
-	int index = Data::field_names.indexOf(name);
-	QString mapId = index != -1 ?
-				QString("%1").arg(index, 3) :
-				"~";
-
-	fieldsSortByName.insert(name.toLower(), fieldID);
-	fieldsSortByMapId.insert(mapId, fieldID);
+	fieldsSortByName.insert(field->name().toLower(), mapId);
 }
 
-FieldArchiveIO::ErrorCode FieldArchive::addField(Field *field,
-                                                 const QString &fileName,
-                                                 int &fieldId)
+void FieldArchive::addNewField(Field *field, int &mapID)
 {
-	fieldId = fileList.size();
-	/* FieldArchiveIO::ErrorCode err = _io->addField(fileName, field->name());
-	if(err != FieldArchiveIO::Ok) {
-		return err;
-	}*/
-	appendField(field);
-	// FIXME: choose another name? Multiple fields with the same name
-	Data::field_names.append(field->name());
-	updateFieldLists(field, fieldId);
-	return FieldArchiveIO::Ok;
+	mapID = appendField(field);
+	Data::addMap(field->name());
+	updateFieldLists(field, mapID);
 }
 
-void FieldArchive::appendField(Field *field)
+void FieldArchive::delField(int mapId)
 {
-	fileList.append(field);
+	Field *field = fileList.value(mapId);
+
+	if (nullptr == field) {
+		return;
+	}
+
+	QStringList maplist = Data::maplist();
+
+	for (int i = 0; i < maplist.size(); ++i) {
+		if (maplist.at(i) == field->name()) {
+			Data::setMap(i, "");
+		}
+	}
+
+	fileList.insert(mapId, nullptr);
+	delete field;
 }
 
-void FieldArchive::removeField(quint32 id)
+int FieldArchive::appendField(Field *field)
 {
-	fileList.removeAt(id);
+	int mapId = Data::maplist().indexOf(field->name());
+	if (mapId < 0) {
+		mapId = 1200 + (fileList.isEmpty() ? 0 : fileList.lastKey() + 1);
+	}
+	fileList.insert(mapId, field);
+	return mapId;
 }
 
 bool FieldArchive::isAllOpened() const
 {
-	foreach(Field *f, fileList) {
-		if(!f->isOpen())	return false;
+	for (Field *f : fileList) {
+		if (!f->isOpen()) {
+			return false;
+		}
 	}
+
 	return true;
 }
 
 bool FieldArchive::isModified() const
 {
-	foreach(Field *f, fileList) {
-		if(f->isModified())	return true;
+	for (Field *f : fileList) {
+		if (f->isModified()) {
+			return true;
+		}
 	}
+
 	return false;
 }
 
 QList<FF7Var> FieldArchive::searchAllVars(QMap<FF7Var, QSet<QString> > &fieldNames)
 {
-	Q_UNUSED(fieldNames)
 	QList<FF7Var> vars;
-	int size = fileList.size();
+	FieldArchiveIterator it(*this);
 
-	for(int i=0 ; i<size ; ++i) {
-		QCoreApplication::processEvents();
-		Field *field = this->field(i);
-		if(field != NULL) {
+	while (it.hasNext()) {
+		Field *field = it.next();
+
+		if (field != nullptr) {
 			QList<FF7Var> fieldVars;
 			field->scriptsAndTexts()->searchAllVars(fieldVars);
-			foreach (const FF7Var &fieldVar, fieldVars) {
+
+			for (const FF7Var &fieldVar : qAsConst(fieldVars)) {
 				QSet<QString> names = fieldNames.value(fieldVar);
 				names.insert(field->scriptsAndTexts()->author());
 				fieldNames.insert(fieldVar, names);
@@ -262,25 +291,28 @@
 
 void FieldArchive::validateAsk()
 {
-	foreach(int i, fieldsSortByMapId) {
-		Field *f = field(i, true);
-		QString name = Data::field_names.value(fieldsSortByMapId.key(i).toInt());
-		if(f == NULL) {
-			qWarning() << "FieldArchive::printAkaos: cannot open field" << i << name;
+	FieldArchiveIterator it(*this);
+
+	while (it.hasNext()) {
+		Field *f = it.next();
+
+		if (f == nullptr) {
+			qWarning() << "FieldArchive::printAkaos: cannot open field" << it.mapId();
 			continue;
 		}
 
+		QString name = f->name();
+
 		Section1File *scriptsAndTexts = f->scriptsAndTexts();
-		if(scriptsAndTexts->isOpen()) {
-			//qWarning() << f->name();
+		if (scriptsAndTexts->isOpen()) {
 
 			int grpScriptID = 0;
-			foreach(GrpScript *grp, scriptsAndTexts->grpScripts()) {
+			for (GrpScript *grp : scriptsAndTexts->grpScripts()) {
 				int scriptID = 0;
-				foreach(Script *script, grp->scripts()) {
+				for (Script *script : grp->scripts()) {
 					int opcodeID = 0;
-					foreach(Opcode *opcode, script->opcodes()) {
-						if(opcode->id() == Opcode::ASK) {
+					for (Opcode *opcode : script->opcodes()) {
+						if (opcode->id() == Opcode::ASK) {
 							OpcodeASK *opcodeASK = static_cast<OpcodeASK *>(opcode);
 							quint8 textID = opcodeASK->textID,
 									firstLine = opcodeASK->firstLine,
@@ -290,7 +322,7 @@
 								if (!text.isEmpty()) {
 									int lineNum = 0, autoFirstLine = -1, autoLastLine = -1;
 									bool hasChoice = false;
-									foreach (const QString &line, text.split('\n')) {
+									for (const QString &line : text.split('\n')) {
 										if (line.startsWith("{CHOICE}")) {
 											if (!hasChoice) {
 												if (autoFirstLine == -1) {
@@ -315,13 +347,13 @@
 
 									if (autoFirstLine == -1) {
 										qWarning() << QString("%1 > %2 > %3 > %4: No {CHOICE} here (textID: %9)")
-													  .arg(f->name(), grp->name(), grp->scriptName(scriptID))
+													  .arg(name, grp->name(), grp->scriptName(scriptID))
 													  .arg(opcodeID + 1)
 													  .arg(textID).toLatin1().data();
 									} else if (autoFirstLine != firstLine
 											|| autoLastLine != lastLine) {
 										qWarning() << QString("%1 > %2 > %3 > %4: %5 should be %6, %7 should be %8 (textID: %9)")
-													  .arg(f->name(), grp->name(), grp->scriptName(scriptID))
+													  .arg(name, grp->name(), grp->scriptName(scriptID))
 													  .arg(opcodeID + 1)
 													  .arg(firstLine).arg(autoFirstLine)
 													  .arg(lastLine).arg(autoLastLine)
@@ -345,30 +377,33 @@
 void FieldArchive::validateOneLineSize()
 {
 	TextPreview tp; // Init textpreview to use autodim algo
+	FieldArchiveIterator it(*this);
 
-	foreach(int i, fieldsSortByMapId) {
-		Field *f = field(i, true);
-		QString name = Data::field_names.value(fieldsSortByMapId.key(i).toInt());
-		if(f == NULL) {
-			qWarning() << "FieldArchive::printAkaos: cannot open field" << i << name;
+	while (it.hasNext()) {
+		Field *f = it.next();
+
+		if (f == nullptr) {
+			qWarning() << "FieldArchive::printAkaos: cannot open field" << it.mapId();
 			continue;
 		}
 
+		QString name = f->name();
+
 		Section1File *scriptsAndTexts = f->scriptsAndTexts();
-		if(scriptsAndTexts->isOpen()) {
+		if (scriptsAndTexts->isOpen()) {
 			//qWarning() << f->name();
 
 			int grpScriptID = 0;
-			foreach(GrpScript *grp, scriptsAndTexts->grpScripts()) {
+			for (GrpScript *grp : scriptsAndTexts->grpScripts()) {
 				int scriptID = 0;
-				foreach(Script *script, grp->scripts()) {
+				for (Script *script : grp->scripts()) {
 					int opcodeID = 0;
 					OpcodeWindow *opcodeWindow = 0;
-					foreach(Opcode *opcode, script->opcodes()) {
-						if(opcode->id() == Opcode::WSIZW
+					for (Opcode *opcode : script->opcodes()) {
+						if (opcode->id() == Opcode::WSIZW
 								|| opcode->id() == Opcode::WINDOW) {
 							opcodeWindow = static_cast<OpcodeWindow *>(opcode);
-						} else if(opcode->getTextID() >= 0 && opcodeWindow) {
+						} else if (opcode->getTextID() >= 0 && opcodeWindow) {
 							FF7Window window;
 							opcodeWindow->getWindow(window);
 							if (opcode->getTextID() < scriptsAndTexts->textCount()) {
@@ -395,22 +430,23 @@
 {
 	QFile deb(filename);
 	deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+	FieldArchiveIterator it(*this);
 
-	foreach(int i, fieldsSortByMapId) {
-		Field *f = field(i, true);
-		if(f == NULL) {
-			qWarning() << "FieldArchive::printAkaos: cannot open field" << i;
+	while (it.hasNext()) {
+		Field *f = it.next();
+		if (f == nullptr) {
+			qWarning() << "FieldArchive::printAkaos: cannot open field" << it.mapId();
 			continue;
 		}
 		QString name = f->inf()->mapName();
 
 		TutFileStandard *tutosAndSounds = f->tutosAndSounds();
-		if(!tutosAndSounds->isOpen()) {
+		if (!tutosAndSounds->isOpen()) {
 			qWarning() << "FieldArchive::printAkaos: cannot open tutos and sounds" << name;
 		}
 
-		for(int akaoID=0; akaoID < tutosAndSounds->size(); ++akaoID) {
-			if(tutosAndSounds->isTut(akaoID)) {
+		for (int akaoID=0; akaoID < tutosAndSounds->size(); ++akaoID) {
+			if (tutosAndSounds->isTut(akaoID)) {
 				deb.write(QString("%1 > tuto %2\n")
 						  .arg(name)
 						  .arg(akaoID)
@@ -430,11 +466,12 @@
 {
 	QFile deb(filename);
 	deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+	FieldArchiveIterator it(*this);
 
-	foreach(int i, fieldsSortByMapId) {
-		Field *f = field(i, true);
-		if(f == NULL) {
-			qWarning() << "FieldArchive::printModelLoaders: cannot open field" << i;
+	while (it.hasNext()) {
+		Field *f = it.next();
+		if (f == nullptr) {
+			qWarning() << "FieldArchive::printModelLoaders: cannot open field" << it.mapId();
 			continue;
 		}
 		if (!f->inf()->isOpen()) {
@@ -444,7 +481,7 @@
 		QString name = f->inf()->mapName();
 
 		FieldModelLoader *modelLoader = f->fieldModelLoader();
-		if(!modelLoader->isOpen()) {
+		if (!modelLoader->isOpen()) {
 			qWarning() << "FieldArchive::printModelLoaders: cannot open tutos and sounds" << name;
 			continue;
 		}
@@ -458,11 +495,11 @@
 				if (f->isPC()) {
 					FieldModelLoaderPC *modelLoaderPC = static_cast<FieldModelLoaderPC *>(modelLoader);
 					scale = modelLoaderPC->scale(modelId);
-					colors = modelLoaderPC->lightColors(modelId);
+					// colors = modelLoaderPC->lightColors(modelId);
 				} else {
 					FieldModelFilePS *fieldModelPS = static_cast<FieldModelFilePS *>(fieldModel);
 					scale = fieldModelPS->scale();
-					colors = fieldModelPS->lightColors();
+					// colors = fieldModelPS->lightColors();
 					boneCount -= 1;
 					if (boneCount <= 0) {
 						boneCount = 1;
@@ -476,7 +513,7 @@
 						  .arg(modelLoader->unknown(modelId))
 						  .toLatin1());
 
-				/* foreach (const QRgb &color, colors) {
+				/* for (const QRgb &color : colors) {
 					deb.write(QString("%1, ")
 							  .arg(color).toLatin1());
 				}
@@ -488,11 +525,11 @@
 							  .toLatin1());
 				}*/
 			}
-		} else if(f->isPC()) {
+		} else if (f->isPC()) {
 			FieldModelLoaderPC *modelLoaderPC = static_cast<FieldModelLoaderPC *>(modelLoader);
 
 			int modelID = 0;
-			foreach(const QString &hrc, modelLoaderPC->HRCNames()) {
+			for (const QString &hrc : modelLoaderPC->HRCNames()) {
 				deb.write(QString("%1 > model %2: %3\n")
 						  .arg(name)
 						  .arg(modelID)
@@ -500,7 +537,7 @@
 						  .toLatin1());
 
 				int animID = 0;
-				foreach(const QString &a, modelLoaderPC->ANames(modelID)) {
+				for (const QString &a : modelLoaderPC->ANames(modelID)) {
 					deb.write(QString("\tanim %1: %2\n")
 							  .arg(animID)
 							  .arg(a.toLower().left(a.lastIndexOf('.')))
@@ -514,28 +551,71 @@
 	}
 }
 
-void FieldArchive::printTexts(const QString &filename)
+void FieldArchive::printTexts(const QString &filename, bool usedTexts)
 {
 	QFile deb(filename);
 	deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+	FieldArchiveIterator it(*this);
 
-	foreach(int i, fieldsSortByMapId) {
-		Field *f = field(i, true);
-		if(f == NULL) {
-			qWarning() << "FieldArchive::printTexts: cannot open field" << i;
+	while (it.hasNext()) {
+		Field *f = it.next();
+		if (f == nullptr) {
+			qWarning() << "FieldArchive::printTexts: cannot open field" << it.mapId();
 			continue;
 		}
 
 		Section1File *scriptsAndTexts = f->scriptsAndTexts();
-		if(scriptsAndTexts->isOpen()) {
+		if (scriptsAndTexts->isOpen()) {
 			qWarning() << f->inf()->mapName();
+			QSet<quint8> listUsedTexts = usedTexts ? scriptsAndTexts->listUsedTexts() : QSet<quint8>();
 
-			int textID = 0;
-			foreach(const FF7Text &text, scriptsAndTexts->texts()) {
-				deb.write(QString("%1 > %2:\n%3\n\n")
-						  .arg(f->inf()->mapName())
-						  .arg(textID)
-						  .arg(text.text(false)).toUtf8());
+			deb.write(QString("\n=== %1 ===\n\n")
+			          .arg(f->inf()->mapName()).toUtf8());
+
+			quint8 textID = 0;
+			for (const FF7Text &text : scriptsAndTexts->texts()) {
+				if ((!usedTexts || listUsedTexts.contains(textID)) && !text.data().isEmpty()) {
+					deb.write(QString("%1\n\n")
+					          .arg(text.text(false)).toUtf8());
+				}
+				textID++;
+			}
+		}
+	}
+}
+
+void FieldArchive::printTextsDir(const QString &dirname, bool usedTexts)
+{
+	QDir dir(dirname);
+
+	if (!dir.exists()) {
+		dir.mkpath(dirname);
+	}
+
+	FieldArchiveIterator it(*this);
+
+	while (it.hasNext()) {
+		Field *f = it.next();
+
+		if (f == nullptr) {
+			qWarning() << "FieldArchive::printTexts: cannot open field" << it.mapId();
+			continue;
+		}
+
+		QFile deb(dir.filePath(f->name() + ".txt"));
+		deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+
+		Section1File *scriptsAndTexts = f->scriptsAndTexts();
+		if (scriptsAndTexts->isOpen()) {
+			qWarning() << f->inf()->mapName();
+			QSet<quint8> listUsedTexts = usedTexts ? scriptsAndTexts->listUsedTexts() : QSet<quint8>();
+
+			quint8 textID = 0;
+			for (const FF7Text &text : scriptsAndTexts->texts()) {
+				if (!usedTexts || listUsedTexts.contains(textID)) {
+					deb.write(QString("%1\n\n")
+					          .arg(text.text(false)).toUtf8());
+				}
 				textID++;
 			}
 		}
@@ -558,19 +638,19 @@
 	FieldArchiveIterator it(*this);
 	while (it.hasNext()) {
 		Field *f1 = it.next();
-		if(f1 == NULL) {
+		if (f1 == nullptr) {
 			qWarning() << "FieldArchive::compareTexts: cannot open field";
 			continue;
 		}
 		Field *f2 = other->field(f1->name());
-		if(f2 == NULL) {
+		if (f2 == nullptr) {
 			qWarning() << "FieldArchive::compareTexts: cannot find field2" << f1->name();
 			continue;
 		}
 
 		Section1File *scriptsAndTexts1 = f1->scriptsAndTexts(),
 				*scriptsAndTexts2 = f2->scriptsAndTexts();
-		if(scriptsAndTexts1->isOpen() && scriptsAndTexts2->isOpen()) {
+		if (scriptsAndTexts1->isOpen() && scriptsAndTexts2->isOpen()) {
 			qWarning() << f1->name();
 
 			if (scriptsAndTexts1->textCount() != scriptsAndTexts2->textCount()) {
@@ -579,7 +659,7 @@
 			}
 
 			int textID = 0;
-			foreach(const FF7Text &text1, scriptsAndTexts1->texts()) {
+			for (const FF7Text &text1 : scriptsAndTexts1->texts()) {
 				const FF7Text &text2 = scriptsAndTexts2->text(textID);
 				if (text1 != text2) {
 					QStringList lines1 = text1.text(false).split("\n"),
@@ -612,25 +692,27 @@
 	QFile deb(filename);
 	deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
 
-	foreach(int i, fieldsSortByMapId) {
-		Field *f = field(i, true);
-		if(f == NULL) {
-			qWarning() << "FieldArchive::printAkaos: cannot open field" << i;
+	FieldArchiveIterator it(*this);
+
+	while (it.hasNext()) {
+		Field *f = it.next();
+		if (f == nullptr) {
+			qWarning() << "FieldArchive::printAkaos: cannot open field" << it.mapId();
 			continue;
 		}
 
 		Section1File *scriptsAndTexts = f->scriptsAndTexts();
-		if(scriptsAndTexts->isOpen()) {
+		if (scriptsAndTexts->isOpen()) {
 			qWarning() << f->inf()->mapName();
 
 			int grpScriptID = 0;
-			foreach(GrpScript *grp, scriptsAndTexts->grpScripts()) {
+			for (GrpScript *grp : scriptsAndTexts->grpScripts()) {
 				int scriptID = 0;
-				foreach(Script *script, grp->scripts()) {
+				for (Script *script : grp->scripts()) {
 					int opcodeID = 0;
-					foreach(Opcode *opcode, script->opcodes()) {
+					for (Opcode *opcode : script->opcodes()) {
 						FF7Window win;
-						/* if(opcode->getWindow(win)) {
+						/* if (opcode->getWindow(win)) {
 							deb.write(QString("%1 > %2 > %3: %4 %5\n")
 									  .arg(f->name(), grp->name())
 									  .arg(scriptID)
@@ -654,19 +736,25 @@
 void FieldArchive::printScriptsDirs(const QString &filename)
 {
 	QDir dir(filename);
-	if(!dir.exists()) {
+	if (!dir.exists()) {
 		dir.mkdir(".");
 	}
 
-	foreach(int i, fieldsSortByMapId) {
-		Field *f = field(i, true);
-		if(f == NULL) {
-			qWarning() << "FieldArchive::printAkaos: cannot open field" << i;
+	FieldArchiveIterator it(*this);
+
+	while (it.hasNext()) {
+		Field *f = it.next();
+
+		if (f == nullptr) {
+			qWarning() << "FieldArchive::printScriptsDirs: cannot open field" << it.mapId();
+			continue;
+		}
+		if (!f->name().startsWith("del")) {
 			continue;
 		}
 
 		Section1File *scriptsAndTexts = f->scriptsAndTexts();
-		if(scriptsAndTexts->isOpen()) {
+		if (scriptsAndTexts->isOpen()) {
 			qWarning() << f->inf()->mapName();
 
 			QString dirname = f->inf()->mapName();
@@ -674,7 +762,7 @@
 			dir.cd(dirname);
 
 			int grpScriptID = 0;
-			foreach(GrpScript *grp, scriptsAndTexts->grpScripts()) {
+			for (GrpScript *grp : scriptsAndTexts->grpScripts()) {
 
 				dirname = QString("%1-%2")
 				          .arg(grpScriptID, 2, 10, QChar('0'))
@@ -683,7 +771,7 @@
 				dir.cd(dirname);
 
 				int scriptID = 0;
-				foreach(Script *script, grp->scripts()) {
+				for (Script *script : grp->scripts()) {
 
 					QFile deb(dir.filePath(QString("%1-script").arg(scriptID, 2, 10, QChar('0'))));
 					if (!deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
@@ -692,9 +780,9 @@
 					}
 
 					int opcodeID = 0;
-					foreach(Opcode *opcode, script->opcodes()) {
+					for (Opcode *opcode : script->opcodes()) {
 						// FF7Window win;
-						/* if(opcode->getWindow(win)) {
+						/* if (opcode->getWindow(win)) {
 							deb.write(QString("%1 > %2 > %3: %4 %5\n")
 									  .arg(f->name(), grp->name())
 									  .arg(scriptID)
@@ -706,6 +794,7 @@
 						opcodeID++;
 					}
 					scriptID++;
+					deb.close();
 				}
 				dir.cdUp();
 				grpScriptID++;
@@ -719,27 +808,28 @@
 void FieldArchive::diffScripts()
 {
 	FieldArchivePC original("C:/Program Files/Square Soft, Inc/Final Fantasy VII/data/field/fflevel - original.lgp", FieldArchiveIO::Lgp);
-	if(original.open() != FieldArchiveIO::Ok) {
+	if (original.open() != FieldArchiveIO::Ok) {
 		qWarning() << "error opening pc lgp";
 		return;
 	}
 
 	QSet<QString> screens;
+	FieldArchiveIterator it(*this);
 
-	foreach(int i, fieldsSortByMapId) {
-		Field *field = this->field(i, true);
+	while (it.hasNext()) {
+		Field *field = it.next();
 		Field *fieldOriginal = original.field(original.indexOfField(field->name()));
-		if(fieldOriginal == NULL) {
+		if (fieldOriginal == nullptr) {
 			qWarning() << "ALERT field not found" << field->name();
 			break;
 		}
-		if(field != NULL) {
+		if (field != nullptr) {
 			Section1File *scriptsAndTexts = field->scriptsAndTexts();
 			Section1File *scriptsAndTextsOriginal = fieldOriginal->scriptsAndTexts();
-			if(scriptsAndTexts->isOpen() && scriptsAndTextsOriginal->isOpen()) {
+			if (scriptsAndTexts->isOpen() && scriptsAndTextsOriginal->isOpen()) {
 				qWarning() << field->name();
 
-				if(scriptsAndTexts->grpScriptCount() < scriptsAndTextsOriginal->grpScriptCount()) {
+				if (scriptsAndTexts->grpScriptCount() < scriptsAndTextsOriginal->grpScriptCount()) {
 					qWarning() << "ALERT much grpscript wow";
 					break;
 				}
@@ -748,37 +838,37 @@
 				deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
 
 				int grpScriptID = 0, scriptID;
-				foreach(GrpScript *group2, scriptsAndTextsOriginal->grpScripts()) {
+				for (GrpScript *group2 : scriptsAndTextsOriginal->grpScripts()) {
 					GrpScript *grp = scriptsAndTexts->grpScript(grpScriptID);
 
-					while(group2->name() != grp->name()) {
+					while (group2->name() != grp->name()) {
 						grpScriptID++;
-						if(grpScriptID >= scriptsAndTexts->grpScriptCount()) {
+						if (grpScriptID >= scriptsAndTexts->grpScriptCount()) {
 							qWarning() << "ALERT end grpScript reached";
 							goto next_group;
 						}
 						grp = scriptsAndTexts->grpScript(grpScriptID);
 					}
 
-					if(grp->size() != group2->size()) {
+					if (grp->size() != group2->size()) {
 						qWarning() << "ALERT wrong group size" << grp->size() << group2->size();
 						break;
 					}
 
 					scriptID = 0;
-					foreach(Script *script2, group2->scripts()) {
+					for (Script *script2 : group2->scripts()) {
 						Script *script = grp->script(scriptID);
 
 						int opcodeID = 0;
-						foreach(Opcode *opcode2, script2->opcodes()) {
+						for (Opcode *opcode2 : script2->opcodes()) {
 							FF7Window win, win2;
 
-							if(opcode2->getWindow(win2)) {
+							if (opcode2->getWindow(win2)) {
 
 								Opcode *opcode;
 
 								do {
-									if(opcodeID >= script->size()) {
+									if (opcodeID >= script->size()) {
 										qWarning() << "ALERT wrong script size";
 										goto next_script;
 									}
@@ -793,7 +883,7 @@
 										hasTinyDiffY = diffY >= minDiff && diffY <= maxDiff,
 										hasLargeDiffX = diffX > 15,//maxDiff,
 										hasLargeDiffY = diffY > 15;//maxDiff;
-								if(diffX > 0 || diffY > 0) { //(hasTinyDiffX && hasLargeDiffY) || (hasTinyDiffY && hasLargeDiffX)) {
+								if (diffX > 0 || diffY > 0) { //(hasTinyDiffX && hasLargeDiffY) || (hasTinyDiffY && hasLargeDiffX)) {
 									deb.write(QString("%1 > %2 > %3 > %4: window %5 (retraduit: %6, %7) (original: %8, %9)\n")
 											  .arg(field->name())
 											  .arg(grp->name())
@@ -814,7 +904,7 @@
 					next_group:;
 					grpScriptID++;
 				}
-				if(deb.size() == 0) {
+				if (deb.size() == 0) {
 					deb.remove();
 				}
 				qDebug() << screens.size() << "écrans";
@@ -823,71 +913,113 @@
 	}
 }
 
-bool FieldArchive::printBackgroundTiles(Field *field, const QString &filename, bool uniformize)
+bool FieldArchive::printBackgroundTiles(bool uniformize, bool fromUnusedPCSection)
 {
-	QFile f(filename);
-	if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
-		qWarning() << "FieldArchive::printBackgroundTiles" << f.errorString();
-		return false;
-	}
+	FieldArchiveIterator it(*this);
+	QDir dir(QString("background-tiles-%1").arg(isPC() ? "pc" : "ps"));
+	dir.mkpath(".");
 
-	BackgroundFile *bgFile = field->background();
-	if (!bgFile || !bgFile->isOpen()) {
-		qWarning() << "FieldArchive::printBackgroundTiles no bg for this field" << field->name();
-		return false;
-	}
+	while (it.hasNext()) {
+		Field *field = it.next();
+		if (!field || !field->isOpen()) {
+			continue;
+		}
+
+		InfFile *inf = field->inf();
+		if (!inf || !inf->isOpen()) {
+			continue;
+		}
 
-	BackgroundTiles tiles;
-	if (uniformize && field->isPS()) { // Convert PS to PC to have the same output whenever the source
-		BackgroundFilePS *bgFilePS = static_cast<BackgroundFilePS *>(bgFile);
-		PalettesPC palettesPC = ((PalettesPS *)&(bgFilePS->palettes()))->toPC();
-		static_cast<BackgroundTexturesPS *>(bgFilePS->textures())
-		        ->toPC(bgFilePS->tiles(), tiles, palettesPC);
-	} else {
-		tiles = bgFile->tiles();
-	}
-
-	foreach (const Tile &tile, tiles.sortedTiles()) {
-		f.write(QString("tileID=%1, layer=%2, param=%3, state=%4\n")
-		        .arg(tile.tileID)
-		        .arg(tile.layerID)
-		        .arg(tile.param)
-		        .arg(tile.state).toUtf8());
-		f.write(QString("srcX=%1, srcY=%2, textureID1=%3, textureID2=%4\n")
-		        .arg(tile.srcX)
-		        .arg(tile.srcY)
-		        .arg(tile.textureID)
-		        .arg(tile.textureID2).toUtf8());
-		f.write(QString("dstX=%1, dstY=%2, dstZ=%3, size=%4\n")
-		        .arg(tile.dstX)
-		        .arg(tile.dstY)
-		        .arg(tile.ID)
-		        .arg(tile.size).toUtf8());
-		f.write(QString("palID=%1, depth=%2, blending=%3, typeTrans=%4\n")
-		        .arg(tile.paletteID)
-		        .arg(tile.depth)
-		        .arg(tile.blending)
-		        .arg(tile.typeTrans).toUtf8());
-		f.write(QString("dstZBig=%1\n")
-		        .arg(tile.IDBig).toUtf8());
-		f.write("\n");
+		QFile f(dir.filePath("field-" + inf->mapName() + ".txt"));
+		if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+			qWarning() << "FieldArchive::printBackgroundTiles" << f.errorString() << f.fileName();
+			return false;
+		}
+
+		BackgroundFile *bgFile = field->background();
+		if (!bgFile || !bgFile->isOpen()) {
+			qWarning() << "FieldArchive::printBackgroundTiles no bg for this field" << field->name();
+			continue;
+		}
+
+		BackgroundTiles tiles;
+		if (fromUnusedPCSection) {
+			BackgroundTilesFile *tilesFile = field->tiles();
+			tiles = tilesFile->tiles();
+		}
+		else if (uniformize && field->isPS()) { // Convert PS to PC to have the same output whenever the source
+			BackgroundFilePS *bgFilePS = static_cast<BackgroundFilePS *>(bgFile);
+			PalettesPC palettesPC = ((PalettesPS *)&(bgFilePS->palettes()))->toPC();
+			static_cast<BackgroundTexturesPS *>(bgFilePS->textures())
+					->toPC(bgFilePS->tiles(), tiles, palettesPC);
+		} else {
+			tiles = bgFile->tiles();
+		}
+
+		for (const Tile &tile : tiles.sortedTiles()) {
+			f.write(QString("tileID=%1, layer=%2, param=%3, state=%4\n")
+					.arg(tile.tileID)
+					.arg(tile.layerID)
+					.arg(tile.param)
+					.arg(tile.state).toUtf8());
+			/* f.write(QString("srcX=%1, srcY=%2, textureID1=%3, textureID2=%4\n")
+					.arg(tile.srcX)
+					.arg(tile.srcY)
+					.arg(tile.textureID)
+					.arg(tile.textureID2).toUtf8()); */
+			f.write(QString("dstX=%1, dstY=%2, dstZ=%3, size=%4\n")
+					.arg(tile.dstX)
+					.arg(tile.dstY)
+					.arg(tile.ID)
+					.arg(tile.size).toUtf8());
+			f.write(QString("palID=%1, depth=%2, blending=%3, typeTrans=%4\n")
+					.arg(tile.paletteID)
+					.arg(tile.depth)
+					.arg(tile.blending)
+					.arg(tile.typeTrans).toUtf8());
+			//f.write(QString("dstZBig=%1\n")
+			//        .arg(tile.IDBig).toUtf8());
+			f.write("\n");
+		}
 	}
 
 	return true;
 }
 
-void FieldArchive::searchBackgroundZ()
+void FieldArchive::printBackgroundZ()
 {
 	QMultiMap<int, quint32> ids;
 	FieldArchiveIterator it(*this);
+
+	QDir dir(QString("background-z-%1").arg(isPC() ? "pc" : "ps"));
+	dir.mkpath(".");
+	QFile deb2("background-z.txt");
+	deb2.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+
 	while (it.hasNext()) {
 		Field *field = it.next();
+
 		if (field && field->isOpen()) {
 			BackgroundFile *bg = field->background();
+			InfFile *inf = field->inf();
+
 			if (bg->isOpen()) {
 				bool function1 = false;
-				foreach (const Tile &tile, bg->tiles()) {
+
+				//QFile deb(dir.filePath("%1-background-id.txt").arg(inf->mapName()));
+				//deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+
+				for (const Tile &tile : bg->tiles()) {
+
+					//deb.write(QString("%1\n").arg(tile.ID).toLatin1());
+
+					if (tile.layerID == 1)
+						ids.insert(tile.ID, tile.IDBig);
+
+					continue;
+
 					float ratio = float(tile.ID) / float(tile.IDBig);
+
 					if (tile.layerID == 1 && tile.ID * 10000 != tile.IDBig) {
 						if (ratio > 4.5e-5 && tile.IDBig < 9000000) {
 							ids.insert(tile.ID, tile.IDBig);
@@ -898,6 +1030,7 @@
 							}
 						}
 					}
+
 					if (tile.layerID == 1 && tile.ID == 324 && tile.IDBig < 9000000) {
 						qDebug() << field->name();
 						qDebug() << QString("tileID=%1, layer=%2, param=%3, state=%4\n")
@@ -924,26 +1057,115 @@
 						            .arg(tile.IDBig).toUtf8();
 					}
 				}
-
 //				qDebug() << field->name() << field->scriptsAndTexts()->scale();
 			}
 		}
+		break;
 	}
 
-	foreach (int ID, ids.uniqueKeys()) {
+	for (int ID : ids.uniqueKeys()) {
 		QList<quint32> zBigs = ids.values(ID);
 		QList<quint32> zBigsUnique = zBigs.toSet().toList();
-		qSort(zBigsUnique);
-		foreach (quint32 zBig, zBigsUnique) {
-			qDebug() << qPrintable(QString("%1\t%2\t%3\t%4").arg(ID).arg(zBig).arg(zBigs.count(zBig)).arg(float(ID) / float(zBig)));
+		std::sort(zBigsUnique.begin(), zBigsUnique.end());
+		for (quint32 zBig : zBigsUnique) {
+			deb2.write(QString("%1,%2\n").arg(ID).arg(zBig).toLatin1());
 		}
 	}
+
+	deb2.close();
 }
 
 void FieldArchive::searchAll()
 {
 	QTime t;t.start();
 
+	/* QFile deb1("encounters-scripts.txt");
+	deb1.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+	deb1.write("field name,encounter,group ID,script ID,opcode ID\n"); */
+
+	FieldArchiveIterator it1(*this);
+	while (it1.hasNext()) {
+		Field *field = it1.next(true, true);
+		if (field && field->isOpen()) {
+			/* Section1File *scripts = field->scriptsAndTexts();
+			if (scripts->isOpen()) {
+				int groupID=0, scriptID=0, opcodeID=0;
+				while (scripts->searchOpcode(int(Opcode::BATTLE), groupID, scriptID, opcodeID)) {
+					OpcodeBATTLE *op = (OpcodeBATTLE *)scripts->grpScript(groupID)->script(quint8(scriptID))->opcode(quint16(opcodeID));
+					deb1.write((field->name() % "," % QString::number(op->battleID) % "," % QString::number(groupID) % "," % QString::number(scriptID) % "," % QString::number(opcodeID) % "\n").toLocal8Bit());
+					opcodeID += 1;
+				}
+			} */
+			FieldModelLoader *modelLoader = field->fieldModelLoader();
+			if (modelLoader && modelLoader->isOpen() && field->isPC()) {
+				FieldModelLoaderPC *modelLoaderPc = (FieldModelLoaderPC *)modelLoader;
+				for (int i = 0; i < modelLoaderPc->modelCount(); i++) {
+					FieldModelInfosPC infos = modelLoaderPc->modelInfos(i);
+					if (infos.nameHRC == "AAAA.HRC" && infos.typeHRC >= 1024) {
+						qDebug() << qPrintable(field->name()) << infos.typeHRC;
+					}
+				}
+			}
+			/* EncounterFile *enc = field->encounter();
+			if (enc && enc->isOpen()) {
+				for (EncounterFile::Table table :  QList<EncounterFile::Table>() << EncounterFile::Table1 << EncounterFile::Table2) {
+					const EncounterTable &ta = enc->encounterTable(table);
+					if (ta.enabled & 1) {
+						for (int i = 0; i < 6; i++) {
+							if (PROBABILITY(ta.enc_standard[i]) >= 32) {
+								qDebug() << qPrintable(field->name()) << PROBABILITY(ta.enc_standard[i]);
+							}
+						}
+						for (int i = 0; i < 4; i++) {
+							if (PROBABILITY(ta.enc_special[i]) >= 32) {
+								qDebug() << qPrintable(field->name()) << PROBABILITY(ta.enc_special[i]);
+							}
+						}
+					}
+				}
+			} */
+		}
+	}
+
+	// deb1.close();
+
+	return;
+
+	/* QFile deb1("encounters.txt");
+	deb1.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
+	deb1.write("field name,encounter\n");
+
+	FieldArchiveIterator it1(*this);
+	while (it1.hasNext()) {
+		Field *field = it1.next(true, true);
+		if (field && field->isOpen()) {
+			EncounterFile *enc = field->encounter();
+			if (enc->isOpen()) {
+				for (EncounterFile::Table table :  QList<EncounterFile::Table>() << EncounterFile::Table1 << EncounterFile::Table2) {
+					const EncounterTable &ta = enc->encounterTable(table);
+					if (ta.enabled & 1) {
+						for (int i = 0; i < 6; i++) {
+							if (BATTLE_ID(ta.enc_standard[i]) > 0 && PROBABILITY(ta.enc_standard[i]) > 0) {
+								deb1.write((field->name() % "," % QString::number(BATTLE_ID(ta.enc_standard[i])) % "\n").toLocal8Bit());
+							}
+						}
+						for (int i = 0; i < 4; i++) {
+							if (BATTLE_ID(ta.enc_special[i]) > 0 && PROBABILITY(ta.enc_special[i]) > 0) {
+								deb1.write((field->name() % "," % QString::number(BATTLE_ID(ta.enc_special[i])) % "\n").toLocal8Bit());
+							}
+						}
+
+					}
+				}
+
+			}
+		}
+	}
+
+	deb1.close();
+
+	return; */
+
 	QFile deb(QString("scripts-unlocked-talk-P%1.txt").arg(isPC() ? "C" : "S"));
 	deb.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate);
 
@@ -964,13 +1186,13 @@
 			/*Section1File *section1 = field->scriptsAndTexts();
 			if (section1->isOpen()) {
 				int groupID = 0;
-				foreach (GrpScript *grp, section1->grpScripts()) {
+				for (GrpScript *grp : section1->grpScripts()) {
 					if (grp->typeID() == GrpScript::Model || grp->typeID() == GrpScript::Location) {
 						Script *talkScript = grp->script(2); // Talk
 						bool disableMovability = false,
 								disableMenus = false,
 								saySomething = false;
-						foreach (Opcode *op, talkScript->opcodes()) {
+						for (Opcode *op : talkScript->opcodes()) {
 							if (op->id() == Opcode::UC) {
 								disableMovability = true;
 							} else if (op->id() == Opcode::MENU2) {
@@ -1003,25 +1225,25 @@
 	return;
 
 	FieldArchivePC original("C:/Program Files/Square Soft, Inc/Final Fantasy VII/data/field/fflevel - original.lgp", FieldArchiveIO::Lgp);
-	if(original.open() != FieldArchiveIO::Ok) {
+	if (original.open() != FieldArchiveIO::Ok) {
 		qWarning() << "error opening pc lgp";
 		return;
 	}
 
 	/*FieldArchivePS ps("C:/Users/Jérôme/Games/Final Fantasy VII-PSX-PAL-FR-CD1.bin", FieldArchiveIO::Iso);
-	if(ps.open() != FieldArchiveIO::Ok) {
+	if (ps.open() != FieldArchiveIO::Ok) {
 		qWarning() << "error opening ps iso";
 		return;
 	}
 
-	if(!isPC()) {
+	if (!isPC()) {
 		return;
 	}
 
 	Field *f1 = this->field(fieldsSortByName.value("yougan"), true);
-	if(f1) {
+	if (f1) {
 		Section1File *f1s1 = f1->scriptsAndTexts();
-		if(f1s1->isOpen()) {
+		if (f1s1->isOpen()) {
 			int groupScriptCount = f1s1->grpScriptCount();
 
 			for (int groupScriptID=0; groupScriptID < groupScriptCount; groupScriptID++) {
@@ -1047,57 +1269,58 @@
 	}*/
 
 	QSet<QString> screens;
-//	for(int i=0 ; i<size ; ++i) {
-	foreach(int i, fieldsSortByMapId) {
-		Field *field = this->field(i, true);
+//	for (int i=0; i<size; ++i) {
+	FieldArchiveIterator it2(*this);
+	while (it2.hasNext()) {
+		Field *field = it2.next();
 		Field *fieldOriginal = original.field(original.indexOfField(field->name()));
-		if(fieldOriginal == NULL) {
+		if (fieldOriginal == nullptr) {
 			qWarning() << "ALERT field not found" << field->name();
 			break;
 		}
-		if(field != NULL) {
+		if (field != nullptr) {
 			Section1File *scriptsAndTexts = field->scriptsAndTexts();
 			Section1File *scriptsAndTextsOriginal = fieldOriginal->scriptsAndTexts();
-			if(scriptsAndTexts->isOpen() && scriptsAndTextsOriginal->isOpen()) {
+			if (scriptsAndTexts->isOpen() && scriptsAndTextsOriginal->isOpen()) {
 				qWarning() << field->name();
 
-				if(scriptsAndTexts->grpScriptCount() < scriptsAndTextsOriginal->grpScriptCount()) {
+				if (scriptsAndTexts->grpScriptCount() < scriptsAndTextsOriginal->grpScriptCount()) {
 					qWarning() << "ALERT much grpscript wow";
 					break;
 				}
 
 				int grpScriptID = 0, scriptID;
-				foreach(GrpScript *group2, scriptsAndTextsOriginal->grpScripts()) {
+				for (GrpScript *group2 : scriptsAndTextsOriginal->grpScripts()) {
 					GrpScript *grp = scriptsAndTexts->grpScript(grpScriptID);
 
-					while(group2->name() != grp->name()) {
+					while (group2->name() != grp->name()) {
 						grpScriptID++;
-						if(grpScriptID >= scriptsAndTexts->grpScriptCount()) {
+						if (grpScriptID >= scriptsAndTexts->grpScriptCount()) {
 							qWarning() << "ALERT end grpScript reached";
 							goto next_group;
 						}
 						grp = scriptsAndTexts->grpScript(grpScriptID);
 					}
 
-					if(grp->size() != group2->size()) {
+					if (grp->size() != group2->size()) {
 						qWarning() << "ALERT wrong group size" << grp->size() << group2->size();
 						break;
 					}
 
 					scriptID = 0;
-					foreach(Script *script2, group2->scripts()) {
+					for (Script *script2 : group2->scripts()) {
 						Script *script = grp->script(scriptID);
 
 						int opcodeID = 0;
-						foreach(Opcode *opcode2, script2->opcodes()) {
+						for (Opcode *opcode2 : script2->opcodes()) {
 							FF7Window win, win2;
 
-							if(opcode2->getWindow(win2)) {
+							if (opcode2->getWindow(win2)) {
 
 								Opcode *opcode;
 
 								do {
-									if(opcodeID >= script->size()) {
+									if (opcodeID >= script->size()) {
 										qWarning() << "ALERT wrong script size";
 										goto next_script;
 									}
@@ -1112,7 +1335,7 @@
 										hasTinyDiffY = diffY >= minDiff && diffY <= maxDiff,
 										hasLargeDiffX = diffX > 15,//maxDiff,
 										hasLargeDiffY = diffY > 15;//maxDiff;
-								if((hasTinyDiffX && hasLargeDiffY) || (hasTinyDiffY && hasLargeDiffX)) {
+								if ((hasTinyDiffX && hasLargeDiffY) || (hasTinyDiffY && hasLargeDiffX)) {
 									deb.write(QString("%1 > %2 > %3: window %4 (retraduit: %5, %6) (original: %7, %8)\n")
 											  .arg(field->name())
 											  .arg(grp->name())
@@ -1134,17 +1357,17 @@
 				}
 				qDebug() << screens.size() << "écrans";
 				/*QString fieldDir = QString("%1-%2").arg(Data::field_names.indexOf(field->name()), 3, 10, QChar('0')).arg(field->name());
-				if(!tmp.mkdir(fieldDir)) {
+				if (!tmp.mkdir(fieldDir)) {
 					qWarning() << "cannot create dir" << tmp.absoluteFilePath(fieldDir);
 				}
 				tmp.cd(fieldDir);
 
 				scriptsAndTexts->clearTexts();
 				int grpScriptID = 0;
-				foreach(GrpScript *grp, scriptsAndTexts->grpScripts()) {
+				for (GrpScript *grp : scriptsAndTexts->grpScripts()) {
 					QString grpFilename = QString("%1-%2").arg(grpScriptID).arg(grp->name());
 					QFile out(tmp.absoluteFilePath(grpFilename));
-					if(out.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+					if (out.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
 						out.write(grp->toString(field).toLatin1());
 						out.close();
 					}
@@ -1153,10 +1376,10 @@
 
 				tmp.cdUp();*/
 				/*QFile out(tmp.absoluteFilePath(fieldDir));
-				if(out.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+				if (out.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
 
 					int textID = 0;
-					foreach(const FF7Text &text, scriptsAndTexts->texts()) {
+					for (const FF7Text &text : scriptsAndTexts->texts()) {
 						out.write(QString("=== Texte %1 ===\n").arg(textID++).toLatin1());
 						out.write(text.text(false).toLatin1());
 						out.write("\n");
@@ -1167,13 +1390,13 @@
 			}
 			/*FieldPC *fieldPC = (FieldPC *)field;
 			FieldModelLoaderPC *modelLoader = fieldPC->fieldModelLoader();
-			if(modelLoader->isOpen()) {
+			if (modelLoader->isOpen()) {
 				int modelID = 0;
-				foreach(const QString &HRC, modelLoader->HRCNames()) {
-					foreach(const QString &a, modelLoader->ANames(modelID)) {
+				for (const QString &HRC : modelLoader->HRCNames()) {
+					for (const QString &a : modelLoader->ANames(modelID)) {
 						FieldModelFilePC *fieldModel = fieldPC->fieldModel(HRC, a);
-						if(fieldModel->isOpen()) {
-							if(fieldModel->animBoneCount() > 1 && fieldModel->animBoneCount() != fieldModel->boneCount()) {
+						if (fieldModel->isOpen()) {
+							if (fieldModel->animBoneCount() > 1 && fieldModel->animBoneCount() != fieldModel->boneCount()) {
 								qDebug() << field->name() << modelID << HRC << a << fieldModel->animBoneCount() << fieldModel->boneCount();
 							}
 						} else {
@@ -1193,72 +1416,56 @@
 
 #endif
 
-bool FieldArchive::searchIterators(QMap<QString, int>::const_iterator &i, QMap<QString, int>::const_iterator &end, int fieldID, Sorting sorting, SearchScope scope) const
-{
-	if(fieldID >= fileList.size())		return false;
-
-	switch(sorting) {
-	case SortByName:
-		i = fieldsSortByName.constFind(fieldsSortByName.key(fieldID), fieldID);
-		end = fieldsSortByName.constEnd();
-		if(i == end) {
-			i = fieldsSortByName.constBegin();
-		}
-		break;
-	case SortByMapId:
-		i = fieldsSortByMapId.constFind(fieldsSortByMapId.key(fieldID), fieldID);
-		end = fieldsSortByMapId.constEnd();
-		if(i == end) {
-			i = fieldsSortByMapId.constBegin();
-		}
-		break;
-	}
-
-	if(scope >= FieldScope && fieldID != i.value()) {
-		return false;
-	}
-
-	return true;
-}
-
 bool FieldArchive::find(bool (*predicate)(Field *, SearchQuery *, SearchIn *),
-						SearchQuery *toSearch, int &fieldID, SearchIn *searchIn,
+						SearchQuery *toSearch, int &mapID, SearchIn *searchIn,
 						Sorting sorting, SearchScope scope)
 {
-	QMap<QString, int>::const_iterator i, end;
-	if(!searchIterators(i, end, fieldID, sorting, scope))	return false;
+	Q_UNUSED(sorting)
+	FieldArchiveIterator it(*this);
+	if (!it.seek(mapID)) {
+		return false;
+	}
 
-	for( ; i != end ; ++i) {
-		QCoreApplication::processEvents();
-		Field *f = field(fieldID = i.value());
-		if(f!=NULL && (*predicate)(f, toSearch, searchIn))
+	while (it.hasNext()) {
+		Field *f = it.next();
+		mapID = it.mapId();
+		if (f != nullptr && (*predicate)(f, toSearch, searchIn)) {
 			return true;
+		}
 		searchIn->reset();
-		if(scope >= FieldScope)		break;
+		if (scope >= FieldScope) {
+			break;
+		}
 	}
 	return false;
 }
 
 bool FieldArchive::findLast(bool (*predicate)(Field *, SearchQuery *, SearchIn *),
-						SearchQuery *toSearch, int &fieldID, SearchIn *searchIn,
+						SearchQuery *toSearch, int &mapID, SearchIn *searchIn,
 						Sorting sorting, SearchScope scope)
 {
-	QMap<QString, int>::const_iterator i, begin;
-	if(!searchIteratorsP(i, begin, fieldID, sorting, scope))	return false;
+	Q_UNUSED(sorting)
+	FieldArchiveIterator it(*this);
+	if (!it.seek(mapID)) {
+		return false;
+	}
 
-	for( ; i != begin-1 ; --i)
-	{
-		QCoreApplication::processEvents();
-		Field *f = field(fieldID = i.value());
-		if(f!=NULL && (*predicate)(f, toSearch, searchIn))
+	while (it.hasPrevious()) {
+		Field *f = it.previous();
+		mapID = it.key();
+		if (f != nullptr && (*predicate)(f, toSearch, searchIn)) {
 			return true;
+		}
 		searchIn->toEnd();
-		if(scope >= FieldScope)		break;
+		if (scope >= FieldScope) {
+			break;
+		}
 	}
+
 	return false;
 }
 
-bool FieldArchive::searchOpcode(int opcode, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchOpcode(int opcode, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchOpcodeQuery query(opcode);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1267,10 +1474,10 @@
 		SearchOpcodeQuery *query = static_cast<SearchOpcodeQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
 		return f->scriptsAndTexts()->searchOpcode(query->opcode, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchVar(quint8 bank, quint16 address, Opcode::Operation op, int value, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchVar(quint8 bank, quint16 address, Opcode::Operation op, int value, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchVarQuery query(bank, address, op, value);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1279,10 +1486,10 @@
 		SearchVarQuery *query = static_cast<SearchVarQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
 		return f->scriptsAndTexts()->searchVar(query->bank, query->address, query->op, query->value, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchExec(quint8 group, quint8 script, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchExec(quint8 group, quint8 script, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchExecQuery query(group, script);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1291,10 +1498,10 @@
 		SearchExecQuery *query = static_cast<SearchExecQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
 		return f->scriptsAndTexts()->searchExec(query->group, query->script, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchMapJump(quint16 _field, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchMapJump(int _field, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchFieldQuery query(_field);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1302,11 +1509,11 @@
 	return find([](Field *f, SearchQuery *_query, SearchIn *_searchIn) {
 		SearchFieldQuery *query = static_cast<SearchFieldQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
-		return f->scriptsAndTexts()->searchMapJump(query->fieldID, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+		return f->scriptsAndTexts()->searchMapJump(query->mapID, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchTextInScripts(const QRegExp &text, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchTextInScripts(const QRegExp &text, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchTextQuery query(text);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1315,10 +1522,10 @@
 		SearchTextQuery *query = static_cast<SearchTextQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
 		return f->scriptsAndTexts()->searchTextInScripts(query->text, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchText(const QRegExp &text, int &fieldID, int &textID, int &from, int &size, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchText(const QRegExp &text, int &mapID, int &textID, int &from, int &size, Sorting sorting, SearchScope scope)
 {
 	SearchTextQuery query(text);
 	int empty;
@@ -1328,38 +1535,10 @@
 		SearchTextQuery *query = static_cast<SearchTextQuery *>(_query);
 		SearchInText *searchIn = static_cast<SearchInText *>(_searchIn);
 		return f->scriptsAndTexts()->searchText(query->text, searchIn->textID, searchIn->from, searchIn->size);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchIteratorsP(QMap<QString, int>::const_iterator &i, QMap<QString, int>::const_iterator &begin, int fieldID, Sorting sorting, SearchScope scope) const
-{
-	if(fieldID < 0)		return false;
-
-	switch(sorting) {
-	case SortByName:
-		begin = fieldsSortByName.constBegin();
-		i = fieldsSortByName.constFind(fieldsSortByName.key(fieldID), fieldID);
-		if(i==fieldsSortByName.constEnd()) {
-			--i;
-		}
-		break;
-	case SortByMapId:
-		begin = fieldsSortByMapId.constBegin();
-		i = fieldsSortByMapId.constFind(fieldsSortByMapId.key(fieldID), fieldID);
-		if(i==fieldsSortByMapId.constEnd()) {
-			--i;
-		}
-		break;
-	}
-
-	if(scope >= FieldScope && fieldID != i.value()) {
-		return false;
-	}
-
-	return true;
-}
-
-bool FieldArchive::searchOpcodeP(int opcode, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchOpcodeP(int opcode, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchOpcodeQuery query(opcode);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1368,10 +1547,10 @@
 		SearchOpcodeQuery *query = static_cast<SearchOpcodeQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
 		return f->scriptsAndTexts()->searchOpcodeP(query->opcode, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchVarP(quint8 bank, quint16 address, Opcode::Operation op, int value, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchVarP(quint8 bank, quint16 address, Opcode::Operation op, int value, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchVarQuery query(bank, address, op, value);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1380,10 +1559,10 @@
 		SearchVarQuery *query = static_cast<SearchVarQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
 		return f->scriptsAndTexts()->searchVarP(query->bank, query->address, query->op, query->value, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchExecP(quint8 group, quint8 script, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchExecP(quint8 group, quint8 script, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchExecQuery query(group, script);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1392,10 +1571,10 @@
 		SearchExecQuery *query = static_cast<SearchExecQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
 		return f->scriptsAndTexts()->searchExecP(query->group, query->script, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchMapJumpP(quint16 _field, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchMapJumpP(int _field, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchFieldQuery query(_field);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1403,11 +1582,11 @@
 	return findLast([](Field *f, SearchQuery *_query, SearchIn *_searchIn) {
 		SearchFieldQuery *query = static_cast<SearchFieldQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
-		return f->scriptsAndTexts()->searchMapJumpP(query->fieldID, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+		return f->scriptsAndTexts()->searchMapJumpP(query->mapID, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchTextInScriptsP(const QRegExp &text, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchTextInScriptsP(const QRegExp &text, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope)
 {
 	SearchTextQuery query(text);
 	SearchInScript searchIn(groupID, scriptID, opcodeID);
@@ -1416,10 +1595,10 @@
 		SearchTextQuery *query = static_cast<SearchTextQuery *>(_query);
 		SearchInScript *searchIn = static_cast<SearchInScript *>(_searchIn);
 		return f->scriptsAndTexts()->searchTextInScriptsP(query->text, searchIn->groupID, searchIn->scriptID, searchIn->opcodeID);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::searchTextP(const QRegExp &text, int &fieldID, int &textID, int &from, int &index, int &size, Sorting sorting, SearchScope scope)
+bool FieldArchive::searchTextP(const QRegExp &text, int &mapID, int &textID, int &from, int &index, int &size, Sorting sorting, SearchScope scope)
 {
 	SearchTextQuery query(text);
 	SearchInText searchIn(textID, from, size, index);
@@ -1428,17 +1607,17 @@
 		SearchTextQuery *query = static_cast<SearchTextQuery *>(_query);
 		SearchInText *searchIn = static_cast<SearchInText *>(_searchIn);
 		return f->scriptsAndTexts()->searchTextP(query->text, searchIn->textID, searchIn->from, searchIn->index, searchIn->size);
-	}, &query, fieldID, &searchIn, sorting, scope);
+	}, &query, mapID, &searchIn, sorting, scope);
 }
 
-bool FieldArchive::replaceText(const QRegExp &search, const QString &after, int fieldID, int textID, int from)
+bool FieldArchive::replaceText(const QRegExp &search, const QString &after, int mapID, int textID, int from)
 {
-	if(textID > -1) {
-		Field *field = this->field(fieldID);
-		if(field) {
+	if (textID > -1) {
+		Field *field = this->field(mapID);
+		if (field) {
 			Section1File *texts = field->scriptsAndTexts();
-			if(texts->isOpen() && textID < texts->textCount()) {
-				if(texts->replaceText(search, after, textID, from)) {
+			if (texts->isOpen() && textID < texts->textCount()) {
+				if (texts->replaceText(search, after, textID, from)) {
 					return true;
 				}
 			}
@@ -1447,16 +1626,17 @@
 	return false;
 }
 
-bool FieldArchive::compileScripts(int &fieldID, int &groupID, int &scriptID, int &opcodeID, QString &errorStr)
+bool FieldArchive::compileScripts(int &mapID, int &groupID, int &scriptID, int &opcodeID, QString &errorStr)
 {
-	int size = fileList.size();
+	FieldArchiveIterator it(*this);
 
-	for(fieldID=0 ; fieldID<size ; ++fieldID) {
+	while (it.hasNext()) {
 		QCoreApplication::processEvents();
-		Field *field = this->field(fieldID, false);
-		if(field != NULL && field->isOpen()) {
+		Field *field = it.next(false);
+		mapID = it.mapId();
+		if (field != nullptr && field->isOpen()) {
 			Section1File *section1 = field->scriptsAndTexts();
-			if(section1->isOpen() && !section1->compileScripts(groupID, scriptID, opcodeID, errorStr)) {
+			if (section1->isOpen() && !section1->compileScripts(groupID, scriptID, opcodeID, errorStr)) {
 				return false;
 			}
 		}
@@ -1467,66 +1647,98 @@
 
 void FieldArchive::removeBattles()
 {
+	FieldArchiveIterator it(*this);
+	int i = 0;
+
 	observer()->setObserverMaximum(fileList.size());
 
-	for(int fieldID=0 ; fieldID<fileList.size() ; ++fieldID) {
-		if(observer()->observerWasCanceled()) {
+	while (it.hasNext()) {
+		if (observer()->observerWasCanceled()) {
 			return;
 		}
-		Field *field = this->field(fieldID, true);
-		if(field != NULL && field->scriptsAndTexts()->isOpen()) {
+		Field *field = it.next();
+		if (field != nullptr && field->scriptsAndTexts()->isOpen()) {
 			field->encounter()->setBattleEnabled(EncounterFile::Table1, false);
 			field->encounter()->setBattleEnabled(EncounterFile::Table2, false);
-			if(!field->isModified()) {
+			if (!field->isModified()) {
 				field->setModified(true);
 			}
 		}
-		observer()->setObserverValue(fieldID);
+		observer()->setObserverValue(i++);
 	}
 }
 
 void FieldArchive::removeTexts()
 {
+	FieldArchiveIterator it(*this);
+	int i = 0;
+
 	observer()->setObserverMaximum(fileList.size());
 
-	for(int fieldID=0 ; fieldID<fileList.size() ; ++fieldID) {
-		if(observer()->observerWasCanceled()) {
+	while (it.hasNext()) {
+		if (observer()->observerWasCanceled()) {
 			return;
 		}
-		Field *field = this->field(fieldID, true);
-		if(field != NULL && field->scriptsAndTexts()->isOpen()) {
+		Field *field = it.next();
+		if (field != nullptr && field->scriptsAndTexts()->isOpen()) {
 			field->scriptsAndTexts()->removeTexts();
-			if(field->scriptsAndTexts()->isModified() && !field->isModified()) {
+			if (field->scriptsAndTexts()->isModified() && !field->isModified()) {
 				field->setModified(true);
 			}
 		}
-		observer()->setObserverValue(fieldID);
+		observer()->setObserverValue(i++);
 	}
 }
 
 void FieldArchive::cleanTexts()
 {
+	FieldArchiveIterator it(*this);
+	int i = 0;
+
 	observer()->setObserverMaximum(fileList.size());
 
-	for(int fieldID=0 ; fieldID<fileList.size() ; ++fieldID) {
-		if(observer()->observerWasCanceled()) {
+	while (it.hasNext()) {
+		if (observer()->observerWasCanceled()) {
 			return;
 		}
-		Field *field = this->field(fieldID, true);
-		if(field != NULL && field->scriptsAndTexts()->isOpen()) {
+		Field *field = it.next();
+		if (field != nullptr && field->scriptsAndTexts()->isOpen()) {
 			field->scriptsAndTexts()->cleanTexts();
-			if(field->scriptsAndTexts()->isModified() && !field->isModified()) {
+			if (field->scriptsAndTexts()->isModified() && !field->isModified()) {
+				field->setModified(true);
+			}
+		}
+		observer()->setObserverValue(i++);
+	}
+}
+
+void FieldArchive::autosizeTextWindows()
+{
+	FieldArchiveIterator it(*this);
+	int i = 0;
+
+	observer()->setObserverMaximum(fileList.size());
+
+	while (it.hasNext()) {
+		if (observer()->observerWasCanceled()) {
+			return;
+		}
+		Field *field = it.next();
+		if (field != nullptr && field->scriptsAndTexts()->isOpen()) {
+			field->scriptsAndTexts()->autosizeTextWindows();
+			if (field->scriptsAndTexts()->isModified() && !field->isModified()) {
 				field->setModified(true);
 			}
 		}
-		observer()->setObserverValue(fieldID);
+		observer()->setObserverValue(i++);
 	}
 }
 
 bool FieldArchive::exportation(const QList<int> &selectedFields, const QString &directory,
-							   bool overwrite, const QMap<ExportType, QString> &toExport)
+							   bool overwrite, const QMap<ExportType, QString> &toExport,
+                               PsfTags *tags)
 {
-	if(selectedFields.isEmpty() || toExport.isEmpty()) {
+	if (selectedFields.isEmpty() || toExport.isEmpty()) {
 		return true;
 	}
 
@@ -1534,50 +1746,55 @@
 	int currentField=0;
 	observer()->setObserverMaximum(selectedFields.size()-1);
 
-	foreach(const int &fieldID, selectedFields) {
-		if(observer()->observerWasCanceled()) 	break;
-		Field *f = field(fieldID);
-		if(f) {
-			if(toExport.contains(Fields)) {
+	for (const int &mapID : selectedFields) {
+		if (observer()->observerWasCanceled()) 	break;
+		Field *f = field(mapID);
+		if (f) {
+			if (toExport.contains(Fields)) {
 				extension = toExport.value(Fields);
 				path = QDir::cleanPath(extension.isEmpty()
 									   ? QString("%1/%2")
 										 .arg(directory, f->name())
 									   : QString("%1/%2.%3")
 										 .arg(directory, f->name(), extension));
-				if(overwrite || !QFile::exists(path)) {
+				if (overwrite || !QFile::exists(path)) {
 					QByteArray fieldData = io()->fieldData(f, io()->isPC() ? QString() : "DAT", extension.compare("dec", Qt::CaseInsensitive) == 0);
-					if(!fieldData.isEmpty()) {
+					if (!fieldData.isEmpty()) {
 						QFile fieldExport(path);
-						if(fieldExport.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+						if (fieldExport.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 							fieldExport.write(fieldData);
 							fieldExport.close();
 						}
 					}
 				}
 			}
-			if(toExport.contains(Backgrounds)) {
+			if (toExport.contains(Backgrounds)) {
 				extension = toExport.value(Backgrounds);
 				path = QDir::cleanPath(QString("%1/%2.%3").arg(directory, f->name(), extension));
 
-				if(overwrite || !QFile::exists(path)) {
+				if (overwrite || !QFile::exists(path)) {
 					QImage background = f->background()->openBackground();
-					if(!background.isNull())
+					if (!background.isNull())
 						background.save(path);
 				}
 			}
-			if(toExport.contains(Akaos)) {
+			if (toExport.contains(Akaos)) {
 				TutFileStandard *akaoList = f->tutosAndSounds();
-				if(akaoList->isOpen()) {
+				if (akaoList->isOpen()) {
 					int akaoCount = akaoList->size();
-					for(int i=0 ; i<akaoCount ; ++i) {
-						if(!akaoList->isTut(i)) {
+					for (int i=0; i<akaoCount; ++i) {
+						if (!akaoList->isTut(i)) {
 							extension = toExport.value(Akaos);
-							path = QDir::cleanPath(QString("%1/%2-%3.%4").arg(directory, f->name()).arg(i).arg(extension));
-							if(overwrite || !QFile::exists(path)) {
+							path = QDir::cleanPath(QString("%1/%2.%3").arg(directory, Data::music_names.value(akaoList->akaoID(i), f->name()), extension));
+							if (overwrite || !QFile::exists(path)) {
 								QFile tutExport(path);
-								if(tutExport.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
-									tutExport.write(akaoList->data(i));
+								if (tutExport.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+									if (extension == "minipsf") {
+										tags->setTitle(Data::music_desc.value(akaoList->akaoID(i), f->name()));
+										tutExport.write(PsfFile::fromAkao(akaoList->data(i), *tags).save());
+									} else {
+										tutExport.write(akaoList->data(i));
+									}
 									tutExport.close();
 								}
 							}
@@ -1585,23 +1802,23 @@
 					}
 				}
 			}
-			if(toExport.contains(Texts)) {
+			if (toExport.contains(Texts)) {
 				Section1File *section1 = f->scriptsAndTexts();
-				if(section1->isOpen()) {
+				if (section1->isOpen()) {
 					extension = toExport.value(Texts);
 					path = QDir::cleanPath(QString("%1/%2.%3").arg(directory, f->name(), extension));
-					if(overwrite || !QFile::exists(path)) {
+					if (overwrite || !QFile::exists(path)) {
 						QFile textExport(path);
 						Section1File::ExportFormat format;
-						if(extension == "txt") {
+						if (extension == "txt") {
 							format = Section1File::TXTText;
-						} else if(extension == "xml") {
+						} else if (extension == "xml") {
 							format = Section1File::XMLText;
 						} else {
 							return false;
 						}
 
-						if(!section1->exporter(&textExport, format)) {
+						if (!section1->exporter(&textExport, format)) {
 							return false;
 						}
 					}
@@ -1619,19 +1836,19 @@
 {
 	Q_UNUSED(directory) //TODO
 
-	if(selectedFields.isEmpty() || toImport.isEmpty()) {
+	if (selectedFields.isEmpty() || toImport.isEmpty()) {
 		return true;
 	}
 	int currentField=0;
 
-	foreach(const int &fieldID, selectedFields) {
-		if(observer()->observerWasCanceled()) 	break;
+	for (const int &mapID : selectedFields) {
+		if (observer()->observerWasCanceled()) 	break;
 
-		Field *f = field(fieldID);
-		if(f) {
-			if(toImport.contains(Field::Scripts)) {
+		Field *f = field(mapID);
+		if (f) {
+			if (toImport.contains(Field::Scripts)) {
 				Section1File *section1 = f->scriptsAndTexts();
-				if(section1->isOpen()) {
+				if (section1->isOpen()) {
 					//TODO
 				}
 			}
@@ -1644,7 +1861,7 @@
 
 void FieldArchive::setSaved()
 {
-	foreach(Field *field, fileList) {
+	for (Field *field : qAsConst(fileList)) {
 		field->setSaved();
 	}
 }
diff -Nru makoureactor-1.7.2/core/field/FieldArchive.h makoureactor-1.8.0/core/field/FieldArchive.h
--- makoureactor-1.7.2/core/field/FieldArchive.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchive.h	2020-08-08 18:46:56.000000000 +0000
@@ -23,6 +23,7 @@
 #include <QtCore>
 #include "FieldArchiveIO.h"
 #include "Field.h"
+#include "core/PsfFile.h"
 
 struct SearchQuery
 {
@@ -54,9 +55,9 @@
 
 struct SearchFieldQuery : public SearchQuery
 {
-	quint16 fieldID;
-	explicit SearchFieldQuery(quint16 fieldID) :
-		fieldID(fieldID) {}
+	int mapID;
+	explicit SearchFieldQuery(int mapID) :
+		mapID(mapID) {}
 };
 
 struct SearchTextQuery : public SearchQuery
@@ -110,17 +111,22 @@
 
 class FieldArchive;
 
-class FieldArchiveIterator : public QListIterator<Field *>
+class FieldArchiveIterator : public QMapIterator<int, Field *>
 {
 	friend class FieldArchive;
 public:
 	explicit FieldArchiveIterator(const FieldArchive &archive);
+	bool seek(int mapId);
 	Field *next(bool open=true, bool dontOptimize=false);
 	Field *peekNext(bool open=true, bool dontOptimize=false) const;
 	Field *peekPrevious(bool open=true, bool dontOptimize=false) const;
 	Field *previous(bool open=true, bool dontOptimize=false);
+	inline int mapId() const {
+		return key();
+	}
 private:
 	static Field *openField(Field *field, bool open=true, bool dontOptimize=false);
+	QMap<int, Field *> mapList;
 };
 
 class FieldArchive
@@ -154,14 +160,13 @@
 	inline int size() const {
 		return fileList.size();
 	}
-	int indexOfField(const QString &name) const;
-	const Field *field(quint32 id) const;
-	Field *field(quint32 id, bool open=true, bool dontOptimize=false);
+	const Field *field(quint32 mapId) const;
+	Field *field(quint32 mapId, bool open=true, bool dontOptimize=false);
 	const Field *field(const QString &name) const;
 	Field *field(const QString &name, bool open=true, bool dontOptimize=false);
-	void appendField(Field *field);
-	FieldArchiveIO::ErrorCode addField(Field *field, const QString &fileName, int &fieldId);
-	void removeField(quint32 id);
+	int appendField(Field *field);
+	void addNewField(Field *field, int &mapID);
+	void delField(int id);
 
 	bool isAllOpened() const;
 	bool isModified() const;
@@ -171,42 +176,45 @@
 	void validateOneLineSize();
 	void printAkaos(const QString &filename);
 	void printModelLoaders(const QString &filename, bool generic = true);
-	void printTexts(const QString &filename);
+	void printTexts(const QString &filename, bool usedTexts = false);
+	void printTextsDir(const QString &dirname, bool usedTexts = false);
 	void compareTexts(FieldArchive *other);
 	void printScripts(const QString &filename);
 	void printScriptsDirs(const QString &filename);
 	void diffScripts();
-	static bool printBackgroundTiles(Field *field, const QString &filename, bool uniformize = false);
-	void searchBackgroundZ();
+	bool printBackgroundTiles(bool uniformize = false, bool fromUnusedPCSection = false);
+	void printBackgroundZ();
 	void searchAll();// research & debug function
 #endif
 	bool find(bool (*predicate)(Field *, SearchQuery *, SearchIn *),
-			  SearchQuery *toSearch, int &fieldID, SearchIn *searchIn,
+			  SearchQuery *toSearch, int &mapID, SearchIn *searchIn,
 			  Sorting sorting, SearchScope scope);
 	bool findLast(bool (*predicate)(Field *, SearchQuery *, SearchIn *),
-				  SearchQuery *toSearch, int &fieldID, SearchIn *searchIn,
+				  SearchQuery *toSearch, int &mapID, SearchIn *searchIn,
 				  Sorting sorting, SearchScope scope);
-	bool searchOpcode(int opcode, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchVar(quint8 bank, quint16 address, Opcode::Operation op, int value, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchExec(quint8 group, quint8 script, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchMapJump(quint16 _field, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchTextInScripts(const QRegExp &text, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchText(const QRegExp &text, int &fieldID, int &textID, int &from, int &size, Sorting sorting, SearchScope scope);
-	bool searchOpcodeP(int opcode, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchVarP(quint8 bank, quint16 address, Opcode::Operation op, int value, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchExecP(quint8 group, quint8 script, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchMapJumpP(quint16 _field, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchTextInScriptsP(const QRegExp &text, int &fieldID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
-	bool searchTextP(const QRegExp &text, int &fieldID, int &textID, int &from, int &index, int &size, Sorting sorting, SearchScope scope);
-	bool replaceText(const QRegExp &search, const QString &after, int fieldID, int textID, int from);
+	bool searchOpcode(int opcode, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchVar(quint8 bank, quint16 address, Opcode::Operation op, int value, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchExec(quint8 group, quint8 script, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchMapJump(int _field, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchTextInScripts(const QRegExp &text, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchText(const QRegExp &text, int &mapID, int &textID, int &from, int &size, Sorting sorting, SearchScope scope);
+	bool searchOpcodeP(int opcode, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchVarP(quint8 bank, quint16 address, Opcode::Operation op, int value, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchExecP(quint8 group, quint8 script, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchMapJumpP(int _field, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchTextInScriptsP(const QRegExp &text, int &mapID, int &groupID, int &scriptID, int &opcodeID, Sorting sorting, SearchScope scope);
+	bool searchTextP(const QRegExp &text, int &mapID, int &textID, int &from, int &index, int &size, Sorting sorting, SearchScope scope);
+	bool replaceText(const QRegExp &search, const QString &after, int mapID, int textID, int from);
 
-	bool compileScripts(int &fieldID, int &groupID, int &scriptID, int &opcodeID, QString &errorStr);
+	bool compileScripts(int &mapID, int &groupID, int &scriptID, int &opcodeID, QString &errorStr);
 	void removeBattles();
 	void removeTexts();
 	void cleanTexts();
+	void autosizeTextWindows();
 
 	bool exportation(const QList<int> &selectedFields, const QString &directory,
-					 bool overwrite, const QMap<ExportType, QString> &toExport);
+					 bool overwrite, const QMap<ExportType, QString> &toExport,
+	                 PsfTags *tags = nullptr);
 	bool importation(const QList<int> &selectedFields, const QString &directory,
 					 const QMap<Field::FieldSection, QString> &toImport);
 
@@ -222,14 +230,12 @@
 		return _observer;
 	}
 private:
+	int indexOfField(const QString &name) const;
 	void updateFieldLists(Field *field, int fieldID);
-	bool searchIterators(QMap<QString, int>::const_iterator &i, QMap<QString, int>::const_iterator &end, int fieldID, Sorting sorting, SearchScope scope) const;
-	bool searchIteratorsP(QMap<QString, int>::const_iterator &i, QMap<QString, int>::const_iterator &end, int fieldID, Sorting sorting, SearchScope scope) const;
 	static bool openField(Field *field, bool dontOptimize=false);
 
-	QList<Field *> fileList;
+	QMap<int, Field *> fileList;
 	QMultiMap<QString, int> fieldsSortByName;
-	QMultiMap<QString, int> fieldsSortByMapId;
 
 	FieldArchiveIO *_io;
 	ArchiveObserver *_observer;
diff -Nru makoureactor-1.7.2/core/field/FieldArchiveIO.cpp makoureactor-1.8.0/core/field/FieldArchiveIO.cpp
--- makoureactor-1.7.2/core/field/FieldArchiveIO.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchiveIO.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -42,11 +42,11 @@
 
 QString FieldArchiveIO::name() const
 {
-	if(!hasName())
+	if (!hasName())
 		return QString();
 
 	QString filePath = path();
-	if(filePath.isEmpty()) {
+	if (filePath.isEmpty()) {
 		return filePath;
 	}
 
@@ -55,11 +55,11 @@
 
 QString FieldArchiveIO::directory() const
 {
-	if(!hasName())
+	if (!hasName())
 		return path() + "/";
 
 	QString filePath = path();
-	if(filePath.isEmpty()) {
+	if (filePath.isEmpty()) {
 		return filePath;
 	}
 
@@ -69,7 +69,7 @@
 QByteArray FieldArchiveIO::fieldData(Field *field, const QString &extension, bool unlzs)
 {
 	// use data from the cache
-	if(unlzs && fieldDataIsCached(field, extension)) {
+	if (unlzs && fieldDataIsCached(field, extension)) {
 //		qDebug() << "FieldArchive use field data from cache" << field->name();
 		return fieldDataCache;
 	} /*else {
@@ -79,7 +79,7 @@
 	QByteArray data = fieldData2(field, extension, unlzs);
 
 	// put decompressed data in the cache
-	if(unlzs && !data.isEmpty()) {
+	if (unlzs && !data.isEmpty()) {
 		fieldCache = field;
 		fieldDataCache = data;
 		fieldExtensionCache = extension;
@@ -92,14 +92,14 @@
 	QByteArray data = fileData2(fileName);
 	bool checkLzsHeader = !Config::value("lzsNotCheck").toBool();
 
-	if(isLzsFile && (unlzs || checkLzsHeader)) {
-		if(data.size() < 4)		return QByteArray();
+	if (isLzsFile && (unlzs || checkLzsHeader)) {
+		if (data.size() < 4)		return QByteArray();
 
 		const char *lzsDataConst = data.constData();
 		quint32 lzsSize;
 		memcpy(&lzsSize, lzsDataConst, 4);
 
-		if(checkLzsHeader && (quint32)data.size() != lzsSize + 4) {
+		if (checkLzsHeader && (quint32)data.size() != lzsSize + 4) {
 			return QByteArray();
 		}
 
@@ -115,9 +115,9 @@
 {
 	QByteArray newData = fieldData(field, extension, unlzs);
 
-	if(!newData.isEmpty()) {
+	if (!newData.isEmpty()) {
 		QFile fic(path);
-		if(!fic.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+		if (!fic.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 			return 2;
 		}
 		fic.write(newData);
@@ -156,7 +156,7 @@
 FieldArchiveIO::ErrorCode FieldArchiveIO::save(const QString &path, ArchiveObserver *observer)
 {
 	ErrorCode error = save2(path, observer);
-	if(error == Ok) {
+	if (error == Ok) {
 		clearCachedData(); // Important: the file data will change
 	}
 	return error;
diff -Nru makoureactor-1.7.2/core/field/FieldArchiveIOPC.cpp makoureactor-1.8.0/core/field/FieldArchiveIOPC.cpp
--- makoureactor-1.7.2/core/field/FieldArchiveIOPC.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchiveIOPC.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -39,7 +39,7 @@
 FieldArchiveIO::ErrorCode FieldArchiveIOPCLgp::addField(const QString &fileName,
                                                         const QString &name)
 {
-	if(_lgp.addFile(name, new QFile(fileName))) {
+	if (_lgp.addFile(name, new QFile(fileName))) {
 		return FieldArchiveIO::Ok;
 	}
 	return FieldArchiveIO::FieldExists;
@@ -63,9 +63,9 @@
 
 QByteArray FieldArchiveIOPCLgp::fileData2(const QString &fileName)
 {
-	if(!_lgp.isOpen() && !_lgp.open()) return QByteArray();
+	if (!_lgp.isOpen() && !_lgp.open()) return QByteArray();
 	QByteArray data = _lgp.fileData(fileName);
-	if(data.isEmpty()) {
+	if (data.isEmpty()) {
 		return _lgp.modifiedFileData(fileName);
 	}
 	return data;
@@ -79,44 +79,60 @@
 
 FieldArchiveIO::ErrorCode FieldArchiveIOPCLgp::open2(ArchiveObserver *observer)
 {
-	if(!_lgp.isOpen() && !_lgp.open()) {
+	if (!_lgp.isOpen() && !_lgp.open()) {
 		return ErrorOpening;
 	}
 
 	QStringList archiveList = _lgp.fileList();
 
-	if(archiveList.isEmpty()) {
+	if (archiveList.isEmpty()) {
 		return Invalid;
 	}
 
-	if(observer)	observer->setObserverMaximum(archiveList.size());
+	if (observer)	observer->setObserverMaximum(archiveList.size());
 
 	quint32 i, freq = archiveList.size()>50 ? archiveList.size()/50 : 1;
+	QString maplistName = "maplist";
+
+	if (!_lgp.fileExists(maplistName)) {
+		return FieldNotFound;
+	}
+
+	if (!Data::openMaplist(_lgp.fileData(maplistName))) {
+		qWarning() << "Cannot open" << maplistName;
+		return FieldNotFound;
+	}
+
+	QStringList maplist = Data::maplist();
 
 //	QTime t;t.start();
 
 	i = 0;
-	foreach(const QString &name, archiveList) {
-		if(i % freq == 0) {
-			if(observer) {
-				if(observer->observerWasCanceled()) {
+	for (const QString &name : qAsConst(archiveList)) {
+		if (i % freq == 0) {
+			if (observer) {
+				if (observer->observerWasCanceled()) {
 					return Aborted;
 				}
 				observer->setObserverValue(i);
 			}
 		}
 
-		if(name.compare("maplist", Qt::CaseInsensitive) == 0) {
-			if(!Data::openMaplist(_lgp.fileData(name))) {
-				qWarning() << "Cannot open maplist!";
-			}
-		} else if(name.endsWith(".tut", Qt::CaseInsensitive)) {
+		if (name.compare(maplistName, Qt::CaseInsensitive) == 0) {
+		} else if (name.endsWith(".tut", Qt::CaseInsensitive)) {
 			fieldArchive()->addTut(name.toLower().left(name.size()-4));
-		} else if(!name.contains('.')) {
+		} else if (!name.contains('.')) {
 			fieldArchive()->appendField(new FieldPC(name, this));
+			maplist.removeOne(name);
 			++i;
 		}
 	}
+
+	// Adding missing fields
+	for (const QString &name : maplist.mid(65)) {
+		fieldArchive()->appendField(new FieldPC(name));
+	}
+
 //	qDebug("Ouverture : %d ms", t.elapsed());
 	// qDebug() << FICHIER::size << " o";
 	// qDebug() << "nbGS : " << GrpScript::COUNT;
@@ -129,39 +145,37 @@
 
 FieldArchiveIO::ErrorCode FieldArchiveIOPCLgp::save2(const QString &path, ArchiveObserver *observer)
 {
-	if(!_lgp.isOpen() && !_lgp.open()) {
+	if (!_lgp.isOpen() && !_lgp.open()) {
 		return ErrorOpening;
 	}
+	FieldArchiveIterator it(*(fieldArchive()));
 	bool oneFieldAdded = false;
 
-	for(int fieldID=0 ; fieldID<fieldArchive()->size() ; ++fieldID) {
-		if(observer && observer->observerWasCanceled()) {
+	while (it.hasNext()) {
+		if (observer && observer->observerWasCanceled()) {
 			return Aborted;
 		}
-		Field *field = fieldArchive()->field(fieldID, false);
-		if(field && field->isOpen() && field->isModified()) {
-			if(_lgp.fileExists(field->name())) {
-				if(!_lgp.setFile(field->name(), new FieldSaveIO(field))) {
+		Field *field = it.next(false);
+		if (field && field->isOpen() && field->isModified()) {
+			if (_lgp.fileExists(field->name())) {
+				if (!_lgp.setFile(field->name(), new FieldSaveIO(field))) {
 					return ErrorOpening;
 				}
+			} else if (!_lgp.addFile(field->name(), new FieldSaveIO(field))) {
+				return ErrorOpening;
 			} else {
-				return FieldNotFound; // TODO
-				if(!_lgp.addFile(field->name(), new FieldSaveIO(field))) {
-					return ErrorOpening;
-				} else {
-					oneFieldAdded = true;
-				}
+				oneFieldAdded = true;
 			}
 		}
 	}
 
-	if(oneFieldAdded && _lgp.fileExists("maplist")) {
-		QStringList fieldNamesCopy = Data::field_names;
+	if (oneFieldAdded && _lgp.fileExists("maplist")) {
+		QStringList maplistCopy = Data::maplist();
 		// Check if the list was correctly opened before // FIXME
-		if(Data::openMaplist(_lgp.fileData("maplist"))) {
-			Data::field_names = fieldNamesCopy;
+		if (Data::openMaplist(_lgp.fileData("maplist"))) {
+			Data::setMaplist(maplistCopy);
 			QByteArray mapListData;
-			if(Data::saveMaplist(mapListData)){
+			if (Data::saveMaplist(mapListData)){
 				_lgp.setFileData("maplist", mapListData);
 			} else {
 				return Invalid;
@@ -171,12 +185,12 @@
 
 	QMapIterator<QString, TutFilePC *> itTut(fieldArchive()->tuts());
 
-	while(itTut.hasNext()) {
+	while (itTut.hasNext()) {
 		itTut.next();
 		TutFile *tut = itTut.value();
 
-		if(tut != NULL && tut->isModified()) {
-			if(!_lgp.setFileData(itTut.key() + ".tut", tut->save())) {
+		if (tut != nullptr && tut->isModified()) {
+			if (!_lgp.setFileData(itTut.key() + ".tut", tut->save())) {
 				return FieldNotFound;
 			}
 		}
@@ -184,11 +198,13 @@
 
 	this->observer = observer;
 
-	if(!_lgp.pack(path, this)) {
+	if (!_lgp.pack(path, this)) {
 		this->observer = 0;
 
-		switch(_lgp.error()) {
+		switch (_lgp.error()) {
 		case Lgp::OpenError:
+			return ErrorOpening;
+		case Lgp::OpenTempError:
 			return ErrorOpeningTemp;
 		case Lgp::InvalidError:
 			return Invalid;
@@ -222,7 +238,7 @@
 
 Archive *FieldArchiveIOPCFile::device()
 {
-	return NULL;
+	return nullptr;
 }
 
 QByteArray FieldArchiveIOPCFile::fieldData2(Field *field, const QString &extension, bool unlzs)
@@ -235,7 +251,7 @@
 QByteArray FieldArchiveIOPCFile::fileData2(const QString &fileName)
 {
 	Q_UNUSED(fileName)
-	if(!fic.isOpen() && !fic.open(QIODevice::ReadOnly))		return QByteArray();
+	if (!fic.isOpen() && !fic.open(QIODevice::ReadOnly))		return QByteArray();
 	fic.reset();
 	QByteArray data = fic.readAll();
 	fic.close();
@@ -256,7 +272,9 @@
 	QString name = this->name();
 	fieldArchive()->appendField(new FieldPC(name.left(name.lastIndexOf('.')), this));
 
-	Field *field = fieldArchive()->field(0);
+	// Open field
+	FieldArchiveIterator it(*(fieldArchive()));
+	Field *field = it.next();
 
 	return field && field->isOpen() ? Ok : Invalid;
 }
@@ -266,12 +284,14 @@
 	Q_UNUSED(observer)
 	QString path = path0.isNull() ? fic.fileName() : path0;
 
-	Field *field = fieldArchive()->field(0, false);
-	if(field && field->isOpen() && field->isModified()) {
+	FieldArchiveIterator it(*(fieldArchive()));
+	Field *field = it.next(false);
+
+	if (field && field->isOpen() && field->isModified()) {
 		qint8 err = field->save(path, true);
-		if(err == 2)	return ErrorOpening;
-		if(err == 1)	return Invalid;
-		if(err != 0)	return NotImplemented;
+		if (err == 2)	return ErrorOpening;
+		if (err == 1)	return Invalid;
+		if (err != 0)	return NotImplemented;
 	}
 
 	return Ok;
@@ -289,7 +309,7 @@
 
 Archive *FieldArchiveIOPCDir::device()
 {
-	return NULL;
+	return nullptr;
 }
 
 QByteArray FieldArchiveIOPCDir::fieldData2(Field *field, const QString &extension, bool unlzs)
@@ -303,7 +323,7 @@
 	QByteArray data;
 
 	QFile f(dir.filePath(fileName));
-	if(!f.open(QIODevice::ReadOnly))	return QByteArray();
+	if (!f.open(QIODevice::ReadOnly))	return QByteArray();
 	data = f.readAll();
 	f.close();
 
@@ -316,26 +336,26 @@
 	list.append("*");
 	list = dir.entryList(list, QDir::Files | QDir::NoSymLinks);
 
-	if(observer)	observer->setObserverMaximum(list.size());
+	if (observer)	observer->setObserverMaximum(list.size());
 
 	// QTime t;t.start();
 
 	int i=0;
-	foreach(const QString &name, list) {
-		if(observer) {
-			if(observer->observerWasCanceled()) {
+	for (const QString &name : qAsConst(list)) {
+		if (observer) {
+			if (observer->observerWasCanceled()) {
 				return Aborted;
 			}
 			observer->setObserverValue(i++);
 		}
 
-		if(name.compare("maplist", Qt::CaseInsensitive) == 0) {
-			if(!Data::openMaplist(fileData2(name))) {
+		if (name.compare("maplist", Qt::CaseInsensitive) == 0) {
+			if (!Data::openMaplist(fileData2(name))) {
 				qWarning() << "Cannot open maplist!";
 			}
-		} else if(name.endsWith(".tut", Qt::CaseInsensitive)) {
+		} else if (name.endsWith(".tut", Qt::CaseInsensitive)) {
 			fieldArchive()->addTut(name.toLower().left(name.size()-4));
-		} else if(!name.contains(".")) {
+		} else if (!name.contains(".")) {
 			fieldArchive()->appendField(new FieldPC(name, this));
 		}
 	}
@@ -349,47 +369,53 @@
 {
 	bool saveAs;
 
-	if(!path.isEmpty()) {
+	if (!path.isEmpty()) {
 		saveAs = QDir::cleanPath(path) != QDir::cleanPath(dir.path());
 	} else {
 		saveAs = false;
 	}
 
-	quint32 nbFiles = fieldArchive()->size();
-	if(observer)	observer->setObserverMaximum(nbFiles);
+	int i = 0;
+	FieldArchiveIterator it(*(fieldArchive()));
 
-	for(quint32 fieldID=0 ; fieldID<nbFiles ; ++fieldID) {
-		if(observer && observer->observerWasCanceled()) {
+	if (observer) {
+		observer->setObserverMaximum(fieldArchive()->size());
+	}
+
+	while (it.hasNext()) {
+		if (observer && observer->observerWasCanceled()) {
 			return Aborted;
 		}
-		Field *field = fieldArchive()->field(fieldID, false);
-		if(field) {
+		Field *field = it.next(false);
+		if (field) {
 			QString fileName = field->name(),
 			        filePath = dir.filePath(fileName);
-			if(field->isOpen() && field->isModified()) {
+			if (field->isOpen() && field->isModified()) {
 				qint8 err = field->save(filePath, true);
-				if(err == 2)	return ErrorOpening;
-				if(err == 1)	return Invalid;
-				if(err != 0)	return NotImplemented;
-			} else if(saveAs) {
+				if (err == 2)	return ErrorOpening;
+				if (err == 1)	return Invalid;
+				if (err != 0)	return NotImplemented;
+			} else if (saveAs) {
 				QString dstPath = path + "/" + fileName;
-				if(!QFile::copy(filePath, dstPath)) {
+				if (!QFile::copy(filePath, dstPath)) {
 					return ErrorCopying;
 				}
 			}
 		}
-		if(observer)	observer->setObserverValue(fieldID);
+		if (observer) {
+			observer->setObserverValue(i++);
+		}
 	}
 
 	QMapIterator<QString, TutFilePC *> itTut(fieldArchive()->tuts());
 
-	while(itTut.hasNext()) {
+	while (itTut.hasNext()) {
 		itTut.next();
 		TutFile *tut = itTut.value();
 
-		if(tut != NULL && tut->isModified()) {
+		if (tut != nullptr && tut->isModified()) {
 			QFile tutFile(dir.filePath(itTut.key() + ".tut"));
-			if(tutFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+			if (tutFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 				tutFile.write(tut->save());
 				tutFile.close();
 			} else {
diff -Nru makoureactor-1.7.2/core/field/FieldArchiveIOPC.h makoureactor-1.8.0/core/field/FieldArchiveIOPC.h
--- makoureactor-1.7.2/core/field/FieldArchiveIOPC.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchiveIOPC.h	2020-08-08 18:46:56.000000000 +0000
@@ -60,6 +60,9 @@
 	bool observerWasCanceled() const {
 		return observer && observer->observerWasCanceled();
 	}
+	bool observerRetry(const QString &message) {
+		return observer && observer->observerRetry(message);
+	}
 private:
 	QByteArray fieldData2(Field *field, const QString &extension, bool unlzs);
 	QByteArray fileData2(const QString &fileName);
diff -Nru makoureactor-1.7.2/core/field/FieldArchiveIOPS.cpp makoureactor-1.8.0/core/field/FieldArchiveIOPS.cpp
--- makoureactor-1.7.2/core/field/FieldArchiveIOPS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchiveIOPS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -35,14 +35,14 @@
 QByteArray FieldArchiveIOPS::mimData(Field *field, bool unlzs)
 {
 	// use data from the cache
-	if(unlzs && mimDataIsCached(field)) {
+	if (unlzs && mimDataIsCached(field)) {
 		return mimDataCache;
 	}
 
 	QByteArray data = mimData2(field, unlzs);
 
 	// put decompressed data in the cache
-	if(unlzs && !data.isEmpty()) {
+	if (unlzs && !data.isEmpty()) {
 		mimCache = field;
 		mimDataCache = data;
 	}
@@ -52,14 +52,14 @@
 QByteArray FieldArchiveIOPS::modelData(Field *field, bool unlzs)
 {
 	// use data from the cache
-	if(unlzs && modelDataIsCached(field)) {
+	if (unlzs && modelDataIsCached(field)) {
 		return modelDataCache;
 	}
 
 	QByteArray data = modelData2(field, unlzs);
 
 	// put decompressed data in the cache
-	if(unlzs && !data.isEmpty()) {
+	if (unlzs && !data.isEmpty()) {
 		modelCache = field;
 		modelDataCache = data;
 	}
@@ -102,34 +102,47 @@
 
 Archive *FieldArchiveIOPSFile::device()
 {
-	return NULL;
+	return nullptr;
 }
 
 QByteArray FieldArchiveIOPSFile::fieldData2(Field *field, const QString &extension, bool unlzs)
 {
 	Q_UNUSED(field)
-	Q_UNUSED(extension)
-	return fileData(QString(), unlzs);
+	QString path;
+
+	if (extension != "DAT") {
+		path = fic.fileName().left(fic.fileName().lastIndexOf('.')) + "." + extension;
+	}
+
+	return fileData(path, unlzs);
 }
 
 QByteArray FieldArchiveIOPSFile::mimData2(Field *field, bool unlzs)
 {
 	Q_UNUSED(field)
-	Q_UNUSED(unlzs)
-	return QByteArray();
+	return fileData(fic.fileName().left(fic.fileName().lastIndexOf('.')) + ".MIM", unlzs);
 }
 
 QByteArray FieldArchiveIOPSFile::modelData2(Field *field, bool unlzs)
 {
 	Q_UNUSED(field)
-	Q_UNUSED(unlzs)
-	return QByteArray();
+	return fileData(fic.fileName().left(fic.fileName().lastIndexOf('.')) + ".BSX", unlzs);
 }
 
 QByteArray FieldArchiveIOPSFile::fileData2(const QString &fileName)
 {
-	Q_UNUSED(fileName)
-	if(!fic.isOpen() && !fic.open(QIODevice::ReadOnly))		return QByteArray();
+	if (!fileName.isEmpty() && fileName != fic.fileName()) {
+		QFile f(fileName);
+		if (!f.open(QIODevice::ReadOnly)) {
+			return QByteArray();
+		}
+		QByteArray d = f.readAll();
+		f.close();
+
+		return d;
+	}
+
+	if (!fic.isOpen() && !fic.open(QIODevice::ReadOnly))		return QByteArray();
 	fic.reset();
 	QByteArray data = fic.readAll();
 	fic.close();
@@ -150,7 +163,9 @@
 	QString name = this->name();
 	fieldArchive()->appendField(new FieldPS(name.left(name.lastIndexOf('.')), this));
 
-	Field *field = fieldArchive()->field(0);
+	// Open field
+	FieldArchiveIterator it(*(fieldArchive()));
+	Field *field = it.next();
 
 	return field && field->isOpen() ? Ok : Invalid;
 }
@@ -160,12 +175,18 @@
 	Q_UNUSED(observer)
 	QString path = path0.isNull() ? fic.fileName() : path0;
 
-	Field *field = fieldArchive()->field(0, false);
-	if(field && field->isOpen() && field->isModified()) {
+	FieldArchiveIterator it(*(fieldArchive()));
+
+	if (!it.hasNext()) {
+		return FieldNotFound;
+	}
+
+	Field *field = it.next(false);
+	if (field && field->isOpen() && field->isModified()) {
 		qint8 err = field->save(path, true);
-		if(err == 2)	return ErrorOpening;
-		if(err == 1)	return Invalid;
-		if(err != 0)	return NotImplemented;
+		if (err == 2)	return ErrorOpening;
+		if (err == 1)	return Invalid;
+		if (err != 0)	return NotImplemented;
 	}
 
 	return Ok;
@@ -183,7 +204,7 @@
 
 Archive *FieldArchiveIOPSIso::device()
 {
-	return NULL;
+	return nullptr;
 }
 
 QByteArray FieldArchiveIOPSIso::fieldData2(Field *field, const QString &extension, bool unlzs)
@@ -206,9 +227,9 @@
 
 QByteArray FieldArchiveIOPSIso::fileData2(const QString &fileName)
 {
-	if(isoFieldDirectory) {
+	if (isoFieldDirectory) {
 		IsoFile *file = isoFieldDirectory->file(fileName.toUpper());
-		if(file) {
+		if (file) {
 			return file->data();
 		}
 	}
@@ -217,12 +238,12 @@
 
 FieldArchiveIO::ErrorCode FieldArchiveIOPSIso::openIso()
 {
-	if(!iso.isOpen() && !iso.open(QIODevice::ReadOnly)) {
+	if (!iso.isOpen() && !iso.open(QIODevice::ReadOnly)) {
 		return ErrorOpening;
 	}
 
 	isoFieldDirectory = iso.fieldDirectory();
-	if(isoFieldDirectory == NULL) {
+	if (isoFieldDirectory == nullptr) {
 		return FieldNotFound;
 	}
 
@@ -236,28 +257,31 @@
 		return error;
 	}
 
+
+	iso.maplist();
+
 	QList<IsoFile *> files = isoFieldDirectory->files();
 
-	if(observer)	observer->setObserverMaximum(files.size());
+	if (observer)	observer->setObserverMaximum(files.size());
 	bool isDemo = iso.isDemo();
 
 	// QTime t;t.start();
 
 	int i=0;
-	foreach(IsoFile *file, files) {
-		if(observer) {
-			if(observer->observerWasCanceled()) {
+	for (IsoFile *file : qAsConst(files)) {
+		if (observer) {
+			if (observer->observerWasCanceled()) {
 				return Aborted;
 			}
 			observer->setObserverValue(i);
 		}
 
-		if(isDemo) {
-			if(file->name().endsWith(".ATE")) {
+		if (isDemo) {
+			if (file->name().endsWith(".ATE")) {
 				QString name = file->name().mid(file->name().lastIndexOf('/')+1);
 				fieldArchive()->appendField(new FieldPSDemo(name.left(name.lastIndexOf('.')), this));
 			}
-		} else if(file->name().endsWith(".DAT") && !file->name().startsWith("WM")) {
+		} else if (file->name().endsWith(".DAT") && !file->name().startsWith("WM")) {
 			QString name = file->name().mid(file->name().lastIndexOf('/')+1);
 			fieldArchive()->appendField(new FieldPS(name.left(name.lastIndexOf('.')), this));
 		}
@@ -266,7 +290,7 @@
 
 	Data::windowBin = WindowBinFile();
 
-	if(!Data::windowBin.open(iso.windowBinData())) {
+	if (!Data::windowBin.open(iso.windowBinData())) {
 		qWarning() << "Cannot open window.bin";
 	}
 
@@ -283,24 +307,25 @@
 
 	bool saveAs = QFileInfo(path) != QFileInfo(iso.io());
 
-	if(observer)	observer->setObserverMaximum(100);
+	if (observer)	observer->setObserverMaximum(100);
 
 	// FIELD/*.DAT
 
-	for(int fieldID = 0 ; fieldID < fieldArchive()->size() ; ++fieldID) {
-		if(observer && observer->observerWasCanceled()) {
+	FieldArchiveIterator it(*(fieldArchive()));
+	while (it.hasNext()) {
+		if (observer && observer->observerWasCanceled()) {
 			return Aborted;
 		}
-		Field *field = fieldArchive()->field(fieldID, false);
-		if(field && field->isOpen() && field->isModified()) {
+		Field *field = it.next(false);
+		if (field && field->isOpen() && field->isModified()) {
 			IsoFile *isoField = isoFieldDirectory->file(field->name().toUpper() + ".DAT");
-			if(isoField == NULL) {
+			if (isoField == nullptr) {
 				continue;
 			}
 
 			QByteArray newData;
 
-			if(field->save(newData, true)) {
+			if (field->save(newData, true)) {
 				isoField->setModifiedFile(newData);
 			} else {
 				return Invalid;
@@ -309,12 +334,12 @@
 	}
 
 	IsoArchive isoTemp(path % ".makoutemp");
-	if(!isoTemp.open(QIODevice::ReadWrite | QIODevice::Truncate)) {
+	if (!isoTemp.open(QIODevice::ReadWrite | QIODevice::Truncate)) {
 		return ErrorOpening;
 	}
 
-	if(!iso.pack(&isoTemp, observer, isoFieldDirectory)) {
-		if(observer && observer->observerWasCanceled()) {
+	if (!iso.pack(&isoTemp, observer, isoFieldDirectory)) {
+		if (observer && observer->observerWasCanceled()) {
 			return Aborted;
 		}
 		return Invalid;
@@ -325,20 +350,39 @@
 	iso.close();
 	isoTemp.close();
 
-	// Remove or close the old file
-	if(!saveAs) {
-		if(!QFile::remove(iso.fileName())) {
-			return ErrorRemoving;
-		}
-	} else {
+	if (saveAs) {
 		iso.setFileName(path);
 	}
 	// Move the temporary file
-	if(QFile::exists(path) && !QFile::remove(path)) {
-		return ErrorRemoving;
+	if (QFile::exists(path) && !QFile::remove(path)) {
+		bool removed = false;
+
+		while (observer->observerRetry(QObject::tr("Cannot remove destination archive"))) {
+			if (QFile::remove(path)) {
+				removed = true;
+				break;
+			}
+		}
+
+		if (!removed) {
+			QFile::remove(isoTemp.fileName());
+			openIso(); // Reopen
+			return ErrorRemoving;
+		}
 	}
-	if(!QFile::rename(isoTemp.fileName(), path)) {
-		return ErrorRenaming;
+	if (!QFile::rename(isoTemp.fileName(), path)) {
+		bool renamed = false;
+
+		while (observer->observerRetry(QObject::tr("Cannot rename temporary file to destination path"))) {
+			if (QFile::rename(isoTemp.fileName(), path)) {
+				renamed = true;
+				break;
+			}
+		}
+
+		if (!renamed) {
+			return ErrorRenaming;
+		}
 	}
 
 	ErrorCode error = openIso();
@@ -361,7 +405,7 @@
 
 Archive *FieldArchiveIOPSDir::device()
 {
-	return NULL;
+	return nullptr;
 }
 
 QByteArray FieldArchiveIOPSDir::fieldData2(Field *field, const QString &extension, bool unlzs)
@@ -387,7 +431,7 @@
 	QByteArray data;
 
 	QFile f(dir.filePath(fileName.toUpper()));
-	if(!f.open(QIODevice::ReadOnly))	return QByteArray();
+	if (!f.open(QIODevice::ReadOnly))	return QByteArray();
 	data = f.readAll();
 	f.close();
 
@@ -400,20 +444,20 @@
 	list.append("*.DAT");
 	list = dir.entryList(list, QDir::Files | QDir::NoSymLinks);
 
-	if(observer)	observer->setObserverMaximum(list.size());
+	if (observer)	observer->setObserverMaximum(list.size());
 
 	// QTime t;t.start();
 
 	int i=0;
-	foreach(const QString &name, list) {
-		if(observer) {
-			if(observer->observerWasCanceled()) {
+	for (const QString &name : qAsConst(list)) {
+		if (observer) {
+			if (observer->observerWasCanceled()) {
 				return Aborted;
 			}
 			observer->setObserverValue(i++);
 		}
 
-		if(!name.startsWith("WM", Qt::CaseInsensitive)) {
+		if (!name.startsWith("WM", Qt::CaseInsensitive)) {
 			fieldArchive()->appendField(new FieldPS(name.left(name.lastIndexOf('.')), this));
 		}
 	}
@@ -427,36 +471,42 @@
 {
 	bool saveAs;
 
-	if(!path.isEmpty()) {
+	if (!path.isEmpty()) {
 		saveAs = QDir::cleanPath(path) != QDir::cleanPath(dir.path());
 	} else {
 		saveAs = false;
 	}
 
-	quint32 nbFiles = fieldArchive()->size();
-	if(observer)	observer->setObserverMaximum(nbFiles);
+	FieldArchiveIterator it(*(fieldArchive()));
+	quint32 i = 0;
 
-	for(quint32 fieldID=0 ; fieldID<nbFiles ; ++fieldID) {
-		if(observer && observer->observerWasCanceled()) {
+	if (observer) {
+		observer->setObserverMaximum(fieldArchive()->size());
+	}
+
+	while (it.hasNext()) {
+		if (observer && observer->observerWasCanceled()) {
 			return Aborted;
 		}
-		Field *field = fieldArchive()->field(fieldID, false);
+		Field *field = it.next(false);
 		QString datName = field->name().toUpper() + ".DAT",
 		        datPath = dir.filePath(datName);
-		if(field) {
-			if(field->isOpen() && field->isModified()) {
+		if (field) {
+			if (field->isOpen() && field->isModified()) {
 				qint8 err = field->save(datPath, true);
-				if(err == 2)	return ErrorOpening;
-				if(err == 1)	return Invalid;
-				if(err != 0)	return NotImplemented;
-			} else if(saveAs) {
+				if (err == 2)	return ErrorOpening;
+				if (err == 1)	return Invalid;
+				if (err != 0)	return NotImplemented;
+			} else if (saveAs) {
 				QString dstPath = path + "/" + datName;
-				if(!QFile::copy(datPath, dstPath)) {
+				if (!QFile::copy(datPath, dstPath)) {
 					return ErrorCopying;
 				}
 			}
 		}
-		if(observer)	observer->setObserverValue(fieldID);
+		if (observer) {
+			observer->setObserverValue(i++);
+		}
 	}
 
 	return Ok;
diff -Nru makoureactor-1.7.2/core/field/FieldArchivePC.cpp makoureactor-1.8.0/core/field/FieldArchivePC.cpp
--- makoureactor-1.7.2/core/field/FieldArchivePC.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchivePC.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -16,6 +16,7 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 #include "FieldArchivePC.h"
+#include "BackgroundFilePC.h"
 
 FieldArchivePC::FieldArchivePC() :
 	FieldArchive()
@@ -25,7 +26,7 @@
 FieldArchivePC::FieldArchivePC(const QString &path, FieldArchiveIO::Type type) :
 	FieldArchive()
 {
-	switch(type) {
+	switch (type) {
 	case FieldArchiveIO::Lgp:
 		setIO(new FieldArchiveIOPCLgp(path, this));
 		break;
@@ -42,15 +43,19 @@
 
 FieldArchivePC::~FieldArchivePC()
 {
-	foreach(TutFile *tut, _tuts) {
-		if(tut != NULL)	delete tut;
+	for (TutFile *tut : qAsConst(_tuts)) {
+		if (tut != nullptr) {
+			delete tut;
+		}
 	}
 }
 
 void FieldArchivePC::clear()
 {
-	foreach(TutFile *tut, _tuts) {
-		if(tut != NULL)	delete tut;
+	for (TutFile *tut : qAsConst(_tuts)) {
+		if (tut != nullptr) {
+			delete tut;
+		}
 	}
 
 	_tuts.clear();
@@ -72,25 +77,25 @@
 {
 	QMapIterator<QString, TutFilePC *> it(_tuts);
 
-	while(it.hasNext()) {
+	while (it.hasNext()) {
 		it.next();
 
 		const QString &tutName = it.key();
 
-		if(name.startsWith(tutName, Qt::CaseInsensitive)) {
+		if (name.startsWith(tutName, Qt::CaseInsensitive)) {
 			TutFilePC *tutFile = it.value();
-			if(tutFile == NULL) {
+			if (tutFile == nullptr) {
 				QByteArray data = io()->fileData(tutName + ".tut", false, false);
-				if(!data.isEmpty()) {
+				if (!data.isEmpty()) {
 					tutFile = new TutFilePC();
-					if(!static_cast<TutFile *>(tutFile)->open(data)) {
+					if (!static_cast<TutFile *>(tutFile)->open(data)) {
 						delete tutFile;
-						return NULL;
+						return nullptr;
 					}
 					_tuts.insert(tutName, tutFile);
 					return tutFile;
 				} else {
-					return NULL;
+					return nullptr;
 				}
 			} else {
 				return tutFile;
@@ -98,7 +103,7 @@
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 const QMap<QString, TutFilePC *> &FieldArchivePC::tuts() const
@@ -108,13 +113,13 @@
 
 void FieldArchivePC::addTut(const QString &name)
 {
-	_tuts.insert(name, NULL);
+	_tuts.insert(name, nullptr);
 }
 
 void FieldArchivePC::setSaved()
 {
-	foreach(TutFile *tut, _tuts) {
-		if(tut != NULL) {
+	for (TutFile *tut : qAsConst(_tuts)) {
+		if (tut != nullptr) {
 			tut->setModified(false);
 		}
 	}
@@ -129,39 +134,67 @@
 
 void FieldArchivePC::cleanModelLoader()
 {
+	FieldArchiveIterator it(*this);
+	int i = 0;
+
 	observer()->setObserverMaximum(size());
 
-	for(int fieldID=0 ; fieldID<size() ; ++fieldID) {
-		if(observer()->observerWasCanceled()) {
+	while (it.hasNext()) {
+		if (observer()->observerWasCanceled()) {
 			return;
 		}
-		FieldPC *field = this->field(fieldID, true);
-		if(field != NULL) {
+		FieldPC *field = static_cast<FieldPC *>(it.next());
+		if (field != nullptr) {
 			FieldModelLoaderPC *modelLoader = field->fieldModelLoader();
-			if(modelLoader->isOpen()) {
+			if (modelLoader->isOpen()) {
 				modelLoader->clean();
-				if(modelLoader->isModified() && !field->isModified()) {
+				if (modelLoader->isModified() && !field->isModified()) {
 					field->setModified(true);
 				}
 			}
 		}
-		observer()->setObserverValue(fieldID);
+		observer()->setObserverValue(i++);
 	}
 }
 
 void FieldArchivePC::removeUnusedSections()
 {
+	FieldArchiveIterator it(*this);
+	int i = 0;
+
 	observer()->setObserverMaximum(size());
 
-	for(int fieldID=0 ; fieldID<size() ; ++fieldID) {
-		if(observer()->observerWasCanceled()) {
+	while (it.hasNext()) {
+		if (observer()->observerWasCanceled()) {
 			return;
 		}
-		FieldPC *field = this->field(fieldID, true);
-		if(field != NULL) {
+		FieldPC *field = static_cast<FieldPC *>(it.next());
+		if (field != nullptr) {
 			field->setRemoveUnusedSection(true);
 			field->setModified(true);
 		}
-		observer()->setObserverValue(fieldID);
+		observer()->setObserverValue(i++);
+	}
+}
+
+void FieldArchivePC::repairBackgroundsPC()
+{
+	FieldArchiveIterator it(*this);
+	int i = 0;
+
+	observer()->setObserverMaximum(size());
+
+	while (it.hasNext()) {
+		if (observer()->observerWasCanceled()) {
+			return;
+		}
+		FieldPC *field = static_cast<FieldPC *>(it.next());
+		if (field != nullptr && (field->name().toLower() == "lastmap" || field->name().toLower() == "fr_e")) {
+			BackgroundFilePC *bg = static_cast<BackgroundFilePC *>(field->background());
+			if (bg->isOpen() && bg->repair()) {
+				field->setModified(true);
+			}
+		}
+		observer()->setObserverValue(i++);
 	}
 }
diff -Nru makoureactor-1.7.2/core/field/FieldArchivePC.h makoureactor-1.8.0/core/field/FieldArchivePC.h
--- makoureactor-1.7.2/core/field/FieldArchivePC.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchivePC.h	2020-08-08 18:46:56.000000000 +0000
@@ -46,6 +46,7 @@
 
 	void cleanModelLoader();
 	void removeUnusedSections();
+	void repairBackgroundsPC();
 private:
 	QMap<QString, TutFilePC *> _tuts;
 };
diff -Nru makoureactor-1.7.2/core/field/FieldArchivePS.cpp makoureactor-1.8.0/core/field/FieldArchivePS.cpp
--- makoureactor-1.7.2/core/field/FieldArchivePS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldArchivePS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -25,7 +25,7 @@
 FieldArchivePS::FieldArchivePS(const QString &path, FieldArchiveIO::Type type) :
 	FieldArchive()
 {
-	switch(type) {
+	switch (type) {
 	case FieldArchiveIO::Dir:
 		setIO(new FieldArchiveIOPSDir(path, this));
 		break;
diff -Nru makoureactor-1.7.2/core/field/Field.cpp makoureactor-1.8.0/core/field/Field.cpp
--- makoureactor-1.7.2/core/field/Field.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Field.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -29,52 +29,52 @@
 {
 }
 
-Field::~Field()
+Field::Field(const QString &name) :
+	Field(name, nullptr)
 {
-	foreach(FieldPart *part, _parts) {
-		if(part)	delete part;
-	}
-}
 
-bool Field::isOpen() const
-{
-	return _isOpen;
 }
 
-bool Field::isModified() const
+Field::~Field()
 {
-	return _isModified;
+	for (FieldPart *part : qAsConst(_parts)) {
+		if (part)	delete part;
+	}
 }
 
 void Field::setModified(bool modified)
 {
-	if(!_isOpen) {
-		if(!open()) {
+	if (!_isOpen && _io != nullptr) {
+		if (!open()) {
 			qWarning() << "Unable to reopen!";
 			return;
 		}
 	}
 	_isModified = modified;
 	FieldPart *section1 = part(Scripts);
-	if(section1)	section1->setModified(modified);
+	if (section1)	section1->setModified(modified);
 }
 
 bool Field::open(bool dontOptimize)
 {
 	QByteArray fileData;
 
-	if(headerSize() > 0) {
+	if (_io == nullptr) {
+		return false;
+	}
+
+	if (headerSize() > 0) {
 		QString fileType = sectionFile(Scripts);
-		if(!dontOptimize && !_io->fieldDataIsCached(this, fileType)) {
+		if (!dontOptimize && !_io->fieldDataIsCached(this, fileType)) {
 			QByteArray lzsData = _io->fieldData(this, fileType, false);
 
-			if(lzsData.size() < 4)	return false;
+			if (lzsData.size() < 4)	return false;
 
 			const char *lzsDataConst = lzsData.constData();
 			quint32 lzsSize;
 			memcpy(&lzsSize, lzsDataConst, 4);
 
-			if(!Config::value("lzsNotCheck").toBool() && (quint32)lzsData.size() != lzsSize + 4)
+			if (!Config::value("lzsNotCheck").toBool() && (quint32)lzsData.size() != lzsSize + 4)
 				return false;
 
 			fileData = LZS::decompress(lzsDataConst + 4, qMin(lzsSize, quint32(lzsData.size() - 4)), headerSize());//partial decompression
@@ -82,7 +82,7 @@
 			fileData = _io->fieldData(this, fileType);
 		}
 
-		if(fileData.size() < headerSize())	return false;
+		if (fileData.size() < headerSize())	return false;
 
 		openHeader(fileData);
 	}
@@ -98,7 +98,7 @@
 	qint8 ret = importer(path, isDat, compressed,
 	                     Field::FieldSection(0xFFFF), // Everything
 	                     device2);
-	if(ret == 0) {
+	if (ret == 0) {
 		_isOpen = true;
 	}
 	return ret;
@@ -109,7 +109,7 @@
 	qint8 ret = importer(data, isPSField,
 	                     Field::FieldSection(0xFFFF), // Everything
 	                     device2);
-	if(ret == 0) {
+	if (ret == 0) {
 		_isOpen = true;
 	}
 	return ret;
@@ -119,7 +119,7 @@
 {
 	int idPart = sectionId(part);
 
-	if(idPart < sectionCount() - 1) {
+	if (idPart < sectionCount() - 1) {
 		return sectionPosition(idPart+1) - paddingBetweenSections() - sectionPosition(idPart);
 	}
 	return -1;
@@ -127,28 +127,30 @@
 
 QByteArray Field::sectionData(FieldSection part, bool dontOptimize)
 {
-	if(!_isOpen) {
+	if (!_isOpen) {
 		open();
 	}
 
-	if(!_isOpen)	return QByteArray();
+	if (!_isOpen || _io == nullptr) {
+		return QByteArray();
+	}
 
 	int idPart = sectionId(part),
 			position = sectionPosition(idPart),
 			size = sectionSize(part);
 	QString fileType = sectionFile(part);
 
-	if(size < 0) {
+	if (size < 0) {
 		dontOptimize = true;
 	}
 
 	QByteArray data;
-	if(dontOptimize || _io->fieldDataIsCached(this, fileType)) {
+	if (dontOptimize || _io->fieldDataIsCached(this, fileType)) {
 		data = _io->fieldData(this, fileType);
 	} else {
 		QByteArray lzsData = _io->fieldData(this, fileType, false);
 
-		if(lzsData.size() < 4) {
+		if (lzsData.size() < 4) {
 			return QByteArray();
 		}
 
@@ -156,14 +158,14 @@
 		quint32 lzsSize;
 		memcpy(&lzsSize, lzsDataConst, 4);
 
-		if(!Config::value("lzsNotCheck").toBool() && (quint32)lzsData.size() != lzsSize + 4) {
+		if (!Config::value("lzsNotCheck").toBool() && (quint32)lzsData.size() != lzsSize + 4) {
 			return QByteArray();
 		}
 
 		data = LZS::decompress(lzsDataConst + 4, qMin(lzsSize, quint32(lzsData.size() - 4)), sectionPosition(idPart+1));
 	}
 
-	if(size < 0) {
+	if (size < 0) {
 		QByteArray footer = saveFooter();
 		if (!footer.isEmpty() && data.right(footer.size()) == footer) {
 			return data.mid(position, data.size() - position - footer.size());
@@ -172,14 +174,9 @@
 	return data.mid(position, size);
 }
 
-FieldArchiveIO *Field::io() const
-{
-	return _io;
-}
-
 FieldPart *Field::createPart(FieldSection section)
 {
-	switch(section) {
+	switch (section) {
 	case Scripts:		return new Section1File(this);
 	case Akaos:			return new TutFileStandard(this);
 	case Camera:		return new CaFile(this);
@@ -187,6 +184,7 @@
 	case Walkmesh:		return new IdFile(this);
 	case Encounter:		return new EncounterFile(this);
 	case Inf:			return new InfFile(this);
+	case Tiles:			return new BackgroundTilesFile(this);
 	default:			return 0;
 	}
 }
@@ -200,18 +198,42 @@
 {
 	FieldPart *p = part(section);
 
-	if(!p) {
+	if (!p) {
 		p = createPart(section);
 		_parts.insert(section, p);
 	}
 
-	if(open && !p->isOpen()) {
+	if (open && !p->isOpen()) {
 		p->open();
 	}
 
 	return p;
 }
 
+void Field::initEmpty()
+{
+	for (const FieldSection &section : orderOfSections() << Akaos) {
+		FieldPart *p = part(section);
+
+		if (!p) {
+			p = createPart(section);
+			if (p) {
+				_parts.insert(section, p);
+			}
+		}
+
+		if (p) {
+			p->initEmpty();
+			p->setOpen(true);
+			p->setModified(true);
+		}
+	}
+
+	setRemoveUnusedSection(true);
+	_isOpen = true;
+	setModified(true);
+}
+
 Section1File *Field::scriptsAndTexts(bool open)
 {
 	return static_cast<Section1File *>(part(Scripts, open));
@@ -224,9 +246,7 @@
 
 TutFileStandard *Field::tutosAndSounds(bool open)
 {
-	TutFileStandard *tut = static_cast<TutFileStandard *>(part(Akaos, open));
-	scriptsAndTexts(false)->setTut(tut);
-	return tut;
+	return static_cast<TutFileStandard *>(part(Akaos, open));
 }
 
 IdFile *Field::walkmesh(bool open)
@@ -249,6 +269,11 @@
 	return static_cast<FieldModelLoader *>(part(ModelLoader, open));
 }
 
+BackgroundTilesFile *Field::tiles(bool open)
+{
+	return static_cast<BackgroundTilesFile *>(part(Tiles, open));
+}
+
 BackgroundFile *Field::background(bool open)
 {
 	return static_cast<BackgroundFile *>(part(Background, open));
@@ -259,18 +284,13 @@
 	QMap<int, FieldModelFile *> ret;
 
 	int modelCount = scriptsAndTexts()->modelCount();
-	for(int modelId=0 ; modelId < modelCount ; ++modelId) {
+	for (int modelId=0; modelId < modelCount; ++modelId) {
 		ret.insert(modelId, fieldModel(modelId, 0, animate, open));
 	}
 
 	return ret;
 }
 
-const QString &Field::name() const
-{
-	return _name;
-}
-
 void Field::setName(const QString &name)
 {
 	_name = name;
@@ -279,8 +299,10 @@
 
 void Field::setSaved()
 {
-	_isOpen = false; // Force reopen to refresh positions automatically
-	foreach(FieldPart *part, _parts) {
+	if (_io != nullptr) {
+		_isOpen = false; // Force reopen to refresh positions automatically
+	}
+	for (FieldPart *part : qAsConst(_parts)) {
 		part->setModified(false);
 	}
 }
@@ -289,7 +311,7 @@
 {
 	newData = QByteArray();
 
-	if(!isOpen()) {
+	if (!isOpen()) {
 		return false;
 	}
 
@@ -300,33 +322,37 @@
 
 	// Sections
 	int id=0;
-	foreach(const FieldSection &fieldSection, orderOfSections()) {
+	for (const FieldSection &fieldSection : orderOfSections()) {
 		// Section position
 		quint32 pos = headerSize() + newData.size() + diffSectionPos();
 		toc.append((char *)&pos, 4);
 
 		QByteArray section;
 
-		if(fieldSection != Unused || !_removeUnusedSection) { // FIXME: ugly hack only for PC version
+		if (fieldSection != Tiles || !_removeUnusedSection) { // FIXME: ugly hack only for PC version
 
 			// Section data
 			FieldPart *fieldPart = part(fieldSection == Field::PalettePC
 										? Field::Background // FIXME: EXCEPTION NEEDS TO BE REMOVED IN THE FUTURE
 										: fieldSection);
 
-			if(fieldPart && fieldPart->canSave() &&
+			if (fieldPart && fieldPart->canSave() &&
 					fieldPart->isOpen() && fieldPart->isModified()) {
-				if(fieldSection == Field::PalettePC) { // FIXME: EXCEPTION NEEDS TO BE REMOVED IN THE FUTURE
+				if (fieldSection == Field::PalettePC) { // FIXME: EXCEPTION NEEDS TO BE REMOVED IN THE FUTURE
 					section = static_cast<BackgroundFilePC *>(fieldPart)->savePal();
 				} else {
 					section = fieldPart->save();
+					if (section.isEmpty()) {
+						qWarning() << "Field::save empty section error" << int(fieldSection);
+						return false;
+					}
 				}
 			} else {
 				section = sectionData(fieldSection, true);
 			}
 		}
 
-		if(hasSectionHeader()) {
+		if (hasSectionHeader()) {
 			quint32 section_size = section.size();
 			newData.append((char *)&section_size, 4);
 		}
@@ -346,7 +372,7 @@
 	// Header prepended to the section data
 	newData.prepend(toc);
 
-	if(compress) {
+	if (compress) {
 		const QByteArray &compresse = LZS::compress(newData);
 		quint32 lzsSize = compresse.size();
 		newData = QByteArray((char *)&lzsSize, 4).append(compresse);
@@ -359,9 +385,9 @@
 {
 	QByteArray newData;
 
-	if(save(newData, compress)) {
+	if (save(newData, compress)) {
 		QFile fic(path);
-		if(!fic.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+		if (!fic.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 			return 2;
 		}
 		fic.write(newData);
@@ -373,108 +399,114 @@
 	return 0;
 }
 
-qint8 Field::importer(const QString &path, bool isDat, bool compressed, FieldSections part, QIODevice *device2)
+qint8 Field::importer(const QString &path, bool isDat, bool compressed, FieldSections part, QIODevice *bsxDevice,
+                      QIODevice *mimDevice)
 {
 	QFile fic(path);
-	if(!fic.open(QIODevice::ReadOnly))	return 1;
-	if(fic.size() > 10000000)	return 2;
+	if (!fic.open(QIODevice::ReadOnly))	return 1;
+	if (fic.size() > 10000000)	return 2;
 
 	QByteArray data;
 
-	if(compressed) { // compressed field
+	if (compressed) { // compressed field
 		quint32 fileSize=0;
-		if(fic.read((char *)&fileSize, 4) != 4)	return 2;
-		if(fileSize+4 != fic.size()) return 2;
+		if (fic.read((char *)&fileSize, 4) != 4)	return 2;
+		if (fileSize+4 != fic.size()) return 2;
 
 		data = LZS::decompressAll(fic.readAll());
 	} else { // uncompressed field
 		data = fic.readAll();
 	}
 	
-	return importer(data, isDat, part, device2);
+	return importer(data, isDat, part, bsxDevice, mimDevice);
 }
 
-qint8 Field::importer(const QByteArray &data, bool isPSField, FieldSections part, QIODevice *device2)
+bool Field::importModelLoader(const QByteArray &sectionData, bool isPSField, QIODevice *bsxDevice)
 {
-	if(isPSField) {
+	Q_UNUSED(sectionData);
+	Q_UNUSED(isPSField);
+	Q_UNUSED(bsxDevice);
+	return false;
+}
+
+qint8 Field::importer(const QByteArray &data, bool isPSField, FieldSections part, QIODevice *bsxDevice,
+                      QIODevice *mimDevice)
+{
+	if (isPSField) {
 		quint32 sectionPositions[7];
 		const int headerSize = 28;
 
-		if(data.size() < headerSize)	return 2;
+		if (data.size() < headerSize)	return 2;
 		memcpy(sectionPositions, data.constData(), headerSize); // header
 		qint32 vramDiff = sectionPositions[0] - headerSize;// vram section1 pos - real section 1 pos
 
-		for(int i=0 ; i<7 ; ++i) {
+		for (int i=0; i<7; ++i) {
 			sectionPositions[i] -= vramDiff;
 		}
 
-		if(part.testFlag(Scripts)) {
+		if (part.testFlag(Scripts)) {
 			Section1File *section1 = scriptsAndTexts(false);
-			if(!section1->open(data.mid(sectionPositions[0], sectionPositions[1]-sectionPositions[0])))	return 2;
+			if (!section1->open(data.mid(sectionPositions[0], sectionPositions[1]-sectionPositions[0])))	return 2;
 			section1->setModified(true);
 		}
-		if(part.testFlag(Akaos)) {
+		if (part.testFlag(Akaos)) {
 			TutFile *_tut = tutosAndSounds(false);
-			if(!_tut->open(data.mid(sectionPositions[0], sectionPositions[1]-sectionPositions[0])))		return 2;
+			if (!_tut->open(data.mid(sectionPositions[0], sectionPositions[1]-sectionPositions[0])))		return 2;
 			_tut->setModified(true);
 		}
-		if(part.testFlag(Encounter)) {
+		if (part.testFlag(Encounter)) {
 			EncounterFile *enc = encounter(false);
-			if(!enc->open(data.mid(sectionPositions[5], sectionPositions[6]-sectionPositions[5])))		return 2;
+			if (!enc->open(data.mid(sectionPositions[5], sectionPositions[6]-sectionPositions[5])))		return 2;
 			enc->setModified(true);
 		}
-		if(part.testFlag(Walkmesh)) {
+		if (part.testFlag(Walkmesh)) {
 			IdFile *walk = walkmesh(false);
-			if(!walk->open(data.mid(sectionPositions[1], sectionPositions[2]-sectionPositions[1])))		return 2;
+			if (!walk->open(data.mid(sectionPositions[1], sectionPositions[2]-sectionPositions[1])))		return 2;
 			walk->setModified(true);
 		}
-		if(part.testFlag(Camera)) {
+		if (part.testFlag(Camera)) {
 			CaFile *ca = camera(false);
-			if(!ca->open(data.mid(sectionPositions[3], sectionPositions[4]-sectionPositions[3])))		return 2;
+			if (!ca->open(data.mid(sectionPositions[3], sectionPositions[4]-sectionPositions[3])))		return 2;
 			ca->setModified(true);
 		}
-		if(part.testFlag(Inf)) {
+		if (part.testFlag(Inf)) {
 			InfFile *inf = this->inf(false);
-			if(!inf->open(data.mid(sectionPositions[4], sectionPositions[5]-sectionPositions[4])))	return 2;
+			if (!inf->open(data.mid(sectionPositions[4], sectionPositions[5]-sectionPositions[4])))	return 2;
+			inf->setMapName(name());
 			inf->setModified(true);
 		}
-		if(part.testFlag(Background)) {
-			if(!device2) {
-				qWarning() << "Field::importer Additional device need to be initialized";
+		if (part.testFlag(ModelLoader)) {
+			if (!importModelLoader(data.mid(sectionPositions[6]), isPSField, bsxDevice)) {
 				return 2;
 			}
-			if(!device2->open(QIODevice::ReadOnly)) {
-				return 1;
-			}
-
-			quint32 lzsSize;
-
-			if(device2->read((char *)&lzsSize, 4) != 4) {
+		}
+		if (part.testFlag(Background)) {
+			if (!mimDevice) {
+				qWarning() << "Field::importer Additional device need to be initialized";
 				return 2;
 			}
-
-			if(lzsSize + 4 != device2->size()) {
-				return 2;
+			if (!mimDevice->open(QIODevice::ReadOnly)) {
+				return 1;
 			}
 
-			QByteArray mimData = LZS::decompressAll(device2->readAll()),
+			QByteArray mimData = LZS::decompressAllWithHeader(mimDevice->readAll()),
 					tilesData = data.mid(sectionPositions[2], sectionPositions[3]-sectionPositions[2]);
 
 			BackgroundFilePS *bg;
 
-			if(isPS()) {
+			if (isPS()) {
 				bg = static_cast<BackgroundFilePS *>(background(false));
 			} else {
 				bg = new BackgroundFilePS(0);
 			}
 
-			if(!bg->open(mimData, tilesData)) {
-				if(isPC()) {
+			if (!bg->open(mimData, tilesData)) {
+				if (isPC()) {
 					delete bg;
 				}
 				return 2;
 			}
-			if(isPC()) {
+			if (isPC()) {
 				_parts.insert(Background, new BackgroundFilePC(bg->toPC(static_cast<FieldPC *>(this))));
 				delete bg;
 			}
@@ -484,58 +516,65 @@
 	} else {
 		quint32 sectionPositions[9];
 
-		if(data.size() < 6 + 9 * 4)	return 3;
+		if (data.size() < 6 + 9 * 4)	return 3;
 		memcpy(sectionPositions, data.constData() + 6, 9 * 4); // header
 
-		if(part.testFlag(Scripts)) {
+		if (part.testFlag(Scripts)) {
 			Section1File *section1 = scriptsAndTexts(false);
-			if(!section1->open(data.mid(sectionPositions[0]+4, sectionPositions[1]-sectionPositions[0]-4)))	return 2;
+			if (!section1->open(data.mid(sectionPositions[0]+4, sectionPositions[1]-sectionPositions[0]-4)))	return 2;
 			section1->setModified(true);
 		}
-		if(part.testFlag(Akaos)) {
+		if (part.testFlag(Akaos)) {
 			TutFile *_tut = tutosAndSounds(false);
-			if(!_tut->open(data.mid(sectionPositions[0]+4, sectionPositions[1]-sectionPositions[0]-4)))		return 2;
+			if (!_tut->open(data.mid(sectionPositions[0]+4, sectionPositions[1]-sectionPositions[0]-4)))		return 2;
 			_tut->setModified(true);
 		}
-		if(part.testFlag(Encounter)) {
+		if (part.testFlag(ModelLoader)) {
+			if (!importModelLoader(data.mid(sectionPositions[1]+4, sectionPositions[2]-sectionPositions[1]-4),
+			                       isPSField, bsxDevice)) {
+				return 2;
+			}
+		}
+		if (part.testFlag(Encounter)) {
 			EncounterFile *enc = encounter(false);
-			if(!enc->open(data.mid(sectionPositions[6]+4, sectionPositions[7]-sectionPositions[6]-4)))		return 2;
+			if (!enc->open(data.mid(sectionPositions[6]+4, sectionPositions[7]-sectionPositions[6]-4)))		return 2;
 			enc->setModified(true);
 		}
-		if(part.testFlag(Walkmesh)) {
+		if (part.testFlag(Walkmesh)) {
 			IdFile *walk = walkmesh(false);
-			if(!walk->open(data.mid(sectionPositions[4]+4, sectionPositions[5]-sectionPositions[4]-4)))		return 2;
+			if (!walk->open(data.mid(sectionPositions[4]+4, sectionPositions[5]-sectionPositions[4]-4)))		return 2;
 			walk->setModified(true);
 		}
-		if(part.testFlag(Camera)) {
+		if (part.testFlag(Camera)) {
 			CaFile *ca = camera(false);
-			if(!ca->open(data.mid(sectionPositions[1]+4, sectionPositions[2]-sectionPositions[1]-4)))		return 2;
+			if (!ca->open(data.mid(sectionPositions[1]+4, sectionPositions[2]-sectionPositions[1]-4)))		return 2;
 			ca->setModified(true);
 		}
-		if(part.testFlag(Inf)) {
+		if (part.testFlag(Inf)) {
 			InfFile *inf = this->inf(false);
-			if(!inf->open(data.mid(sectionPositions[7]+4, sectionPositions[8]-sectionPositions[7]-4)))	return 2;
+			if (!inf->open(data.mid(sectionPositions[7]+4, sectionPositions[8]-sectionPositions[7]-4)))	return 2;
+			inf->setMapName(name());
 			inf->setModified(true);
 		}
-		if(part.testFlag(Background)) {
+		if (part.testFlag(Background)) {
 			QByteArray mimData = data.mid(sectionPositions[8]+4),
 					palData = data.mid(sectionPositions[3]+4, sectionPositions[4]-sectionPositions[3]-4);
 
 			BackgroundFilePC *bg;
 
-			if(isPC()) {
+			if (isPC()) {
 				bg = static_cast<BackgroundFilePC *>(background(false));
 			} else {
 				bg = new BackgroundFilePC(0);
 			}
 
-			if(!bg->open(mimData, palData)) {
-				if(isPS()) {
+			if (!bg->open(mimData, palData)) {
+				if (isPS()) {
 					delete bg;
 				}
 				return 2;
 			}
-			if(isPS()) {
+			if (isPS()) {
 				_parts.insert(Background, new BackgroundFilePS(bg->toPS(static_cast<FieldPS *>(this))));
 				delete bg;
 			}
@@ -546,8 +585,3 @@
 
 	return 0;
 }
-
-void Field::setRemoveUnusedSection(bool remove)
-{
-	_removeUnusedSection = remove;
-}
diff -Nru makoureactor-1.7.2/core/field/Field.h makoureactor-1.8.0/core/field/Field.h
--- makoureactor-1.7.2/core/field/Field.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Field.h	2020-08-08 18:46:56.000000000 +0000
@@ -28,6 +28,7 @@
 #include "FieldModelLoader.h"
 #include "FieldModelFile.h"
 #include "BackgroundFile.h"
+#include "BackgroundTilesFile.h"
 
 class FieldArchiveIO;
 
@@ -44,15 +45,20 @@
 		Inf = 0x40,
 		Background = 0x80,
 		PalettePC = 0x100,
-		Unused = 0x200
+		Tiles = 0x200
 	};
 	Q_DECLARE_FLAGS(FieldSections, FieldSection)
 
 	Field(const QString &name, FieldArchiveIO *io);
+	explicit Field(const QString &name);
 	virtual ~Field();
 
-	bool isOpen() const;
-	bool isModified() const;
+	inline bool isOpen() const {
+		return _isOpen;
+	}
+	inline bool isModified() const {
+		return _isModified;
+	}
 	void setModified(bool modified);
 
 	virtual bool isPC() const=0;
@@ -63,11 +69,15 @@
 	qint8 open(const QString &path, bool isDat, bool compressed, QIODevice *device2=0);
 	qint8 open(const QByteArray &data, bool isPSField, QIODevice *device2=0);
 
+	void initEmpty();
+
 	void setSaved();
 	bool save(QByteArray &newData, bool compress);
 	qint8 save(const QString &path, bool compress);
-	qint8 importer(const QString &path, bool isDat, bool compressed, FieldSections part, QIODevice *device2=0);
-	virtual qint8 importer(const QByteArray &data, bool isPSField, FieldSections part, QIODevice *device2=0);
+	qint8 importer(const QString &path, bool isDat, bool compressed, FieldSections part, QIODevice *bsxDevice = nullptr,
+	               QIODevice *mimDevice = nullptr);
+	qint8 importer(const QByteArray &data, bool isPSField, FieldSections part, QIODevice *bsxDevice = nullptr,
+	               QIODevice *mimDevice = nullptr);
 
 	Section1File *scriptsAndTexts(bool open=true);
 	EncounterFile *encounter(bool open=true);
@@ -75,18 +85,25 @@
 	IdFile *walkmesh(bool open=true);
 	CaFile *camera(bool open=true);
 	InfFile *inf(bool open=true);
+	BackgroundTilesFile *tiles(bool open=true);
 	BackgroundFile *background(bool open=true);
 	virtual FieldModelLoader *fieldModelLoader(bool open=true);
 	virtual FieldModelFile *fieldModel(int modelID, int animationID=0, bool animate=true, bool open=true)=0;
 	QMap<int, FieldModelFile *> fieldModels(bool animate=true, bool open=true);
 
-	const QString &name() const;
+	inline const QString &name() const {
+		return _name;
+	}
 	void setName(const QString &name);
-	virtual FieldArchiveIO *io() const;
+	inline virtual FieldArchiveIO *io() const {
+		return _io;
+	}
 	int sectionSize(FieldSection part) const;
 	QByteArray sectionData(FieldSection part, bool dontOptimize=false);
 
-	void setRemoveUnusedSection(bool remove);// FIXME: only in PC version, ugly hack detected!
+	inline void setRemoveUnusedSection(bool remove) { // FIXME: only in PC version, ugly hack detected!
+		_removeUnusedSection = remove;
+	}
 protected:
 	virtual int headerSize() const=0;
 	virtual void openHeader(const QByteArray &fileData)=0;
@@ -103,6 +120,7 @@
 	virtual QList<Field::FieldSection> orderOfSections() const=0;
 	virtual quint32 diffSectionPos() const=0;
 	virtual bool hasSectionHeader() const=0;
+	virtual bool importModelLoader(const QByteArray &sectionData, bool isPSField, QIODevice *bsxDevice);
 private:
 	FieldPart *part(FieldSection section, bool open);
 
diff -Nru makoureactor-1.7.2/core/field/FieldIO.cpp makoureactor-1.8.0/core/field/FieldIO.cpp
--- makoureactor-1.7.2/core/field/FieldIO.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldIO.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -23,38 +23,47 @@
 {
 }
 
+bool FieldSaveIO::open(OpenMode mode)
+{
+	if (!setCache()) {
+		return false;
+	}
+	return QIODevice::open(mode);
+}
+
 void FieldSaveIO::close()
 {
 	_cache.clear();
 	QIODevice::close();
 }
 
+qint64 FieldSaveIO::size() const
+{
+	return _cache.size();
+}
+
 qint64 FieldSaveIO::readData(char *data, qint64 maxSize)
 {
-	if(setCache()) {
-		if(pos() < _cache.size()) {
-			const char *constData = _cache.constData();
-			qint64 r = qMin(maxSize, _cache.size() - pos());
-			if(r > 0) {
-				memcpy(data, constData + pos(), r);
-				return r;
-			} else if(r == 0) {
-				return 0;
-			} else {
-				return -1;
-			}
-		} else {
+	if (pos() < _cache.size()) {
+		const char *constData = _cache.constData();
+		qint64 r = qMin(maxSize, _cache.size() - pos());
+		if (r > 0) {
+			memcpy(data, constData + pos(), r);
+			return r;
+		} else if (r == 0) {
 			return 0;
 		}
+		return -1;
 	}
-	return -1;
+	return 0;
 }
 
 bool FieldSaveIO::setCache()
 {
-	if(_cache.isEmpty()) {
-		if(!_field->save(_cache, true)) {
+	if (_cache.isEmpty()) {
+		if (!_field->save(_cache, true)) {
 			_cache.clear();
+			setErrorString(tr("Cannot save field map %1").arg(_field->name()));
 			return false;
 		}
 	}
diff -Nru makoureactor-1.7.2/core/field/FieldIO.h makoureactor-1.8.0/core/field/FieldIO.h
--- makoureactor-1.7.2/core/field/FieldIO.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldIO.h	2020-08-08 18:46:56.000000000 +0000
@@ -26,7 +26,9 @@
 {
 public:
 	FieldSaveIO(Field *field, QObject *parent=0);
+	virtual bool open(OpenMode mode);
 	virtual void close();
+	virtual qint64 size() const;
 protected:
 	virtual qint64 readData(char *data, qint64 maxSize);
 private:
diff -Nru makoureactor-1.7.2/core/field/FieldModelFile.cpp makoureactor-1.8.0/core/field/FieldModelFile.cpp
--- makoureactor-1.7.2/core/field/FieldModelFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -23,14 +23,14 @@
 
 FieldModelFile::~FieldModelFile()
 {
-	foreach (const FieldModelBone &bone, _skeleton.bones()) {
+	for (const FieldModelBone &bone : _skeleton.bones()) {
 		qDeleteAll(bone.parts());
 	}
 }
 
 void FieldModelFile::clear()
 {
-	foreach (const FieldModelBone &bone, _skeleton.bones()) {
+	for (const FieldModelBone &bone : _skeleton.bones()) {
 		qDeleteAll(bone.parts());
 	}
 	_skeleton.clear();
@@ -39,5 +39,5 @@
 
 bool FieldModelFile::isValid() const
 {
-	return !_animations.isEmpty() && !_skeleton.isEmpty();
+	return _skeleton.boneCount() == 1 || (!_animations.isEmpty() && !_skeleton.isEmpty());
 }
diff -Nru makoureactor-1.7.2/core/field/FieldModelFile.h makoureactor-1.8.0/core/field/FieldModelFile.h
--- makoureactor-1.7.2/core/field/FieldModelFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -58,6 +58,8 @@
 		return _animations.at(animationID);
 	}
 	virtual QImage loadedTexture(FieldModelGroup *group)=0;
+	virtual void *textureIdForGroup(FieldModelGroup *group) const=0;
+	virtual QHash<void *, QImage> loadedTextures()=0;
 private:
 	Q_DISABLE_COPY(FieldModelFile)
 protected:
diff -Nru makoureactor-1.7.2/core/field/FieldModelFilePC.cpp makoureactor-1.8.0/core/field/FieldModelFilePC.cpp
--- makoureactor-1.7.2/core/field/FieldModelFilePC.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelFilePC.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -24,7 +24,7 @@
 #include "../TexFile.h"
 
 FieldModelFilePC::FieldModelFilePC() :
-	FieldModelFile(), _charLgp(0)
+    FieldModelFile(), _charLgp(nullptr)
 {
 }
 
@@ -34,14 +34,24 @@
 	FieldModelFile::clear();
 }
 
-quint8 FieldModelFilePC::load(const QString &hrc, const QString &a, bool animate)
+void FieldModelFilePC::openTextures(const QStringList &textureFiles)
 {
-	if (hrc.isEmpty() || a.isEmpty()) {
-		return 2;
+	// Open all loaded tex
+	quint32 texID = 0;
+	for (const QString &texName : textureFiles) {
+		QImage tex = openTexture(texName % ".tex");
+		if (!tex.isNull()) {
+			_loadedTex.insert(texID, tex);
+		} else {
+			qWarning() << "FieldModelFilePC::load error texture" << texName;
+		}
+		++texID;
 	}
+}
 
-	CharArchive *charLgp = CharArchive::instance();
-	if (!charLgp->isOpen()) {
+quint8 FieldModelFilePC::load(CharArchive *charLgp, const QString &hrc, const QString &a, bool animate)
+{
+	if (hrc.isEmpty() || a.isEmpty() || !charLgp->isOpen()) {
 		return 2;
 	}
 	_charLgp = charLgp;
@@ -63,18 +73,8 @@
 
 		if (openMesh(rsdFiles, textureFiles)) {
 
-			if (openAnimation(aFilename % ".a", animate)) {
-				// Open all loaded tex
-				int texID = 0;
-				foreach(const QString &texName, textureFiles) {
-					QImage tex = openTexture(texName % ".tex");
-					if (!tex.isNull()) {
-						_loadedTex.insert(texID, tex);
-					} else {
-						qWarning() << "FieldModelFilePC::load error texture" << hrcFilename << texName;
-					}
-					++texID;
-				}
+			if (openAnimation(aFilename % ".a", animate) || _skeleton.boneCount() == 1) {
+				openTextures(textureFiles);
 
 				return true;
 			} else {
@@ -90,6 +90,44 @@
 	return false;
 }
 
+quint8 FieldModelFilePC::loadPart(CharArchive *charLgp, const QString &rsd)
+{
+	if (rsd.isEmpty() || !charLgp->isOpen()) {
+		return 2;
+	}
+	_charLgp = charLgp;
+	_skeleton.addBone(FieldModelBone(0.0, -1));
+
+	QStringList textureFiles;
+	if (openPart(rsd.toLower(), 0, textureFiles)) {
+		openTextures(textureFiles);
+
+		return 0;
+	}
+
+	qWarning() << "FieldModelFilePC::openMesh cannot open part" << rsd;
+
+	return 1;
+}
+
+quint8 FieldModelFilePC::load(const QString &hrc, const QString &a, bool animate)
+{
+	return load(CharArchive::instance(), hrc, a, animate);
+}
+
+QHash<void *, QImage> FieldModelFilePC::loadedTextures()
+{
+	QHash<void *, QImage> ret;
+	QHashIterator<quint32, QImage> it(_loadedTex);
+
+	while (it.hasNext()) {
+		it.next();
+		ret.insert((void *)it.key(), it.value());
+	}
+
+	return ret;
+}
+
 bool FieldModelFilePC::openSkeleton(const QString &hrcFileName, QMultiMap<int, QStringList> &rsdFiles)
 {
 	HrcFile io(_charLgp->fileIO(hrcFileName));
@@ -115,7 +153,7 @@
 		itRsd.next();
 		int boneID = itRsd.key();
 
-		foreach (const QString &rsd, itRsd.value()) {
+		for (const QString &rsd : itRsd.value()) {
 			if (openPart(rsd.toLower() % ".rsd", boneID, textureFiles)) {
 				onePartOpened = true;
 			} else {
@@ -153,7 +191,7 @@
 		return QImage();
 	}
 	TexFile tex(texFile->readAll());
-	if(!tex.isValid()) {
+	if (!tex.isValid()) {
 		return QImage();
 	}
 	return tex.image();
diff -Nru makoureactor-1.7.2/core/field/FieldModelFilePC.h makoureactor-1.8.0/core/field/FieldModelFilePC.h
--- makoureactor-1.7.2/core/field/FieldModelFilePC.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelFilePC.h	2020-08-08 18:46:56.000000000 +0000
@@ -30,6 +30,8 @@
 	FieldModelFilePC();
 	inline bool translateAfter() const { return true; }
 	void clear();
+	quint8 load(CharArchive *charLgp, const QString &hrc, const QString &a, bool animate = true);
+	quint8 loadPart(CharArchive *charLgp, const QString &rsd);
 	quint8 load(const QString &hrc, const QString &a, bool animate = true);
 	inline int loadedTextureCount() const {
 		return _loadedTex.size();
@@ -37,15 +39,20 @@
 	inline QImage loadedTexture(FieldModelGroup *group) {
 		return _loadedTex.value(static_cast<FieldModelTextureRefPC *>(group->textureRef())->id());
 	}
+	inline void *textureIdForGroup(FieldModelGroup *group) const {
+		return (void *)(ulong(static_cast<FieldModelTextureRefPC *>(group->textureRef())->id()));
+	}
+	QHash<void *, QImage> loadedTextures();
 private:
 	Q_DISABLE_COPY(FieldModelFilePC)
 	bool openSkeleton(const QString &hrcFileName, QMultiMap<int, QStringList> &rsdFiles);
 	bool openAnimation(const QString &aFileName, bool animate = false);
 	bool openMesh(QMultiMap<int, QStringList> &rsdFiles, QStringList &textureFiles);
 	bool openPart(const QString &rsdFileName, int boneID, QStringList &textureFiles);
+	void openTextures(const QStringList &textureFiles);
 	QImage openTexture(const QString &texFileName);
 	CharArchive *_charLgp;
-	QHash<int, QImage> _loadedTex;
+	QHash<quint32, QImage> _loadedTex;
 };
 
 #endif // FIELDMODELFILEPC_H
diff -Nru makoureactor-1.7.2/core/field/FieldModelFilePS.cpp makoureactor-1.8.0/core/field/FieldModelFilePS.cpp
--- makoureactor-1.7.2/core/field/FieldModelFilePS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelFilePS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -102,19 +102,19 @@
 	const QList<QRect> &texturesRects = _textures.rects();
 
 	if (!texturesRects.isEmpty()) {
-		foreach (const FieldModelBone &bone, _skeleton.bones()) {
+		for (const FieldModelBone &bone : _skeleton.bones()) {
 
-			foreach (FieldModelPart *part, bone.parts()) {
+			for (FieldModelPart *part : bone.parts()) {
 				QHash<int, int> imgY;
 
-				foreach (FieldModelGroup *group, part->groups()) {
+				for (FieldModelGroup *group : part->groups()) {
 					if (group->hasTexture()) {
 						FieldModelTextureRefPS *textureRef = static_cast<FieldModelTextureRefPS *>(group->textureRef());
 
 						if (textureRef->type() > 1) {
 							QPoint newPos = textureRef->imgPos() + QPoint(0, imgY.value(textureRef->imgX()));
 							int rectId = 0;
-							foreach (const QRect &rect, texturesRects) {
+							for (const QRect &rect : texturesRects) {
 								if (rect.topLeft() == newPos) {
 									break;
 								}
@@ -139,7 +139,7 @@
 	if (modelBcx.isValid()) {
 		if (!skeleton().isEmpty()) {
 			qWarning() << "FieldPS::fieldModel bsx present, but bcx skeleton not empty";
-			foreach (const FieldModelBone &bone, skeleton().bones()) {
+			for (const FieldModelBone &bone : skeleton().bones()) {
 				qDeleteAll(bone.parts());
 			}
 		}
@@ -195,9 +195,26 @@
 	return tex;
 }
 
+QHash<void *, QImage> FieldModelFilePS::loadedTextures()
+{
+	QHash<void *, QImage> ret;
+
+	for (const FieldModelBone &bone : _skeleton.bones()) {
+		for (FieldModelPart *part : bone.parts()) {
+			for (FieldModelGroup *group : part->groups()) {
+				if (group->hasTexture()) {
+					ret.insert((void *)group, loadedTexture(group));
+				}
+			}
+		}
+	}
+
+	return ret;
+}
+
 QImage FieldModelFilePS::vramImage() const
 {
-	foreach (const QRect &rect, _textures.rects()) {
+	for (const QRect &rect : _textures.rects()) {
 		if (rect.height() == 1) {
 			return _textures.toImage(rect.topLeft(), FieldModelTexturesPS::Bpp8);
 		}
diff -Nru makoureactor-1.7.2/core/field/FieldModelFilePS.h makoureactor-1.8.0/core/field/FieldModelFilePS.h
--- makoureactor-1.7.2/core/field/FieldModelFilePS.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelFilePS.h	2020-08-08 18:46:56.000000000 +0000
@@ -52,6 +52,10 @@
 	}
 	bool load(FieldPS *currentField, int modelID, int animationID, bool animate);
 	QImage loadedTexture(FieldModelGroup *group);
+	inline void *textureIdForGroup(FieldModelGroup *group) const {
+		return (void *)group;
+	}
+	QHash<void *, QImage> loadedTextures();
 	QImage vramImage() const;
 private:
 	Q_DISABLE_COPY(FieldModelFilePS)
diff -Nru makoureactor-1.7.2/core/field/FieldModelLoaderPC.cpp makoureactor-1.8.0/core/field/FieldModelLoaderPC.cpp
--- makoureactor-1.7.2/core/field/FieldModelLoaderPC.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelLoaderPC.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -37,17 +37,17 @@
 
 void FieldModelLoaderPC::clean()
 {
-	for(int modelID=0 ; modelID<model_anims.size() ; ++modelID) {
-		if(!model_nameChar.at(modelID).isEmpty()) {
+	for (int modelID=0; modelID<model_anims.size(); ++modelID) {
+		if (!model_nameChar.at(modelID).isEmpty()) {
 			setModified(true);
 			model_nameChar[modelID].clear();
 		}
 
 		const QStringList &animNames = model_anims.at(modelID);
-		for(int animID=0 ; animID<animNames.size() ; ++animID) {
+		for (int animID=0; animID<animNames.size(); ++animID) {
 			const QString &animName = animNames.at(animID);
 			int index = animName.lastIndexOf('.');
-			if(index != -1) {
+			if (index != -1) {
 				model_anims[modelID][animID] = animName.left(index);
 				setModified(true);
 			}
@@ -55,6 +55,67 @@
 	}
 }
 
+void FieldModelLoaderPC::initEmpty()
+{
+	model_nameChar.clear();
+	model_nameChar.append("");
+	model_nameChar.append("");
+	model_nameChar.append("");
+
+	model_nameHRC.clear();
+	model_nameHRC.append("AAAA.HRC");
+	model_nameHRC.append("AAGB.HRC");
+	model_nameHRC.append("ABDA.HRC");
+
+	model_anims.clear();
+	model_anims.append(QStringList()
+	                   << "AAFE"
+	                   << "AAFF"
+	                   << "AAGA");
+	model_anims.append(QStringList()
+	                   << "ABCD"
+	                   << "ABCE"
+	                   << "ABCF");
+	model_anims.append(QStringList()
+	                   << "ABIE"
+	                   << "ABIF"
+	                   << "ABJA");
+
+	QList<quint16> animUnknown = QVector<quint16>(3, 1).toList();
+	model_anims_unknown.clear();
+	model_anims_unknown.append(animUnknown);
+	model_anims_unknown.append(animUnknown);
+	model_anims_unknown.append(animUnknown);
+
+	model_unknown.clear();
+	model_unknown.append(0);
+	model_unknown.append(0);
+	model_unknown.append(0);
+
+	model_typeHRC.clear();
+	model_typeHRC.append(512);
+	model_typeHRC.append(512);
+	model_typeHRC.append(512);
+
+	QList<FieldModelColorDir> c;
+	c
+	    << FieldModelColorDir(-659, 411, 4034, qRgb(128, 128, 128))
+	    << FieldModelColorDir(1536, -3349, -1839, qRgb(204, 204, 204))
+	    << FieldModelColorDir(-2920, -1474, -2484, qRgb(77, 77, 77));
+
+	colors.clear();
+	colors.append(c);
+	colors.append(c);
+	colors.append(c);
+
+	QRgb gc = qRgb(64, 64, 64);
+
+	model_global_color.clear();
+	model_global_color.append(gc);
+	model_global_color.append(gc);
+	model_global_color.append(gc);
+}
+
 bool FieldModelLoaderPC::open()
 {
 	return open(field()->sectionData(Field::ModelLoader));
@@ -64,7 +125,7 @@
 {
 	const char *constData = data.constData();
 
-	if((quint32)data.size() < 6)	return false;
+	if ((quint32)data.size() < 6)	return false;
 
 	quint32 i, j;
 	quint16 nb;
@@ -78,15 +139,15 @@
 	quint16 fieldScale = field()->scriptsAndTexts()->scale();
 
 	quint32 curPos = 6;
-	for(i=0 ; i<nb ; ++i) {
-		if((quint32)data.size() < curPos+2) {
+	for (i=0; i<nb; ++i) {
+		if ((quint32)data.size() < curPos+2) {
 			clear();
 			return false;
 		}
 
 		memcpy(&len, constData + curPos, 2); // model name len
 
-		if((quint32)data.size() < curPos+48+len) {
+		if ((quint32)data.size() < curPos+48+len) {
 			clear();
 			return false;
 		}
@@ -97,7 +158,7 @@
 		model_nameHRC.append(QString(data.mid(curPos+4+len,8)));
 		bool ok;
 		int typeHRC_value = QString(data.mid(curPos+12+len,4)).toInt(&ok);
-		if(!ok)	typeHRC_value = fieldScale;
+		if (!ok)	typeHRC_value = fieldScale;
 		model_typeHRC.append(typeHRC_value);
 
 		memcpy(&nbAnim, constData + curPos+16+len, 2);
@@ -106,7 +167,7 @@
 
 		curPos += 18 + len;
 
-		for(j=0 ; j<3 ; ++j) {
+		for (j=0; j<3; ++j) {
 			qint16 dirA, dirB, dirC;
 			memcpy(&dirA, constData + curPos + 3 + j * 9, 2);
 			memcpy(&dirB, constData + curPos + 5 + j * 9, 2);
@@ -127,15 +188,15 @@
 
 		QStringList anims;
 		QList<quint16> anims_unknown;
-		for(j=0 ; j<nbAnim ; ++j) {
-			if((quint32)data.size() < curPos+2) {
+		for (j=0; j<nbAnim; ++j) {
+			if ((quint32)data.size() < curPos+2) {
 				clear();
 				return false;
 			}
 
 			memcpy(&len, constData + curPos, 2); // animation name len
 
-			if((quint32)data.size() < curPos+4+len) {
+			if ((quint32)data.size() < curPos+4+len) {
 				clear();
 				return false;
 			}
@@ -160,7 +221,7 @@
 	quint16 nbHRC = this->model_nameHRC.size();
 	QByteArray HRCs;
 
-	for(int i=0 ; i<nbHRC ; ++i) {
+	for (int i=0; i<nbHRC; ++i) {
 		const QString &modelName = this->model_nameChar.at(i);
 		quint16 nameSize = modelName.size();
 		HRCs.append((char *)&nameSize, 2); //model name size
@@ -171,7 +232,7 @@
 		const quint16 &nbAnim = this->model_anims.at(i).size();
 		HRCs.append((char *)&nbAnim, 2); //Nb Anims
 
-		for(quint8 j=0 ; j<3 ; ++j) { //Colors
+		for (quint8 j=0; j<3; ++j) { //Colors
 			const FieldModelColorDir &colorDir = this->colors.at(i).at(j);
 			HRCs.append((char)qRed(colorDir.color));
 			HRCs.append((char)qGreen(colorDir.color));
@@ -186,7 +247,7 @@
 		HRCs.append((char)qGreen(globalColor));
 		HRCs.append((char)qBlue(globalColor));
 
-		for(int j=0 ; j<nbAnim ; ++j) { //Animations
+		for (int j=0; j<nbAnim; ++j) { //Animations
 			nameSize = this->model_anims.at(i).at(j).size();
 			HRCs.append((char *)&nameSize, 2); //Animation name size
 			HRCs.append(this->model_anims.at(i).at(j)); //Animation name
@@ -209,15 +270,15 @@
 
 bool FieldModelLoaderPC::insertModel(int modelID, const QString &hrcName)
 {
-	if(modelCount() < maxModelCount()) {
+	if (modelCount() < maxModelCount()) {
 		QList<FieldModelColorDir> color;
-		if(!colors.isEmpty()) {
+		if (!colors.isEmpty()) {
 			color = colors.first();
 		} else {
 			color = QVector<FieldModelColorDir>(10, FieldModelColorDir()).toList();
 		}
 		QRgb globalColor;
-		if(!model_global_color.isEmpty()) {
+		if (!model_global_color.isEmpty()) {
 			globalColor = model_global_color.first();
 		} else {
 			globalColor = Qt::black;
@@ -241,7 +302,7 @@
 
 void FieldModelLoaderPC::removeModel(int modelID)
 {
-	if(modelID >= 0 && modelID < modelCount()) {
+	if (modelID >= 0 && modelID < modelCount()) {
 		model_unknown.removeAt(modelID);
 		model_nameChar.removeAt(modelID);
 		model_nameHRC.removeAt(modelID);
@@ -258,7 +319,7 @@
 
 void FieldModelLoaderPC::swapModel(int oldModelID, int newModelID)
 {
-	if(oldModelID != newModelID
+	if (oldModelID != newModelID
 			&& oldModelID >= 0 && oldModelID < modelCount()
 			&& newModelID >= 0 && newModelID < modelCount()) {
 		model_unknown.swap(oldModelID, newModelID);
@@ -287,7 +348,7 @@
 
 void FieldModelLoaderPC::setHRCName(int modelID, const QString &HRCName)
 {
-	if(modelID >= 0 && modelID < model_nameHRC.size()
+	if (modelID >= 0 && modelID < model_nameHRC.size()
 			&& model_nameHRC.at(modelID) != HRCName) {
 		model_nameHRC.replace(modelID, HRCName);
 		setModified(true);
@@ -306,7 +367,7 @@
 
 void FieldModelLoaderPC::setCharName(int modelID, const QString &charName)
 {
-	if(modelID >= 0 && modelID < model_nameChar.size()
+	if (modelID >= 0 && modelID < model_nameChar.size()
 			&& model_nameChar.at(modelID) != charName) {
 		model_nameChar.replace(modelID, charName);
 		setModified(true);
@@ -320,7 +381,7 @@
 
 void FieldModelLoaderPC::setScale(int modelID, quint16 scale)
 {
-	if(modelID >= 0 && modelID < model_typeHRC.size()
+	if (modelID >= 0 && modelID < model_typeHRC.size()
 			&& model_typeHRC.at(modelID) != scale) {
 		model_typeHRC.replace(modelID, scale);
 		setModified(true);
@@ -334,7 +395,7 @@
 
 void FieldModelLoaderPC::setUnknown(int modelID, quint16 unknown)
 {
-	if(modelID >= 0 && modelID < model_unknown.size()
+	if (modelID >= 0 && modelID < model_unknown.size()
 			&& model_unknown.at(modelID) != unknown) {
 		model_unknown.replace(modelID, unknown);
 		setModified(true);
@@ -349,7 +410,7 @@
 void FieldModelLoaderPC::setLightColors(int modelID,
                                         const QList<FieldModelColorDir> &lightColors)
 {
-	if(modelID >= 0 && modelID < colors.size()
+	if (modelID >= 0 && modelID < colors.size()
 			&& colors.at(modelID) != lightColors) {
 		colors.replace(modelID, lightColors);
 		setModified(true);
@@ -359,7 +420,7 @@
 void FieldModelLoaderPC::setLightColor(int modelID, int colorID,
                                        const FieldModelColorDir &lightColor)
 {
-	if(modelID >= 0 && modelID < colors.size()
+	if (modelID >= 0 && modelID < colors.size()
 			&& colorID < colors.at(modelID).size()
 			&& colors.at(modelID).at(colorID) != lightColor) {
 		colors[modelID].replace(colorID, lightColor);
@@ -374,7 +435,7 @@
 
 void FieldModelLoaderPC::setGlobalColor(int modelID, QRgb globalColor)
 {
-	if(modelID >= 0 && modelID < model_global_color.size()
+	if (modelID >= 0 && modelID < model_global_color.size()
 			&& model_global_color.at(modelID) != globalColor) {
 		model_global_color.replace(modelID, globalColor);
 		setModified(true);
@@ -383,14 +444,14 @@
 
 int FieldModelLoaderPC::animCount(int modelID) const
 {
-	if(modelID >= 0 && modelID < model_anims.size())
+	if (modelID >= 0 && modelID < model_anims.size())
 		return model_anims.at(modelID).size();
 	return 0;
 }
 
 bool FieldModelLoaderPC::insertAnim(int modelID, int numA, const QString &name)
 {
-	if(modelID >= 0 && modelID < modelCount() && animCount(modelID) < maxAnimCount()) {
+	if (modelID >= 0 && modelID < modelCount() && animCount(modelID) < maxAnimCount()) {
 		model_anims[modelID].insert(numA, name);
 		model_anims_unknown[modelID].insert(numA, 1);
 		setModified(true);
@@ -401,7 +462,7 @@
 
 void FieldModelLoaderPC::removeAnim(int modelID, int numA)
 {
-	if(modelID >= 0 && modelID < modelCount()
+	if (modelID >= 0 && modelID < modelCount()
 			&& numA >= 0 && numA < animCount(modelID)) {
 		model_anims[modelID].removeAt(numA);
 		model_anims_unknown[modelID].removeAt(numA);
@@ -411,7 +472,7 @@
 
 void FieldModelLoaderPC::swapAnim(int modelID, int oldNumA, int newNumA)
 {
-	if(modelID >= 0 && modelID < modelCount()
+	if (modelID >= 0 && modelID < modelCount()
 			&& oldNumA != newNumA
 			&& oldNumA >= 0 && oldNumA < animCount(modelID)
 			&& newNumA >= 0 && newNumA < animCount(modelID)) {
@@ -433,9 +494,9 @@
 
 void FieldModelLoaderPC::setAName(int modelID, int numA, const QString &animName)
 {
-	if(modelID >= 0 && modelID < model_anims.size()) {
+	if (modelID >= 0 && modelID < model_anims.size()) {
 		QStringList &animNames = model_anims[modelID];
-		if(numA >= 0 && numA < animNames.size()
+		if (numA >= 0 && numA < animNames.size()
 				&& animNames.at(numA) != animName) {
 			animNames.replace(numA, animName);
 			setModified(true);
@@ -445,7 +506,7 @@
 
 quint16 FieldModelLoaderPC::animUnknown(int modelID, int numA) const
 {
-	if(modelID < model_anims_unknown.size())
+	if (modelID < model_anims_unknown.size())
 		return model_anims_unknown.at(modelID).value(numA);
 	else
 		return 0;
@@ -453,9 +514,9 @@
 
 void FieldModelLoaderPC::setAnimUnknown(int modelID, int numA, quint16 unknown)
 {
-	if(modelID >= 0 && modelID < model_anims_unknown.size()) {
+	if (modelID >= 0 && modelID < model_anims_unknown.size()) {
 		QList<quint16> &animUnknown = model_anims_unknown[modelID];
-		if(numA >= 0 && numA < animUnknown.size()
+		if (numA >= 0 && numA < animUnknown.size()
 				&& animUnknown.at(numA) != unknown) {
 			animUnknown.replace(numA, unknown);
 			setModified(true);
diff -Nru makoureactor-1.7.2/core/field/FieldModelLoaderPC.h makoureactor-1.8.0/core/field/FieldModelLoaderPC.h
--- makoureactor-1.7.2/core/field/FieldModelLoaderPC.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelLoaderPC.h	2020-08-08 18:46:56.000000000 +0000
@@ -38,6 +38,7 @@
 	explicit FieldModelLoaderPC(Field *field);
 	void clear();
 	void clean();
+	void initEmpty();
 	bool open();
 	bool open(const QByteArray &data);
 	QByteArray save() const;
diff -Nru makoureactor-1.7.2/core/field/FieldModelLoaderPS.cpp makoureactor-1.8.0/core/field/FieldModelLoaderPS.cpp
--- makoureactor-1.7.2/core/field/FieldModelLoaderPS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelLoaderPS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -16,6 +16,7 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 #include "FieldModelLoaderPS.h"
+#include "AFile.h"
 #include "Field.h"
 
 FieldModelLoaderPS::FieldModelLoaderPS(Field *field) :
@@ -37,7 +38,7 @@
 {
 	const char *constData = data.constData();
 
-	if(data.size() < 4) {
+	if (data.size() < 4) {
 		return false;
 	}
 
@@ -45,12 +46,12 @@
 	memcpy(&size, constData, 2);
 	memcpy(&modelCount, constData + 2, 2);
 
-	if(size != data.size() || (size-4) / 8 != modelCount || (size-4) % 8 != 0) {
+	if (size != data.size() || (size-4) / 8 != modelCount || (size-4) % 8 != 0) {
 		qWarning() << "invalid model loader size" << size << modelCount << data.size();
 		return false;
 	}
 
-	if(sizeof(FieldModelLoaderStruct) != 8) {
+	if (sizeof(FieldModelLoaderStruct) != 8) {
 		qWarning() << "invalid model loader struct size" << sizeof(FieldModelLoaderStruct);
 		Q_ASSERT(false);
 	}
@@ -59,7 +60,7 @@
 
 	FieldModelLoaderStruct modelLoader;
 
-	for(quint32 i=0 ; i<modelCount ; ++i) {
+	for (quint32 i=0; i<modelCount; ++i) {
 		memcpy(&modelLoader, constData + 4 + i*sizeof(FieldModelLoaderStruct), sizeof(FieldModelLoaderStruct));
 
 		_modelLoaders.append(modelLoader);
@@ -86,7 +87,7 @@
 	ret.append((char *)&size, 2);
 	ret.append((char *)&modelCount, 2);
 
-	foreach(const FieldModelLoaderStruct &modelLoader, _modelLoaders) {
+	for (const FieldModelLoaderStruct &modelLoader : _modelLoaders) {
 		ret.append((char *)&modelLoader, sizeof(FieldModelLoaderStruct));
 	}
 
@@ -100,7 +101,7 @@
 
 int FieldModelLoaderPS::animCount(int modelID) const
 {
-	if(modelID >= 0 && modelID < _modelLoaders.size())
+	if (modelID >= 0 && modelID < _modelLoaders.size())
 		return _modelLoaders.at(modelID).animationCount;
 	return 0;
 }
@@ -108,7 +109,7 @@
 quint16 FieldModelLoaderPS::unknown(int modelID) const
 {
 	// TODO: returns a quint16 word? (unknown2 is quint8)
-	if(modelID >= 0 && modelID < _modelLoaders.size())
+	if (modelID >= 0 && modelID < _modelLoaders.size())
 		return _modelLoaders.at(modelID).unknown2/* | (_modelLoaders.at(modelID).unknown3 << 8)*/;
 	return 0;
 }
@@ -116,7 +117,7 @@
 void FieldModelLoaderPS::setUnknown(int modelID, quint16 unknown)
 {
 	// TODO: sets a quint16 word?
-	if(modelID >= 0 && modelID < _modelLoaders.size()
+	if (modelID >= 0 && modelID < _modelLoaders.size()
 			&& _modelLoaders.at(modelID).unknown2 != unknown) {
 		_modelLoaders[modelID].unknown2 = unknown;
 		setModified(true);
@@ -130,9 +131,66 @@
 
 void FieldModelLoaderPS::setModel(int modelID, const FieldModelLoaderStruct &modelLoader)
 {
-	if(modelID >= 0 && modelID < _modelLoaders.size()
+	if (modelID >= 0 && modelID < _modelLoaders.size()
 			&& memcmp(&modelLoader, &_modelLoaders.at(modelID), sizeof(FieldModelLoaderStruct)) != 0) {
 		_modelLoaders.replace(modelID, modelLoader);
 		setModified(true);
 	}
 }
+
+FieldModelLoaderPC FieldModelLoaderPS::toPC(BsxFile *bsx, bool *ok) const
+{
+	FieldModelLoaderPC ret(field());
+
+	int i = 0;
+	*ok = true;
+
+	for (const FieldModelLoaderStruct &psLoader : _modelLoaders) {
+		FieldModelFilePS modelFile;
+
+		if (!bsx->seek(psLoader.modelID)) {
+			*ok = false;
+			return ret;
+		}
+
+		if (!bsx->read(&modelFile)) {
+			*ok = false;
+			return ret;
+		}
+
+		QString fileName;
+
+		switch (psLoader.modelID) {
+		case 1:    fileName = "AAAA";    break; // Cloud
+		case 2:    fileName = "AUFF";    break; // Aerith
+		case 3:    fileName = "ACGD";    break; // Barret
+		case 4:    fileName = "AAGB";    break; // Tifa
+		case 5:    fileName = "ADDA";    break; // Red XIII
+		case 6:    fileName = "ABDA";    break; // Cid
+		case 7:    fileName = "ABJB";    break; // Yuffie
+		case 8:    fileName = "AEBC";    break; // Cait Sith
+		case 9:    fileName = "AEHD";    break; // Vincent
+		default:
+			// FIXME: not the same model
+			fileName = "AAAA";
+			break;
+		}
+
+		ret.insertModel(i, fileName + ".HRC");
+
+		for (int j = 0; j < psLoader.animationCount; ++j) {
+			ret.insertAnim(i, j, "ACFE");
+			ret.setAnimUnknown(i, j, 1);
+		}
+
+		ret.setScale(i, modelFile.scale());
+		ret.setUnknown(i, psLoader.unknown2);
+		ret.setGlobalColor(i, modelFile.globalColor());
+		ret.setLightColors(i, modelFile.lightColors());
+
+		i += 1;
+	}
+
+
+	return ret;
+}
diff -Nru makoureactor-1.7.2/core/field/FieldModelLoaderPS.h makoureactor-1.8.0/core/field/FieldModelLoaderPS.h
--- makoureactor-1.7.2/core/field/FieldModelLoaderPS.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelLoaderPS.h	2020-08-08 18:46:56.000000000 +0000
@@ -20,6 +20,8 @@
 
 #include <QtCore>
 #include "FieldModelLoader.h"
+#include "FieldModelLoaderPC.h"
+#include "BsxFile.h"
 
 struct FieldModelLoaderStruct {
 	quint8 faceID, bonesCount, partsCount, animationCount;
@@ -40,6 +42,7 @@
 	void setUnknown(int modelID, quint16 unknown);
 	const FieldModelLoaderStruct &model(int modelID) const;
 	void setModel(int modelID, const FieldModelLoaderStruct &modelLoader);
+	FieldModelLoaderPC toPC(BsxFile *bsx, bool *ok) const;
 private:
 	QList<FieldModelLoaderStruct> _modelLoaders;
 };
diff -Nru makoureactor-1.7.2/core/field/FieldModelPart.cpp makoureactor-1.8.0/core/field/FieldModelPart.cpp
--- makoureactor-1.7.2/core/field/FieldModelPart.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelPart.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -48,7 +48,7 @@
 	_texCoords = texCoords;
 }
 
-const PolyVertex &Poly::vertex(quint8 id) const
+const PolyVertex &Poly::vertex(int id) const
 {
 	return _vertices.at(id);
 }
@@ -58,17 +58,17 @@
 	return _colors.first();
 }
 
-QRgb Poly::color(quint8 id) const
+QRgb Poly::color(int id) const
 {
 	return _colors.value(id, _colors.first());
 }
 
-const TexCoord &Poly::texCoord(quint8 id) const
+const TexCoord &Poly::texCoord(int id) const
 {
 	return _texCoords.at(id);
 }
 
-void Poly::setTexCoord(quint8 id, const TexCoord &texCoord)
+void Poly::setTexCoord(int id, const TexCoord &texCoord)
 {
 	_texCoords.replace(id, texCoord);
 }
@@ -90,11 +90,11 @@
 
 	_vertices.swap(2, 3);
 
-	if(colors.size() == 4) {
+	if (colors.size() == 4) {
 		_colors.swap(2, 3);
 	}
 
-	if(!texCoords.isEmpty()) {
+	if (!texCoords.isEmpty()) {
 		_texCoords.swap(2, 3);
 	}
 }
@@ -106,7 +106,7 @@
 
 	_vertices.swap(2, 3);
 
-	if(!texCoords.isEmpty()) {
+	if (!texCoords.isEmpty()) {
 		_texCoords.swap(2, 3);
 	}
 }
@@ -152,9 +152,9 @@
 	float minX = -1,
 			minY = -1;
 
-	foreach (Poly *poly, polygons()) {
+	for (Poly *poly : polygons()) {
 		if (poly->hasTexture() && poly->count() > 0) {
-			for (quint16 i = 0 ; i < (quint8)poly->count(); ++i) {
+			for (quint16 i = 0; i < (quint8)poly->count(); ++i) {
 				const TexCoord &texCoord = poly->texCoord(i);
 				if (minX < 0) {
 					minX = texCoord.x;
@@ -182,7 +182,7 @@
 		minY = 0;
 	}
 
-	foreach (Poly *poly, polygons()) {
+	for (Poly *poly : polygons()) {
 		if (poly->hasTexture()) {
 			for (quint16 i = 0; i < (quint8)poly->count(); ++i) {
 				TexCoord texCoord = poly->texCoord(i);
@@ -204,7 +204,7 @@
 
 void FieldModelGroup::setFloatCoords(float texWidth, float texHeight) const
 {
-	foreach (Poly *poly, polygons()) {
+	for (Poly *poly : polygons()) {
 		if (poly->hasTexture()) {
 			for (quint16 i = 0; i < (quint8)poly->count(); ++i) {
 				TexCoord texCoord = poly->texCoord(i);
@@ -236,16 +236,16 @@
 	QString ret;
 
 	int groupID = 0;
-	foreach(FieldModelGroup *group, _groups) {
+	for (FieldModelGroup *group : _groups) {
 		ret.append(QString("==== GROUP %1 ==== texNumber: %2\n")
 		           .arg(groupID)
 		           .arg(group->textureRef()->textureIdentifier()));
 
 		int ID = 0;
-		foreach(Poly *poly, group->polygons()) {
+		for (Poly *poly : group->polygons()) {
 			ret.append(QString("==== poly %1 ====\n").arg(ID));
 
-			for(int i=0 ; i<poly->count() ; ++i) {
+			for (int i=0; i<poly->count(); ++i) {
 				ret.append(QString("%1: vertex(%2, %3, %4) color(%5, %6, %7)")
 						   .arg(i)
 						   .arg(poly->vertex(i).x)
@@ -254,7 +254,7 @@
 						   .arg(qRed(poly->color(i)))
 				           .arg(qGreen(poly->color(i)))
 				           .arg(qBlue(poly->color(i))));
-				if(poly->hasTexture()) {
+				if (poly->hasTexture()) {
 					ret.append(QString(" texCoord(%1, %2)")
 							   .arg(poly->texCoord(i).x)
 					           .arg(poly->texCoord(i).y));
diff -Nru makoureactor-1.7.2/core/field/FieldModelPart.h makoureactor-1.8.0/core/field/FieldModelPart.h
--- makoureactor-1.7.2/core/field/FieldModelPart.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelPart.h	2020-08-08 18:46:56.000000000 +0000
@@ -41,11 +41,11 @@
 	inline int count() const {
 		return _count;
 	}
-	const PolyVertex &vertex(quint8 id) const;
+	const PolyVertex &vertex(int id) const;
 	const QRgb &color() const;
-	QRgb color(quint8 id) const;
-	const TexCoord &texCoord(quint8 id) const;
-	void setTexCoord(quint8 id, const TexCoord &texCoord);
+	QRgb color(int id) const;
+	const TexCoord &texCoord(int id) const;
+	void setTexCoord(int id, const TexCoord &texCoord);
 	bool isMonochrome() const;
 	bool hasTexture() const;
 protected:
diff -Nru makoureactor-1.7.2/core/field/FieldModelSkeleton.cpp makoureactor-1.8.0/core/field/FieldModelSkeleton.cpp
--- makoureactor-1.7.2/core/field/FieldModelSkeleton.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelSkeleton.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -37,7 +37,7 @@
 	QString ret;
 	int boneID=0;
 
-	foreach(const FieldModelBone &bone, _bones) {
+	for (const FieldModelBone &bone : _bones) {
 		ret.append(QString("Bone %1: parent= %2 size= %3\n")
 				   .arg(boneID)
 				   .arg(bone.parent())
diff -Nru makoureactor-1.7.2/core/field/FieldModelSkeleton.h makoureactor-1.8.0/core/field/FieldModelSkeleton.h
--- makoureactor-1.7.2/core/field/FieldModelSkeleton.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelSkeleton.h	2020-08-08 18:46:56.000000000 +0000
@@ -87,10 +87,10 @@
 	inline bool isEmpty() const {
 		return _bones.isEmpty();
 	}
-	inline const FieldModelBone &operator[](uint i) const {
+	inline const FieldModelBone &operator[](int i) const {
 		return _bones[i];
 	}
-	inline FieldModelBone &operator[](uint i) {
+	inline FieldModelBone &operator[](int i) {
 		return _bones[i];
 	}
 	QString toString() const;
diff -Nru makoureactor-1.7.2/core/field/FieldModelTextureRefPS.cpp makoureactor-1.8.0/core/field/FieldModelTextureRefPS.cpp
--- makoureactor-1.7.2/core/field/FieldModelTextureRefPS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldModelTextureRefPS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -41,7 +41,7 @@
 	QPixmap image(720, 512);
 	QPainter p(&image);
 
-	foreach (const QRect &rect, rects()) {
+	for (const QRect &rect : rects()) {
 		if (rect.height() != 1) {
 			p.drawImage(rect.topLeft(), toImage(rect.topLeft(), palPos, bpp));
 		}
@@ -56,7 +56,7 @@
 			palId = -1,
 			i = 0;
 
-	foreach (const QRect &rect, _rects) {
+	for (const QRect &rect : _rects) {
 		if (imgId < 0 && rect.topLeft() == imgPos) {
 			imgId = i;
 		} else if (palId < 0 && rect.topLeft() == palPos) {
diff -Nru makoureactor-1.7.2/core/field/FieldPart.h makoureactor-1.8.0/core/field/FieldPart.h
--- makoureactor-1.7.2/core/field/FieldPart.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldPart.h	2020-08-08 18:46:56.000000000 +0000
@@ -28,6 +28,7 @@
 	explicit FieldPart(Field *field);
 	virtual ~FieldPart();
 
+	virtual void initEmpty() {}
 	virtual bool open()=0;
 	virtual bool open(const QByteArray &data)=0;
 	virtual QByteArray save() const=0;
diff -Nru makoureactor-1.7.2/core/field/FieldPC.cpp makoureactor-1.8.0/core/field/FieldPC.cpp
--- makoureactor-1.7.2/core/field/FieldPC.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldPC.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -17,12 +17,20 @@
  ****************************************************************************/
 #include "FieldPC.h"
 #include "BackgroundFilePC.h"
+#include "BackgroundTiles.h"
+#include "FieldModelLoaderPS.h"
+#include "core/LZS.h"
 
 FieldPC::FieldPC(const QString &name, FieldArchiveIO *io) :
 	Field(name, io), _model(0)
 {
 }
 
+FieldPC::FieldPC(const QString &name) :
+	Field(name, nullptr), _model(0)
+{
+}
+
 FieldPC::FieldPC(const Field &field) :
 	Field(field), _model(0)
 {
@@ -30,7 +38,7 @@
 
 FieldPC::~FieldPC()
 {
-	if(_model) {
+	if (_model) {
 		delete _model;
 	}
 }
@@ -42,14 +50,14 @@
 
 int FieldPC::sectionId(FieldSection part) const
 {
-	switch(part) {
+	switch (part) {
 	case Scripts:
 	case Akaos:			return 0;
 	case Camera:		return 1;
 	case ModelLoader:	return 2;
 	case PalettePC:		return 3;
 	case Walkmesh:		return 4;
-	case Unused:		return 5;
+	case Tiles:			return 5;
 	case Encounter:		return 6;
 	case Inf:			return 7;
 	case Background:	return 8;
@@ -62,14 +70,9 @@
 	return sectionPositions[idPart] + paddingBetweenSections();
 }
 
-FieldArchiveIOPC *FieldPC::io() const
-{
-	return static_cast<FieldArchiveIOPC *>(Field::io());
-}
-
 FieldPart *FieldPC::createPart(FieldSection part)
 {
-	switch(part) {
+	switch (part) {
 	case ModelLoader:	return new FieldModelLoaderPC(this);
 	case Background:	return new BackgroundFilePC(this);
 	default:			return Field::createPart(part);
@@ -78,7 +81,7 @@
 
 FieldModelLoaderPC *FieldPC::fieldModelLoader(bool open)
 {
-	//if(open && !modelLoader->isOpen()) {
+	//if (open && !modelLoader->isOpen()) {
 	//	Data::currentCharNames = model_nameChar;
 	//	Data::currentHrcNames = &fieldModelLoader->model_nameHRC;
 	//	Data::currentAnimNames = &fieldModelLoader->model_anims;
@@ -94,13 +97,13 @@
 
 	// Optimization: Prevent the loading of the same model twice
 	int localModelID = modelNameToId.value(hrc.toLower(), -1);
-	if(localModelID == -1) {
+	if (localModelID == -1) {
 		localModelID = modelID;
 		modelNameToId.insert(hrc.toLower(), localModelID);
 	}
 
 	FieldModelFilePC *fieldModel = new FieldModelFilePC();
-	if(open) {
+	if (open) {
 		fieldModel->load(hrc, a, animate);
 	}
 	return fieldModel;
@@ -108,7 +111,9 @@
 
 FieldModelFilePC *FieldPC::fieldModel(const QString &hrc, const QString &a, bool animate)
 {
-	if(!_model)	_model = new FieldModelFilePC();
+	if (!_model) {
+		_model = new FieldModelFilePC();
+	}
 	_model->load(hrc, a, animate);
 	return _model;
 }
@@ -128,25 +133,43 @@
 
 QList<Field::FieldSection> FieldPC::orderOfSections() const
 {
-	return QList<FieldSection>() << Scripts << Camera << ModelLoader << PalettePC << Walkmesh << Unused << Encounter << Inf << Background;
+	return QList<FieldSection>() << Scripts << Camera << ModelLoader << PalettePC << Walkmesh << Tiles << Encounter << Inf << Background;
 }
 
-qint8 FieldPC::importer(const QByteArray &data, bool isPSField, FieldSections part)
+bool FieldPC::importModelLoader(const QByteArray &sectionData, bool isPSField, QIODevice *bsxDevice)
 {
-	if(!isPSField) {
-		quint32 sectionPositions[9];
+	FieldModelLoaderPC *modelLoader = fieldModelLoader(false);
+
+	if (isPSField) {
+		FieldModelLoaderPS modelLoaderPS(this);
+		if (!modelLoaderPS.open(sectionData)) {
+			return false;
+		}
+		if (!bsxDevice->open(QIODevice::ReadOnly)) {
+			return false;
+		}
 
-		if(data.size() < 6 + 9 * 4)	return 3;
-		memcpy(sectionPositions, data.constData() + 6, 9 * 4); // header
+		QByteArray decompressedBsx = LZS::decompressAllWithHeader(bsxDevice->readAll());
+		QBuffer bsxDeviceDec;
+		bsxDeviceDec.setData(decompressedBsx);
+		bsxDeviceDec.open(QIODevice::ReadOnly);
+
+		BsxFile bsx(&bsxDeviceDec);
+		bool ok;
+		*modelLoader = modelLoaderPS.toPC(&bsx, &ok);
 
-		if(part.testFlag(ModelLoader)) {
-			FieldModelLoaderPC *modelLoader = fieldModelLoader(false);
-			if(!modelLoader->open(data.mid(sectionPositions[2]+4, sectionPositions[3]-sectionPositions[2]-4))) {
-				return 2;
-			}
-			modelLoader->setModified(true);
+		if (!ok) {
+			return false;
+		}
+	} else {
+		FieldModelLoaderPC *modelLoader = fieldModelLoader(false);
+		if (!modelLoader->open(sectionData)) {
+			return false;
 		}
 	}
 
-	return Field::importer(data, isPSField, part);
+	modelLoader->setModified(true);
+	modelLoader->setOpen(true);
+
+	return true;
 }
diff -Nru makoureactor-1.7.2/core/field/FieldPC.h makoureactor-1.8.0/core/field/FieldPC.h
--- makoureactor-1.7.2/core/field/FieldPC.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldPC.h	2020-08-08 18:46:56.000000000 +0000
@@ -28,18 +28,15 @@
 {
 public:
 	FieldPC(const QString &name, FieldArchiveIO *io);
+	FieldPC(const QString &name);
 	explicit FieldPC(const Field &field);
 	virtual ~FieldPC();
 
 	inline bool isPC() const { return true; }
 
-	using Field::importer;
-	qint8 importer(const QByteArray &data, bool isPSField, FieldSections part);
-
 	FieldModelLoaderPC *fieldModelLoader(bool open=true);
 	FieldModelFilePC *fieldModel(int modelID, int animationID = 0, bool animate = true, bool open = true);
 	FieldModelFilePC *fieldModel(const QString &hrc, const QString &a, bool animate = true);
-	FieldArchiveIOPC *io() const;
 protected:
 	inline int headerSize() const { return 42; }
 	void openHeader(const QByteArray &fileData);
@@ -58,6 +55,7 @@
 	QList<Field::FieldSection> orderOfSections() const;
 	inline quint32 diffSectionPos() const { return 0; }
 	inline bool hasSectionHeader() const { return true; }
+	bool importModelLoader(const QByteArray &sectionData, bool isPSField, QIODevice *bsxDevice);
 private:
 	quint32 sectionPositions[9];
 	FieldModelFilePC *_model;
diff -Nru makoureactor-1.7.2/core/field/FieldPS.cpp makoureactor-1.8.0/core/field/FieldPS.cpp
--- makoureactor-1.7.2/core/field/FieldPS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldPS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -33,18 +33,19 @@
 	memcpy(sectionPositions, fileData.constData(), headerSize()); // header
 	vramDiff = sectionPositions[0] - headerSize();// vram section1 pos - real section 1 pos
 
-	for(int i=0 ; i<7 ; ++i) {
+	for (int i=0; i<7; ++i) {
 		sectionPositions[i] -= vramDiff;
 	}
 }
 
 int FieldPS::sectionId(FieldSection part) const
 {
-	switch(part) {
+	switch (part) {
 	case Scripts:
 	case Akaos:			return 0;
 	case Walkmesh:		return 1;
-	case Background:	return 2;
+	case Background:
+	case Tiles:			return 2;
 	case Camera:		return 3;
 	case Inf:			return 4;
 	case Encounter:		return 5;
@@ -65,7 +66,7 @@
 
 FieldPart *FieldPS::createPart(FieldSection part)
 {
-	switch(part) {
+	switch (part) {
 	case ModelLoader:	return new FieldModelLoaderPS(this);
 	case Background:	return new BackgroundFilePS(this);
 	default:			return Field::createPart(part);
@@ -80,7 +81,7 @@
 FieldModelFilePS *FieldPS::fieldModel(int modelID, int animationID, bool animate, bool open)
 {
 	FieldModelFilePS *fieldModel = new FieldModelFilePS();
-	if(open) {
+	if (open) {
 		fieldModel->load(this, modelID, animationID, animate);
 	}
 	return fieldModel;
diff -Nru makoureactor-1.7.2/core/field/FieldPSDemo.cpp makoureactor-1.8.0/core/field/FieldPSDemo.cpp
--- makoureactor-1.7.2/core/field/FieldPSDemo.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/FieldPSDemo.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -24,7 +24,7 @@
 
 QString FieldPSDemo::sectionFile(FieldSection part) const
 {
-	switch(part) {
+	switch (part) {
 	case Scripts:		return "ATE";
 	case Akaos:			return "ATE";
 	case Walkmesh:		return "ID";
@@ -45,7 +45,7 @@
 
 FieldPart *FieldPSDemo::createPart(FieldSection part)
 {
-	switch(part) {
+	switch (part) {
 	case ModelLoader:	return new FieldModelLoaderPS(this);
 	case Background:	return new BackgroundFilePS(this);
 	default:			return Field::createPart(part);
diff -Nru makoureactor-1.7.2/core/field/GrpScript.cpp makoureactor-1.8.0/core/field/GrpScript.cpp
--- makoureactor-1.7.2/core/field/GrpScript.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/GrpScript.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -17,6 +17,7 @@
  ****************************************************************************/
 #include "GrpScript.h"
 #include "../FF7Text.h"
+#include "../../Data.h"
 
 ScriptsIterator::ScriptsIterator(const ScriptsIterator &other) :
 	QListIterator<Script *>(other), _opcodesIt(0)
@@ -63,7 +64,7 @@
 		next();
 		return nextOpcode();
 	}
-	return NULL;
+	return nullptr;
 }
 
 Opcode *ScriptsIterator::previousOpcode()
@@ -76,33 +77,33 @@
 		previous();
 		return previousOpcode();
 	}
-	return NULL;
+	return nullptr;
 }
 
 GrpScript::GrpScript() :
 	_character(-1), animation(false), location(false), director(false)
 {
 	addScript(QByteArray(2, char(Opcode::RET)));
-	for(int i=1 ; i<32 ; i++)	addScript();
+	for (int i=1; i<32; i++)	addScript();
 }
 
 GrpScript::GrpScript(const QString &name) :
 	_name(name), _character(-1), animation(false), location(false), director(false)
 {
-	for(int i=0 ; i<32 ; i++)	addScript();
+	for (int i=0; i<32; i++)	addScript();
 }
 
 GrpScript::GrpScript(const QString &name, QList<Script *> scripts) :
     _name(name), _scripts(scripts),
     _character(-1), animation(false), location(false), director(false)
 {
-	for(int i=_scripts.size() ; i<32 ; i++)	addScript();
+	for (int i=_scripts.size(); i<32; i++)	addScript();
 }
 
 GrpScript::GrpScript(const GrpScript &other) :
 	_name(other.realName()), _character(-1), animation(false), location(false), director(false)
 {
-	foreach(Script *script, other.scripts()) {
+	for (Script *script : other.scripts()) {
 		_scripts.append(new Script(*script));
 	}
 }
@@ -128,7 +129,7 @@
 
 void GrpScript::addScript()
 {
-	if(_scripts.isEmpty())	_scripts.append(new Script());
+	if (_scripts.isEmpty())	_scripts.append(new Script());
 	_scripts.append(new Script());
 }
 
@@ -136,10 +137,10 @@
 {
 	Script *s;
 
-	if(explodeInit && _scripts.isEmpty())
+	if (explodeInit && _scripts.isEmpty())
 	{
 		s = new Script(script);
-		if(!s->isValid()) {
+		if (!s->isValid()) {
 			delete s;
 			return false;
 		}
@@ -148,7 +149,7 @@
 	}
 	else {
 		s = new Script(script);
-		if(!s->isValid()) {
+		if (!s->isValid()) {
 			delete s;
 			return false;
 		}
@@ -161,7 +162,7 @@
 bool GrpScript::setScript(int row, const QByteArray &script, int pos, int size)
 {
 	Script *s = new Script(script, pos, size);
-	if(!s->isValid()) {
+	if (!s->isValid()) {
 		delete s;
 		return false;
 	}
@@ -171,14 +172,14 @@
 
 void GrpScript::setType()
 {
-	if(_scripts.isEmpty())	return;
+	if (_scripts.isEmpty())	return;
 	_character = -1;
 	director = animation = location = false;
 	
 	Script *firstScript = _scripts.first();
 	
-	foreach(Opcode *opcode, firstScript->opcodes()) {
-		switch((Opcode::Keys)opcode->id()) {
+	for (Opcode *opcode : firstScript->opcodes()) {
+		switch ((Opcode::Keys)opcode->id()) {
 		case Opcode::PC://Definition du personnage
 			_character = static_cast<OpcodePC *>(opcode)->charID;
 			return;
@@ -186,15 +187,15 @@
 			_character = 0xFF;
 			break;
 		case Opcode::LINE://definition d'une zone
-			if(_character==-1)	location = true;
+			if (_character==-1)	location = true;
 			return;
 		case Opcode::BGPDH:case Opcode::BGSCR:case Opcode::BGON:
 		case Opcode::BGOFF:case Opcode::BGROL:case Opcode::BGROL2:
 		case Opcode::BGCLR://bg paramètres
-			if(_character==-1)	animation = true;
+			if (_character==-1)	animation = true;
 			return;
 		case Opcode::MPNAM://mapname
-			if(_character==-1)	director = true;
+			if (_character==-1)	director = true;
 			return;
 		default:
 			break;
@@ -204,16 +205,16 @@
 
 void GrpScript::backgroundParams(QHash<quint8, quint8> &paramActifs) const
 {
-	if(_scripts.isEmpty())	return;
+	if (_scripts.isEmpty())	return;
 
 	_scripts.first()->backgroundParams(paramActifs);
 }
 
 void GrpScript::backgroundMove(qint16 z[2], qint16 *x, qint16 *y) const
 {
-	if(_scripts.size()<2)	return;
+	if (_scripts.size()<2)	return;
 
-	foreach(Script *script, _scripts) {
+	for (Script *script : _scripts) {
 		script->backgroundMove(z, x, y);
 	}
 }
@@ -225,13 +226,13 @@
 
 QByteArray GrpScript::toByteArray(quint8 scriptID) const
 {
-	if(scriptID == 0)
+	if (scriptID == 0)
 	{
-		if(!_scripts.isEmpty() && !_scripts.first()->isEmpty())
+		if (!_scripts.isEmpty() && !_scripts.first()->isEmpty())
 			return _scripts.first()->toByteArray()+_scripts.at(1)->toByteArray();
 		return QByteArray();
 	}
-	if(scriptID+1 < _scripts.size())
+	if (scriptID+1 < _scripts.size())
 		return _scripts.at(scriptID+1)->toByteArray();
 	return QByteArray();
 }
@@ -239,19 +240,19 @@
 GrpScript::Type GrpScript::typeID()
 {
 	setType();
-	if(_character != -1)		return Model;
-	if(location)			return Location;
-	if(animation)			return Animation;
-	if(director)			return Director;
+	if (_character != -1)		return Model;
+	if (location)			return Location;
+	if (animation)			return Animation;
+	if (director)			return Director;
 	return NoType;
 }
 
 QString GrpScript::type()
 {
-	switch(typeID())
+	switch (typeID())
 	{
 	case Model:
-		if(_character == 0xFF)	return QObject::tr("Field model");
+		if (_character == 0xFF)	return QObject::tr("Field model");
 		return QString("%1").arg(Opcode::character(_character));
 	case Location:	return QObject::tr("Line");
 	case Animation:	return QObject::tr("Animation");
@@ -262,12 +263,12 @@
 
 QColor GrpScript::typeColor()
 {
-	switch(typeID())
+	switch (typeID())
 	{
-	case Model:		return QColor(0x00,0x66,0xcc);
-	case Location:	return QColor(0x00,0xcc,0x66);
-	case Animation:	return QColor(0xcc,0x66,0x00);
-	case Director:	return QColor(0x66,0x00,0xcc);
+	case Model:		return Data::color(Data::ColorBlueForeground);
+	case Location:	return Data::color(Data::ColorGreenForeground);
+	case Animation:	return Data::color(Data::ColorRedForeground);
+	case Director:	return Data::color(Data::ColorPurpleForeground);
 	default:		return QColor();
 	}
 }
@@ -276,29 +277,29 @@
 {
 	Type type = typeID();
 	
-	switch(scriptID)
+	switch (scriptID)
 	{
 	case 0:	return QObject::tr("S0 - Init");
 	case 1:	return QObject::tr("S0 - Main");
 	case 2:
-		if(type == Model)		return QObject::tr("S1 - Talk");
-		if(type == Location)	return QObject::tr("S1 - [OK]");
+		if (type == Model)		return QObject::tr("S1 - Talk");
+		if (type == Location)	return QObject::tr("S1 - [OK]");
 		break;
 	case 3:
-		if(type == Model)		return QObject::tr("S2 - Contact");
-		if(type == Location)	return QObject::tr("S2 - Move");
+		if (type == Model)		return QObject::tr("S2 - Contact");
+		if (type == Location)	return QObject::tr("S2 - Move");
 		break;
 	case 4:
-		if(type == Location)	return QObject::tr("S3 - Move");
+		if (type == Location)	return QObject::tr("S3 - Move");
 		break;
 	case 5:
-		if(type == Location)	return QObject::tr("S4 - Go");
+		if (type == Location)	return QObject::tr("S4 - Go");
 		break;
 	case 6:
-		if(type == Location)	return QObject::tr("S5 - Go 1x");
+		if (type == Location)	return QObject::tr("S5 - Go 1x");
 		break;
 	case 7:
-		if(type == Location)	return QObject::tr("S6 - Go away");
+		if (type == Location)	return QObject::tr("S6 - Go away");
 		break;
 	}
 	
@@ -307,18 +308,18 @@
 
 bool GrpScript::search(int &scriptID, int &opcodeID) const
 {
-	if(scriptID < 0)
+	if (scriptID < 0)
 		opcodeID = scriptID = 0;
-	if(scriptID >= _scripts.size())
+	if (scriptID >= _scripts.size())
 		return false;
 	return true;
 }
 
 bool GrpScript::searchOpcode(int opcode, int &scriptID, int &opcodeID) const
 {
-	if(!search(scriptID, opcodeID))
+	if (!search(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchOpcode(opcode, opcodeID))
+	if (_scripts.at(scriptID)->searchOpcode(opcode, opcodeID))
 		return true;
 
 	return searchOpcode(opcode, ++scriptID, opcodeID = 0);
@@ -326,9 +327,9 @@
 
 bool GrpScript::searchVar(quint8 bank, quint16 address, Opcode::Operation op, int value, int &scriptID, int &opcodeID) const
 {
-	if(!search(scriptID, opcodeID))
+	if (!search(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchVar(bank, address, op, value, opcodeID))
+	if (_scripts.at(scriptID)->searchVar(bank, address, op, value, opcodeID))
 		return true;
 
 	return searchVar(bank, address, op, value, ++scriptID, opcodeID = 0);
@@ -336,16 +337,16 @@
 
 void GrpScript::searchAllVars(QList<FF7Var> &vars) const
 {
-	foreach(Script *script, _scripts) {
+	for (Script *script : _scripts) {
 		script->searchAllVars(vars);
 	}
 }
 
 bool GrpScript::searchExec(quint8 group, quint8 script, int &scriptID, int &opcodeID) const
 {
-	if(!search(scriptID, opcodeID))
+	if (!search(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchExec(group, script, opcodeID))
+	if (_scripts.at(scriptID)->searchExec(group, script, opcodeID))
 		return true;
 
 	return searchExec(group, script, ++scriptID, opcodeID = 0);
@@ -353,9 +354,9 @@
 
 bool GrpScript::searchMapJump(quint16 field, int &scriptID, int &opcodeID) const
 {
-	if(!search(scriptID, opcodeID))
+	if (!search(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchMapJump(field, opcodeID))
+	if (_scripts.at(scriptID)->searchMapJump(field, opcodeID))
 		return true;
 
 	return searchMapJump(field, ++scriptID, opcodeID = 0);
@@ -363,11 +364,11 @@
 
 bool GrpScript::searchTextInScripts(const QRegExp &text, int &scriptID, int &opcodeID, const Section1File *scriptsAndTexts) const
 {
-	if(scriptID < 0)
+	if (scriptID < 0)
 		opcodeID = scriptID = 0;
-	if(scriptID >= _scripts.size())
+	if (scriptID >= _scripts.size())
 		return false;
-	if(_scripts.at(scriptID)->searchTextInScripts(text, opcodeID, scriptsAndTexts))
+	if (_scripts.at(scriptID)->searchTextInScripts(text, opcodeID, scriptsAndTexts))
 		return true;
 
 	return searchTextInScripts(text, ++scriptID, opcodeID = 0, scriptsAndTexts);
@@ -375,20 +376,20 @@
 
 bool GrpScript::searchP(int &scriptID, int &opcodeID) const
 {
-	if(scriptID >= _scripts.size()) {
+	if (scriptID >= _scripts.size()) {
 		scriptID = _scripts.size()-1;
 		opcodeID = 2147483647;
 	}
-	if(scriptID < 0)
+	if (scriptID < 0)
 		return false;
 	return true;
 }
 
 bool GrpScript::searchOpcodeP(int opcode, int &scriptID, int &opcodeID) const
 {
-	if(!searchP(scriptID, opcodeID))
+	if (!searchP(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchOpcodeP(opcode, opcodeID))
+	if (_scripts.at(scriptID)->searchOpcodeP(opcode, opcodeID))
 		return true;
 
 	return searchOpcodeP(opcode, --scriptID, opcodeID = 2147483647);
@@ -396,9 +397,9 @@
 
 bool GrpScript::searchVarP(quint8 bank, quint16 address, Opcode::Operation op, int value, int &scriptID, int &opcodeID) const
 {
-	if(!searchP(scriptID, opcodeID))
+	if (!searchP(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchVarP(bank, address, op, value, opcodeID))
+	if (_scripts.at(scriptID)->searchVarP(bank, address, op, value, opcodeID))
 		return true;
 
 	return searchVarP(bank, address, op, value, --scriptID, opcodeID = 2147483647);
@@ -406,9 +407,9 @@
 
 bool GrpScript::searchExecP(quint8 group, quint8 script, int &scriptID, int &opcodeID) const
 {
-	if(!searchP(scriptID, opcodeID))
+	if (!searchP(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchExecP(group, script, opcodeID))
+	if (_scripts.at(scriptID)->searchExecP(group, script, opcodeID))
 		return true;
 
 	return searchExecP(group, script, --scriptID, opcodeID = 2147483647);
@@ -416,9 +417,9 @@
 
 bool GrpScript::searchMapJumpP(quint16 field, int &scriptID, int &opcodeID) const
 {
-	if(!searchP(scriptID, opcodeID))
+	if (!searchP(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchMapJumpP(field, opcodeID))
+	if (_scripts.at(scriptID)->searchMapJumpP(field, opcodeID))
 		return true;
 
 	return searchMapJumpP(field, --scriptID, opcodeID = 2147483647);
@@ -426,9 +427,9 @@
 
 bool GrpScript::searchTextInScriptsP(const QRegExp &text, int &scriptID, int &opcodeID, const Section1File *scriptsAndTexts) const
 {
-	if(!searchP(scriptID, opcodeID))
+	if (!searchP(scriptID, opcodeID))
 		return false;
-	if(_scripts.at(scriptID)->searchTextInScriptsP(text, opcodeID, scriptsAndTexts))
+	if (_scripts.at(scriptID)->searchTextInScriptsP(text, opcodeID, scriptsAndTexts))
 		return true;
 
 	return searchTextInScriptsP(text, --scriptID, opcodeID = 2147483647, scriptsAndTexts);
@@ -436,57 +437,66 @@
 
 void GrpScript::listUsedTexts(QSet<quint8> &usedTexts) const
 {
-	foreach(Script *script, _scripts)
+	for (Script *script : _scripts)
 		script->listUsedTexts(usedTexts);
 }
 
 void GrpScript::listUsedTuts(QSet<quint8> &usedTuts) const
 {
-	foreach(Script *script, _scripts)
+	for (Script *script : _scripts)
 		script->listUsedTuts(usedTuts);
 }
 
 void GrpScript::shiftGroupIds(int groupId, int steps)
 {
-	foreach(Script *script, _scripts)
+	for (Script *script : qAsConst(_scripts))
 		script->shiftGroupIds(groupId, steps);
 }
 
 void GrpScript::shiftTextIds(int textId, int steps)
 {
-	foreach(Script *script, _scripts)
+	for (Script *script : qAsConst(_scripts))
 		script->shiftTextIds(textId, steps);
 }
 
 void GrpScript::shiftTutIds(int tutId, int steps)
 {
-	foreach(Script *script, _scripts)
+	for (Script *script : qAsConst(_scripts))
 		script->shiftTutIds(tutId, steps);
 }
 
 void GrpScript::swapGroupIds(int groupId1, int groupId2)
 {
-	foreach(Script *script, _scripts)
+	for (Script *script : qAsConst(_scripts))
 		script->swapGroupIds(groupId1, groupId2);
 }
 
 void GrpScript::setWindow(const FF7Window &win)
 {
-	if(win.scriptID < _scripts.size()) {
+	if (win.scriptID < _scripts.size()) {
 		_scripts.at(win.scriptID)->setWindow(win);
 	}
 }
 
 void GrpScript::listWindows(int groupID, QMultiMap<quint64, FF7Window> &windows, QMultiMap<quint8, quint64> &text2win) const
 {
-	int scriptID=0;
-	foreach(Script *script, _scripts)
+	int scriptID = 0;
+	for (Script *script : _scripts) {
 		script->listWindows(groupID, scriptID++, windows, text2win);
+	}
+}
+
+void GrpScript::listWindows(int groupID, int textID, QList<FF7Window> &windows) const
+{
+	int scriptID = 0;
+	for (Script *script : _scripts) {
+		script->listWindows(groupID, scriptID++, textID, windows);
+	}
 }
 
 void GrpScript::listModelPositions(QList<FF7Position> &positions) const
 {
-	if(_scripts.size() >= 1) {
+	if (_scripts.size() >= 1) {
 		_scripts.at(0)->listModelPositions(positions);
 		_scripts.at(1)->listModelPositions(positions);
 	}
@@ -494,7 +504,7 @@
 
 bool GrpScript::linePosition(FF7Position position[2]) const
 {
-	if(!_scripts.isEmpty()) {
+	if (!_scripts.isEmpty()) {
 		return _scripts.first()->linePosition(position);
 	}
 	return false;
@@ -503,8 +513,8 @@
 bool GrpScript::compile(int &scriptID, int &opcodeID, QString &errorStr)
 {
 	scriptID=0;
-	foreach(Script *script, _scripts) {
-		if(!script->compile(opcodeID, errorStr)) {
+	for (Script *script : qAsConst(_scripts)) {
+		if (!script->compile(opcodeID, errorStr)) {
 			return false;
 		}
 		++scriptID;
@@ -516,8 +526,8 @@
 bool GrpScript::removeTexts()
 {
 	bool modified = false;
-	foreach(Script *script, _scripts) {
-		if(script->removeTexts()) {
+	for (Script *script : qAsConst(_scripts)) {
+		if (script->removeTexts()) {
 			modified = true;
 		}
 	}
@@ -532,8 +542,8 @@
 
 	ret.append("\n");
 
-	foreach(Script *script, _scripts) {
-		if(!script->isEmpty()) {
+	for (Script *script : _scripts) {
+		if (!script->isEmpty()) {
 			ret.append("\t");
 			ret.append(QObject::tr("Script '%1' :").arg(scriptID));
 			ret.append("\n\t\t");
@@ -550,7 +560,7 @@
 {
 	stream << groups.size();
 
-	foreach(GrpScript *group, groups) {
+	for (GrpScript *group : groups) {
 		stream << group->name() << group->scripts();
 	}
 
@@ -562,7 +572,7 @@
 	int size;
 	stream >> size;
 
-	for(int i = 0 ; i < size ; ++i) {
+	for (int i = 0; i < size; ++i) {
 		QString name;
 		QList<Script *> scripts;
 		stream >> name >> scripts;
@@ -576,7 +586,7 @@
 {
 	stream << scripts.size();
 
-	foreach(Script *script, scripts) {
+	for (Script *script : scripts) {
 		stream << script->serialize();
 	}
 
@@ -588,7 +598,7 @@
 	int size;
 	stream >> size;
 
-	for(int i = 0 ; i < size ; ++i) {
+	for (int i = 0; i < size; ++i) {
 		QByteArray data;
 		stream >> data;
 
diff -Nru makoureactor-1.7.2/core/field/GrpScript.h makoureactor-1.8.0/core/field/GrpScript.h
--- makoureactor-1.7.2/core/field/GrpScript.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/GrpScript.h	2020-08-08 18:46:56.000000000 +0000
@@ -34,7 +34,7 @@
 	Script * const &previous();
 
 	/* There is no hasNextOpcode() function
-	 * nextOpcode() can return NULL
+	 * nextOpcode() can return nullptr
 	 */
 	Opcode *nextOpcode();
 	Opcode *previousOpcode();
@@ -112,6 +112,7 @@
 	void swapGroupIds(int groupId1, int groupId2);
 	void setWindow(const FF7Window &win);
 	void listWindows(int groupID, QMultiMap<quint64, FF7Window> &windows, QMultiMap<quint8, quint64> &text2win) const;
+	void listWindows(int groupID, int textID, QList<FF7Window> &windows) const;
 	void listModelPositions(QList<FF7Position> &positions) const;
 	bool linePosition(FF7Position position[2]) const;
 	bool compile(int &scriptID, int &opcodeID, QString &errorStr);
diff -Nru makoureactor-1.7.2/core/field/IdFile.cpp makoureactor-1.8.0/core/field/IdFile.cpp
--- makoureactor-1.7.2/core/field/IdFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/IdFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -23,6 +23,64 @@
 {
 }
 
+void IdFile::initEmpty()
+{
+	_triangles.clear();
+	_access.clear();
+
+	const quint8 base = 132;
+	const quint16 w = base * 3;
+	const quint16 offsetX = -(w + base);
+	const quint16 offsetY = -(w * 2);
+
+	for (quint8 y = 3; y > 0; --y) {
+		for (quint8 x = 0; x < 3; ++x) {
+			// Make a square
+			Triangle tr = Triangle();
+			tr.vertices[0].x = offsetX + x * w;
+			tr.vertices[0].y = offsetY + y * w;
+			tr.vertices[1].x = offsetX + (x + 1) * w;
+			tr.vertices[1].y = offsetY + y * w;
+			tr.vertices[2].x = offsetX + x * w;
+			tr.vertices[2].y = offsetY + (y - 1) * w;
+			_triangles.append(tr);
+			tr.vertices[0].x = offsetX + (x + 1) * w;
+			tr.vertices[1].y = offsetY + (y - 1) * w;
+			_triangles.append(tr);
+
+			Access acc1, acc2;
+			acc1.a[0] = -1;
+			// Access to the other triangle
+			acc1.a[1] = _triangles.size() - 1;
+			acc1.a[2] = -1;
+			acc2.a[0] = -1;
+			acc2.a[1] = -1;
+			// Access to the other triangle
+			acc2.a[2] = _triangles.size() - 2;
+
+			if (x < 2) {
+				// Access on the right
+				acc2.a[0] = _triangles.size();
+			}
+			if (x > 0) {
+				// Access on the left
+				acc1.a[2] = _triangles.size() - 3;
+			}
+			if (y < 2) {
+				// Access on the bottom
+				acc2.a[1] = _triangles.size() + 4;
+			}
+			if (y > 0) {
+				// Access on the top
+				acc1.a[0] = _triangles.size() - 7;
+			}
+
+			_access.append(acc1);
+			_access.append(acc2);
+		}
+	}
+}
+
 bool IdFile::open()
 {
 	return open(field()->sectionData(Field::Walkmesh));
@@ -34,12 +92,12 @@
 	quint32 nbSector;
 	int sizeId = data.size();
 
-	if(sizeof(Triangle) != 24 || sizeof(Access) != 6) {
+	if (sizeof(Triangle) != 24 || sizeof(Access) != 6) {
 		qWarning() << "Error id struct size" << sizeof(Triangle) << sizeof(Access);
 		Q_ASSERT(false);
 	}
 
-	if(sizeId < 4) {
+	if (sizeId < 4) {
 		qWarning() << "size id error" << sizeId;
 		return false;
 	}
@@ -49,7 +107,7 @@
 	quint32 accessStart = 4 + nbSector*24, i;
 
 	// Padding possible
-	if((quint32)sizeId != accessStart + nbSector*6
+	if ((quint32)sizeId != accessStart + nbSector*6
 			&& (quint32)sizeId != accessStart + nbSector*6 + 2) {
 		qWarning() << "size id error" << sizeId << (accessStart + nbSector*6);
 		return false;
@@ -59,7 +117,7 @@
 	Access acc;
 	_triangles.clear();
 	_access.clear();
-	for(i=0 ; i<nbSector ; ++i) {
+	for (i=0; i<nbSector; ++i) {
 		memcpy(&triangle, constData + 4 + i*24, 24);
 		_triangles.append(triangle);
 		memcpy(&acc, constData + accessStart + i*6, 6);
@@ -78,14 +136,14 @@
 
 	id.append((char *)&count, 4);
 
-	foreach(Triangle triangle, _triangles) {
+	for (Triangle triangle : _triangles) {
 		triangle.vertices[0].res = triangle.vertices[0].z;
 		triangle.vertices[1].res = triangle.vertices[0].z;
 		triangle.vertices[2].res = triangle.vertices[0].z;
 		id.append((char *)&triangle.vertices, sizeof(Triangle));
 	}
 
-	foreach(const Access &access, _access) {
+	for (const Access &access : _access) {
 		id.append((char *)&access, sizeof(Access));
 	}
 
diff -Nru makoureactor-1.7.2/core/field/IdFile.h makoureactor-1.8.0/core/field/IdFile.h
--- makoureactor-1.7.2/core/field/IdFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/IdFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -38,6 +38,7 @@
 {
 public:
 	explicit IdFile(Field *field);
+	void initEmpty();
 	bool open();
 	bool open(const QByteArray &data);
 	QByteArray save() const;
diff -Nru makoureactor-1.7.2/core/field/InfFile.cpp makoureactor-1.8.0/core/field/InfFile.cpp
--- makoureactor-1.7.2/core/field/InfFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/InfFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -23,6 +23,27 @@
 {
 }
 
+void InfFile::initEmpty()
+{
+	// Fill with zeroes
+	data = InfData();
+
+	memcpy(data.name, field()->name().toLatin1().left(8), 8);
+	data.control = 128; // Left on the left
+	data.camera_range.left = -256;
+	data.camera_range.right = 256;
+	data.camera_range.top = -256;
+	data.camera_range.bottom = 256;
+	data.bg_layer3_width = 1024;
+	data.bg_layer3_height = 1024;
+	data.bg_layer4_width = 1024;
+	data.bg_layer4_height = 1024;
+	for (int i = 0; i < 12; i++) {
+		data.doors[i].fieldID = 0x7FFF;
+		data.triggers[i].background_parameter = 0xFF;
+	}
+}
+
 bool InfFile::open()
 {
 	return open(field()->sectionData(Field::Inf));
@@ -32,12 +53,12 @@
 {
 	quint32 size = data.size();
 
-	if(sizeof(InfData) != 740) {
+	if (sizeof(InfData) != 740) {
 		qWarning() << "Error InfData" << sizeof(InfData) << "must be 740";
 		Q_ASSERT(false);
 	}
 
-	if(size != 740 && size != 536) {
+	if (size != 740 && size != 536) {
 		qWarning() << "Error inf size" << size;
 //		QFile debinf("debugInf.inf");
 //		debinf.open(QIODevice::WriteOnly);
@@ -57,7 +78,11 @@
 
 QByteArray InfFile::save() const
 {
-	return QByteArray((char *)&data, field()->sectionSize(Field::Inf));
+	quint32 size = field()->sectionSize(Field::Inf);
+	if (size != 740 && size != 536) {
+		size = 740;
+	}
+	return QByteArray((char *)&data, size);
 }
 
 void InfFile::clear()
@@ -71,7 +96,7 @@
 
 QString InfFile::mapName()
 {
-	return QString(data.name);
+	return QString(QByteArray(data.name, 9));
 }
 
 void InfFile::setMapName(const QString &name)
@@ -205,7 +230,7 @@
 QList<Exit> InfFile::exitLines() const
 {
 	QList<Exit> exit;
-	for(int i=0 ; i<12 ; ++i) {
+	for (int i=0; i<12; ++i) {
 		exit.append(data.doors[i]);
 	}
 	return exit;
@@ -225,7 +250,7 @@
 QList<Trigger> InfFile::triggers() const
 {
 	QList<Trigger> trigger;
-	for(int i=0 ; i<12 ; ++i) {
+	for (int i=0; i<12; ++i) {
 		trigger.append(data.triggers[i]);
 	}
 	return trigger;
@@ -256,7 +281,7 @@
 QList<Arrow> InfFile::arrows() const
 {
 	QList<Arrow> arrowList;
-	for(int i=0 ; i<12 ; ++i) {
+	for (int i=0; i<12; ++i) {
 		arrowList.append(data.arrows[i]);
 	}
 	return arrowList;
diff -Nru makoureactor-1.7.2/core/field/InfFile.h makoureactor-1.8.0/core/field/InfFile.h
--- makoureactor-1.7.2/core/field/InfFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/InfFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -83,6 +83,7 @@
 {
 public:
 	explicit InfFile(Field *field);
+	void initEmpty();
 	bool open();
 	bool open(const QByteArray &data);
 	QByteArray save() const;
diff -Nru makoureactor-1.7.2/core/field/MaplistFile.cpp makoureactor-1.8.0/core/field/MaplistFile.cpp
--- makoureactor-1.7.2/core/field/MaplistFile.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/core/field/MaplistFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,6 @@
+#include "MaplistFile.h"
+
+MaplistFile::MaplistFile()
+{
+
+}
diff -Nru makoureactor-1.7.2/core/field/MaplistFile.h makoureactor-1.8.0/core/field/MaplistFile.h
--- makoureactor-1.7.2/core/field/MaplistFile.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/core/field/MaplistFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef MAPLISTFILE_H
+#define MAPLISTFILE_H
+
+
+class MaplistFile
+{
+public:
+	MaplistFile();
+private:
+
+};
+
+#endif // MAPLISTFILE_H
diff -Nru makoureactor-1.7.2/core/field/Opcode.cpp makoureactor-1.8.0/core/field/Opcode.cpp
--- makoureactor-1.7.2/core/field/Opcode.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Opcode.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -52,21 +52,34 @@
 
 Opcode *Opcode::unserialize(const QByteArray &data)
 {
-	if(data.size() < 2) {
-		return NULL;
+	if (data.size() < 2) {
+		return nullptr;
 	}
 
 	quint16 identifier;
 	memcpy(&identifier, data.constData(), 2);
 
-	if(identifier <= 0xFF) {
-		return Script::createOpcode(QByteArray()
+	if (identifier <= 0xFF) {
+		Opcode *ret = Script::createOpcode(QByteArray()
 		                            .append(quint8(identifier))
 		                            .append(data.mid(2)));
+
+		quint8 size = 2 + Opcode::length[identifier] - 1;
+
+		if (ret->isJump() && data.size() >= size + 5) {
+			quint32 label;
+			memcpy(&label, data.constData() + size, 4);
+
+			OpcodeJump *jump = static_cast<OpcodeJump *>(ret);
+			jump->setLabel(label);
+			jump->setBadJump(bool(data.at(size + 4)));
+		}
+
+		return ret;
 	}
 
-	if(data.size() < 6) {
-		return NULL;
+	if (data.size() < 6) {
+		return nullptr;
 	}
 	quint32 label;
 	memcpy(&label, data.constData() + 2, 4);
@@ -79,7 +92,7 @@
 	QByteArray p = params();
 	int value, sizeBA;
 
-	if(paramSize%8 !=0)
+	if (paramSize%8 !=0)
 		sizeBA = paramSize/8+1;
 	else
 		sizeBA = paramSize/8;
@@ -105,11 +118,11 @@
 	case AssignGreaterThan:
 	case AssignGreaterThanEqual:
 		// Compare value if provided
-		if(!noValue) {
-			if(id() == SETBYTE || id() == SETWORD) {
+		if (!noValue) {
+			if (id() == SETBYTE || id() == SETWORD) {
 				const OpcodeBinaryOperation *binaryOp = static_cast<const OpcodeBinaryOperation *>(this);
 
-				if(B1(binaryOp->banks) == bank && (noAddress || binaryOp->var == address)
+				if (B1(binaryOp->banks) == bank && (noAddress || binaryOp->var == address)
 				        && B2(binaryOp->banks) == 0) {
 					switch (op) {
 					case Assign:
@@ -124,13 +137,15 @@
 						return binaryOp->value > value;
 					case AssignGreaterThanEqual:
 						return binaryOp->value >= value;
+					default:
+						return false;
 					}
 				}
 			}
 		} else {
 			// Every write vars
-			foreach(const FF7Var &var, vars) {
-				if(var.bank == bank && (noAddress || var.address == address)
+			for (const FF7Var &var : qAsConst(vars)) {
+				if (var.bank == bank && (noAddress || var.address == address)
 						&& var.write == true && var.size != FF7Var::Bit) {
 					return true;
 				}
@@ -138,11 +153,11 @@
 		}
 		return false;
 	case BitAssign:
-		if(id() == BITON
+		if (id() == BITON
 				|| id() == BITOFF
 				|| id() == BITXOR) {
 			const OpcodeBitOperation *bitOperation = static_cast<const OpcodeBitOperation *>(this);
-			if(B1(bitOperation->banks) == bank && (noAddress || bitOperation->var == address)
+			if (B1(bitOperation->banks) == bank && (noAddress || bitOperation->var == address)
 					&& (noValue || (B2(bitOperation->banks) == 0 && bitOperation->position == value))) {
 				return true;
 			}
@@ -150,14 +165,14 @@
 		return false;
 	case Compare:
 	case BitCompare:
-		if(id() == IFUB
+		if (id() == IFUB
 				|| id() == IFUBL
 				|| id() == IFSW
 				|| id() == IFSWL
 				|| id() == IFUW
 				|| id() == IFUWL) {
 			const OpcodeIf *opcodeIf = static_cast<const OpcodeIf *>(this);
-			if(((op == Compare && opcodeIf->oper < quint8(BitAnd))
+			if (((op == Compare && opcodeIf->oper < quint8(BitAnd))
 				|| (op == BitCompare && opcodeIf->oper >= quint8(BitAnd)))
 					&& B1(opcodeIf->banks) == bank && (noAddress || opcodeIf->value1 == address)
 					&& (noValue || (B2(opcodeIf->banks) == 0 && opcodeIf->value2 == value))) {
@@ -166,17 +181,22 @@
 		}
 		return false;
 	default:
-		foreach(const FF7Var &var, vars) {
-			if(var.bank == bank && (noAddress || var.address == address))
+		for (const FF7Var &var : qAsConst(vars)) {
+			if (var.bank == bank && (noAddress || var.address == address))
 				return true;
 		}
 		return false;
 	}
 }
 
+bool Opcode::searchOpcode(int opcode) const
+{
+	return (opcode & 0xFFFF) == id();
+}
+
 bool Opcode::searchExec(quint8 group, quint8 script) const
 {
-	if(id() == REQ || id() == REQSW || id() == REQEW) {
+	if (id() == REQ || id() == REQSW || id() == REQEW) {
 		const OpcodeExec *exec = static_cast<const OpcodeExec *>(this);
 		return exec->groupID == group && exec->scriptID == script;
 	}
@@ -185,10 +205,10 @@
 
 bool Opcode::searchMapJump(quint16 fieldID) const
 {
-	if(id() == MAPJUMP) {
+	if (id() == MAPJUMP) {
 		return static_cast<const OpcodeMAPJUMP *>(this)->fieldID == fieldID;
 	}
-	if(id() == MINIGAME) {
+	if (id() == MINIGAME) {
 		return static_cast<const OpcodeMINIGAME *>(this)->fieldID == fieldID;
 	}
 	return false;
@@ -205,7 +225,7 @@
 void Opcode::listUsedTexts(QSet<quint8> &usedTexts) const
 {
 	int textID = getTextID();
-	if(textID != -1) {
+	if (textID != -1) {
 		usedTexts.insert(textID);
 	}
 }
@@ -213,7 +233,7 @@
 void Opcode::listUsedTuts(QSet<quint8> &usedTuts) const
 {
 	int tutoID = getTutoID();
-	if(tutoID != -1) {
+	if (tutoID != -1) {
 		usedTuts.insert(tutoID);
 	}
 }
@@ -221,7 +241,7 @@
 void Opcode::shiftGroupIds(int groupId, int steps)
 {
 	int groupID = getGroupID();
-	if(groupID != -1 && groupID > groupId) {
+	if (groupID != -1 && groupID > groupId) {
 		setGroupID(groupID + steps);
 	}
 }
@@ -229,7 +249,7 @@
 void Opcode::shiftTextIds(int textId, int steps)
 {
 	int textID = getTextID();
-	if(textID != -1 && textID > textId) {
+	if (textID != -1 && textID > textId) {
 		setTextID(textID + steps);
 	}
 }
@@ -237,7 +257,7 @@
 void Opcode::shiftTutIds(int tutId, int steps)
 {
 	int tutoID = getTutoID();
-	if(tutoID != -1 && tutoID > tutId) {
+	if (tutoID != -1 && tutoID > tutId) {
 		setTutoID(tutoID + steps);
 	}
 }
@@ -245,9 +265,9 @@
 void Opcode::swapGroupIds(int groupId1, int groupId2)
 {
 	int groupID = getGroupID();
-	if(groupID == groupId1) {
+	if (groupID == groupId1) {
 		setGroupID(groupId2);
-	} else if(groupID == groupId2) {
+	} else if (groupID == groupId2) {
 		setGroupID(groupId1);
 	}
 }
@@ -255,17 +275,17 @@
 void Opcode::listWindows(int groupID, int scriptID, int opcodeID, QMultiMap<quint64, FF7Window> &windows, QMultiMap<quint8, quint64> &text2win) const
 {
 	int windowID = getWindowID();
-	if(windowID != -1) {
+	if (windowID != -1) {
 		FF7Window win = FF7Window();
 		win.groupID = groupID;
 		win.scriptID = scriptID;
 		win.opcodeID = opcodeID;
-		if(getWindow(win)) {
+		if (getWindow(win)) {
 			win.type = id();
 			windows.insert((groupID << 16) | (scriptID << 8) | windowID, win);
 		}
 		int textID = getTextID();
-		if(textID != -1) {
+		if (textID != -1) {
 			text2win.insert(textID, (groupID << 16) | (scriptID << 8) | windowID);
 		}
 	}
@@ -286,21 +306,21 @@
 {
 	quint8 param, state;
 
-	if(id() == BGON) { //show bg parameter
+	if (id() == BGON) { //show bg parameter
 		const OpcodeBGON *bgon = static_cast<const OpcodeBGON *>(this);
-		if(bgon->banks == 0) {
+		if (bgon->banks == 0) {
 			param = bgon->paramID;
 			state = 1 << bgon->stateID;
-			if(enabledParams.contains(param))
+			if (enabledParams.contains(param))
 				state |= enabledParams.value(param);
 			enabledParams.insert(param, state);
 		}
-	}/*else if(id() == BGOFF) { //hide bg parameter
+	}/*else if (id() == BGOFF) { //hide bg parameter
 		const OpcodeBGOFF *bgoff = static_cast<const OpcodeBGOFF *>(this);
-		if(bgoff->banks == 0) {
+		if (bgoff->banks == 0) {
 			param = bgoff->paramID;
 			state = 1 << bgoff->stateID;
-			if(enabledParams.contains(param))
+			if (enabledParams.contains(param))
 				state = (state & enabledParams.value(param)) ^ enabledParams.value(param);
 			enabledParams.insert(param, state);
 		}
@@ -309,14 +329,14 @@
 
 void Opcode::backgroundMove(qint16 z[2], qint16 *x, qint16 *y) const
 {
-	if(id() == BGPDH) { //Move Background Z
+	if (id() == BGPDH) { //Move Background Z
 		const OpcodeBGPDH *bgpdh = static_cast<const OpcodeBGPDH *>(this);
-		if(bgpdh->banks==0 && bgpdh->layerID>1 && bgpdh->layerID<4) { //No var
+		if (bgpdh->banks==0 && bgpdh->layerID>1 && bgpdh->layerID<4) { //No var
 			z[bgpdh->layerID-2] = bgpdh->targetZ;
 		}
-	} else if(x && y && id() == BGSCR) { // Animate Background X Y
+	} else if (x && y && id() == BGSCR) { // Animate Background X Y
 		const OpcodeBGSCR *bgscr = static_cast<const OpcodeBGSCR *>(this);
-		if(bgscr->banks==0 && bgscr->layerID>1 && bgscr->layerID<4) { //No var
+		if (bgscr->banks==0 && bgscr->layerID>1 && bgscr->layerID<4) { //No var
 			x[bgscr->layerID-2] = bgscr->targetX;
 			y[bgscr->layerID-2] = bgscr->targetY;
 		}
@@ -325,16 +345,16 @@
 
 QString Opcode::_script(quint8 param, Section1File *scriptsAndTexts)
 {
-	if(param < scriptsAndTexts->grpScriptCount())
+	if (param < scriptsAndTexts->grpScriptCount())
 		return scriptsAndTexts->grpScript(param)->name() + QObject::tr(" (No%1)").arg(param);
 	return QObject::tr("? (No%1)").arg(param);
 }
 
 QString Opcode::_text(quint8 textID, Section1File *scriptsAndTexts)
 {
-	if(textID < scriptsAndTexts->textCount()) {
+	if (textID < scriptsAndTexts->textCount()) {
 		QString t = scriptsAndTexts->text(textID).text(Config::value("jp_txt", false).toBool(), true).simplified();
-		if(t.size() > 70)
+		if (t.size() > 70)
 			t = t.left(35) % QString("...") % t.right(35);
 		return "\"" + t + "\"";
 	}
@@ -343,21 +363,21 @@
 
 QString Opcode::_item(quint16 itemID, quint8 bank)
 {
-	if(bank > 0) {
+	if (bank > 0) {
 		return QObject::tr("No%1").arg(_bank(itemID & 0xFF, bank));
 	}
 
-	if(itemID < 128) {
-		if(!Data::item_names.isEmpty() && itemID < Data::item_names.size())
+	if (itemID < 128) {
+		if (!Data::item_names.isEmpty() && itemID < Data::item_names.size())
 			return Data::item_names.at(itemID);
-	} else if(itemID < 256) {
-		if(!Data::weapon_names.isEmpty() && itemID-128 < Data::weapon_names.size())
+	} else if (itemID < 256) {
+		if (!Data::weapon_names.isEmpty() && itemID-128 < Data::weapon_names.size())
 			return Data::weapon_names.at(itemID-128);
-	} else if(itemID < 288) {
-		if(!Data::armor_names.isEmpty() && itemID-256 < Data::armor_names.size())
+	} else if (itemID < 288) {
+		if (!Data::armor_names.isEmpty() && itemID-256 < Data::armor_names.size())
 			return Data::armor_names.at(itemID-256);
-	} else if(itemID < 320) {
-		if(!Data::accessory_names.isEmpty() && itemID-288 < Data::accessory_names.size())
+	} else if (itemID < 320) {
+		if (!Data::accessory_names.isEmpty() && itemID-288 < Data::accessory_names.size())
 			return Data::accessory_names.at(itemID-288);
 	}
 	return QObject::tr("No%1").arg(itemID);
@@ -365,20 +385,20 @@
 
 QString Opcode::_materia(quint8 materiaID, quint8 bank)
 {
-	if(bank > 0) {
+	if (bank > 0) {
 		return QObject::tr("No%1").arg(_bank(materiaID, bank));
 	}
 
-	if(materiaID < Data::materia_names.size())
+	if (materiaID < Data::materia_names.size())
 		return Data::materia_names.at(materiaID);
 	return QObject::tr("No%1").arg(materiaID);
 }
 
 QString Opcode::_field(quint16 fieldID)
 {
-	if(fieldID < Data::field_names.size())
+	if (fieldID < Data::maplist().size())
 		return QObject::tr("%1 (#%2)")
-				.arg(Data::field_names.at(fieldID))
+				.arg(Data::maplist().at(fieldID))
 				.arg(fieldID);
 	return QObject::tr("No%1").arg(fieldID);
 }
@@ -393,7 +413,7 @@
 		<< Data::movie_names_cd3.value(movieID, dflt);
 
 	QStringList out;
-	for(int discID = 0 ; discID < 3 ; ++discID) {
+	for (int discID = 0; discID < 3; ++discID) {
 		out.append(QObject::tr("%1 (disc %2)").arg(cds.at(discID)).arg(discID + 1));
 	}
 
@@ -402,21 +422,20 @@
 
 /* QString Opcode::_objet3D(quint8 objet3D_ID)
 {
-	if(objet3D_ID < Data::currentCharNames.size())
+	if (objet3D_ID < Data::currentCharNames.size())
 		return QString("%1 (%2)").arg(Data::currentCharNames.at(objet3D_ID), Data::currentHrcNames.at(objet3D_ID));
 	return QObject::tr("No%1").arg(objet3D_ID);
 } */
 
 QString Opcode::akao(quint8 akaoOp, bool *ok)
 {
-	if(ok) {
+	if (ok) {
 		*ok = true;
 	}
 
-	switch(akaoOp) {
+	switch (akaoOp) {
 	case 0x10:
 	case 0x14:	return QObject::tr("Play music [param1: music ID, 0-based]");
-	// case 0x15: // TODO: unknown
 	case 0x18:
 	case 0x19:	return QObject::tr("Play music and resume from last position [param1: music ID, 0-based]");
 	case 0x24:
@@ -485,10 +504,11 @@
 	case 0xD0:	return QObject::tr("Set music tempo [param1: tempo, 0x20 is normal]");
 	case 0xD1:	return QObject::tr("Music tempo transition");
 	case 0xD2:	return QObject::tr("Music tempo fade");
+	case 0xDA:	return QObject::tr("Stop music-like (noop in PC version)");
 	case 0xF0:	return QObject::tr("Stop music");
 	case 0xF1:	return QObject::tr("Stop sound effects");
 	default:
-		if(ok) {
+		if (ok) {
 			*ok = false;
 		}
 		return QObject::tr("AKAO: %1?").arg(akaoOp);
@@ -497,10 +517,10 @@
 
 QString Opcode::_bank(quint8 address, quint8 bank)
 {
-	if(!Var::name(bank, address).isEmpty()) {
+	if (!Var::name(bank, address).isEmpty()) {
 		return Var::name(bank, address);
 	}
-	if(bank == 0) {
+	if (bank == 0) {
 		return QString("?");
 	}
 	return QString("Var[%1][%2]").arg(bank).arg(address);
@@ -508,16 +528,16 @@
 
 QString Opcode::_var(int value, quint8 bank)
 {
-	if(bank > 0)
+	if (bank > 0)
 		return _bank(value & 0xFF, bank);
 	return QString::number(value);
 }
 
 QString Opcode::_var(int value, quint8 bank1, quint8 bank2)
 {
-	if(bank1 > 0 || bank2 > 0) {
+	if (bank1 > 0 || bank2 > 0) {
 		QString ret = _var(value & 0xFFFF, bank1);
-		if(bank2 != 0 || ((value >> 16) & 0xFFFF) != 0) {
+		if (bank2 != 0 || ((value >> 16) & 0xFFFF) != 0) {
 			ret += QString(" + %1 * 65536").arg(_var((value >> 16) & 0xFFFF, bank2));
 		}
 		return ret;
@@ -527,7 +547,7 @@
 
 QString Opcode::_var(int value, quint8 bank1, quint8 bank2, quint8 bank3)
 {
-	if(bank1 > 0 || bank2 > 0 || bank3 > 0)
+	if (bank1 > 0 || bank2 > 0 || bank3 > 0)
 		return QObject::tr("%1 and %2 and %3")
 				.arg(_bank(value & 0xFF, bank1))
 				.arg(_bank((value >> 8) & 0xFF, bank2))
@@ -537,19 +557,19 @@
 
 QString Opcode::character(quint8 persoID)
 {
-	if(persoID < Data::char_names.size())	return Data::char_names.at(persoID);
-	if(persoID >= 254)						return QObject::tr("(Empty)");
-	if(persoID >= 100)						return Data::char_names.last();
+	if (persoID < Data::char_names.size())	return Data::char_names.at(persoID);
+	if (persoID >= 254)						return QObject::tr("(Empty)");
+	if (persoID >= 100)						return Data::char_names.last();
 	return QString("%1?").arg(persoID);
 }
 
 QString Opcode::_windowCorner(quint8 param, quint8 bank)
 {
-	if(bank > 0) {
+	if (bank > 0) {
 		return _bank(param, bank);
 	}
 
-	switch(param) {
+	switch (param) {
 	case 0:		return QObject::tr("Top Left");
 	case 1:		return QObject::tr("Bottom Left");
 	case 2:		return QObject::tr("Top Right");
@@ -560,7 +580,7 @@
 
 QString Opcode::_sensRotation(quint8 param)
 {
-	switch(param) {
+	switch (param) {
 	case 1:		return QObject::tr("reverse");
 	case 2:		return QObject::tr("reverse");
 	default:	return QObject::tr("normal");
@@ -569,7 +589,7 @@
 
 QString Opcode::_operateur(quint8 param)
 {
-	if(param < OPERATORS_SIZE)
+	if (param < OPERATORS_SIZE)
 		return operators[param];
 	return QString("%1?").arg(param);
 }
@@ -858,17 +878,17 @@
 
 void OpcodeSPLIT::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX1 & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY1 & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), direction1 & 0xFF, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), targetX2 & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[2]) != 0)
+	if (B1(banks[2]) != 0)
 		vars.append(FF7Var(B1(banks[2]), targetY2 & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[2]) != 0)
+	if (B2(banks[2]) != 0)
 		vars.append(FF7Var(B2(banks[2]), direction2 & 0xFF, FF7Var::Byte));
 }
 
@@ -897,11 +917,11 @@
 
 void OpcodePartyE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), party1, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), party2, FF7Var::Byte));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), party3, FF7Var::Byte));
 }
 
@@ -945,7 +965,7 @@
 {
 	QList<FF7Var> partyVars;
 	OpcodePartyE::getVariables(partyVars);
-	for(int i = 0 ; i < partyVars.size() ; ++i) {
+	for (int i = 0; i < partyVars.size(); ++i) {
 		partyVars[i].write = true;
 	}
 	vars.append(partyVars);
@@ -1260,9 +1280,9 @@
 
 void OpcodeSPECIAL::setParams(const char *params, int size)
 {
-	if(opcode)		delete opcode;
+	if (opcode)		delete opcode;
 
-	switch((quint8)params[0])
+	switch ((quint8)params[0])
 	{
 	case 0xF5:	opcode = new OpcodeSPECIALARROW(params + 1, size - 1);
 		break;
@@ -1346,13 +1366,19 @@
 
 quint32 OpcodeJump::maxJump() const
 {
-	if(isLongJump()) {
+	if (isLongJump()) {
 		return 65535 + jumpPosData();
 	} else {
 		return 255 + jumpPosData();
 	}
 }
 
+QByteArray OpcodeJump::serialize() const
+{
+	return Opcode::serialize()
+	    .append((char *)&_label, 4).append(char(_badJump));
+}
+
 OpcodeLabel::OpcodeLabel(quint32 label) :
 	_label(label)
 {
@@ -1512,14 +1538,14 @@
 void OpcodeIf::getVariables(QList<FF7Var> &vars) const
 {
 
-	if(B1(banks) != 0) {
+	if (B1(banks) != 0) {
 		Operator op = Operator(oper);
 		vars.append(FF7Var(B1(banks), value1 & 0xFF,
 						   op == BitAnd || op == BitXOr || op == BitOr
 						   || op == BitOn || op == BitOff
 						   ? FF7Var::Bit : FF7Var::Byte));
 	}
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), value2 & 0xFF, FF7Var::Byte));
 }
 
@@ -1654,7 +1680,7 @@
 {
 	QList<FF7Var> ifVars;
 	OpcodeIf::getVariables(ifVars);
-	for (int i = 0 ; i < ifVars.size() ; ++i) {
+	for (int i = 0; i < ifVars.size(); ++i) {
 		ifVars[i].size = FF7Var::SignedWord;
 	}
 	vars.append(ifVars);
@@ -1711,7 +1737,7 @@
 {
 	QList<FF7Var> ifVars;
 	OpcodeIf::getVariables(ifVars);
-	for (int i = 0 ; i < ifVars.size() ; ++i) {
+	for (int i = 0; i < ifVars.size(); ++i) {
 		ifVars[i].size = FF7Var::SignedWord;
 	}
 	vars.append(ifVars);
@@ -1765,7 +1791,7 @@
 {
 	QList<FF7Var> ifVars;
 	OpcodeIf::getVariables(ifVars);
-	for (int i = 0 ; i < ifVars.size() ; ++i) {
+	for (int i = 0; i < ifVars.size(); ++i) {
 		ifVars[i].size = FF7Var::Word;
 	}
 	vars.append(ifVars);
@@ -1822,12 +1848,79 @@
 {
 	QList<FF7Var> ifVars;
 	OpcodeIf::getVariables(ifVars);
-	for (int i = 0 ; i < ifVars.size() ; ++i) {
+	for (int i = 0; i < ifVars.size(); ++i) {
 		ifVars[i].size = FF7Var::Word;
 	}
 	vars.append(ifVars);
 }
 
+Opcode1A::Opcode1A(const char *params, int size)
+{
+	setParams(params, size);
+}
+
+void Opcode1A::setParams(const char *params, int)
+{
+	memcpy(&from, params, 2);
+	memcpy(&to, params + 2, 2);
+	memcpy(&absValue, params + 4, 4);
+	flag = (quint8)params[8];
+}
+
+QString Opcode1A::toString(Field *) const
+{
+	QStringList flags;
+
+	switch (flag & 0x7) {
+	case 1:    flags.append(QObject::tr("8 bit"));     break;
+	case 2:    flags.append(QObject::tr("16 bit"));    break;
+	case 3:    flags.append(QObject::tr("24 bit"));    break;
+	case 4:    flags.append(QObject::tr("32 bit"));    break;
+	default:   break;
+	}
+
+	if (flag & 0x10) {
+		flags.append(QObject::tr("From is a pointer"));
+	}
+
+	if (flag & 0x20) {
+		flags.append(QObject::tr("To is a pointer"));
+	}
+
+	return QObject::tr("Write/Read entire savemap (from=%1, to=%2, absValue=%3, flags={%4})")
+	        .arg(from)
+	        .arg(to)
+	        .arg(absValue)
+	        .arg(flags.join(", "));
+}
+
+QByteArray Opcode1A::params() const
+{
+	return QByteArray()
+	        .append((char *)&from, 2)
+	        .append((char *)&to, 2)
+	        .append((char *)&absValue, 4)
+	        .append(char(flag));
+}
+
+Opcode1B::Opcode1B(const char *params, int size) :
+    OpcodeJMPFL(params, size)
+{
+}
+
+Opcode1B::Opcode1B(const OpcodeJump &op) :
+    OpcodeJMPFL(op)
+{
+}
+
+QString Opcode1B::toString(Field *) const
+{
+	return QObject::tr("If Red XIII is named Nanaki (%2)")
+	        .arg(_badJump
+	             ? QObject::tr("else forward %n byte(s)", "With plural", _jump)
+	             : QObject::tr("else goto label %1").arg(_label));
+}
+
 OpcodeMINIGAME::OpcodeMINIGAME(const char *params, int size)
 {
 	setParams(params, size);
@@ -1846,7 +1939,7 @@
 QString OpcodeMINIGAME::toString(Field *) const
 {
 	QString miniGame;
-	switch(minigameID)
+	switch (minigameID)
 	{
 	case 0x00:		miniGame = QObject::tr("Bike (parameter %1)").arg(minigameParam);break;
 	case 0x01:		miniGame = QObject::tr("Chocobo Races (parameter %1)").arg(minigameParam);break;
@@ -1921,11 +2014,11 @@
 QString OpcodeBTMD2::toString(Field *) const
 {
 	QStringList modes;
-	for(quint8 i=0 ; i<32 ; ++i)
+	for (quint8 i=0; i<32; ++i)
 	{
-		if((battleMode >> i) & 1)
+		if ((battleMode >> i) & 1)
 		{
-			switch(i)
+			switch (i)
 			{
 			case 1:		modes.append(QObject::tr("Countdown"));											break;
 			case 2:		modes.append(QObject::tr("Pre-emptive attack"));										break;
@@ -1974,7 +2067,7 @@
 
 void OpcodeBTRLD::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), var, FF7Var::Word, true));
 }
 
@@ -2039,13 +2132,13 @@
 
 void OpcodeNFADE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), r & 0xFF, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), g & 0xFF, FF7Var::Byte));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), b & 0xFF, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), speed & 0xFF, FF7Var::Byte));
 }
 
@@ -2336,10 +2429,10 @@
 
 void OpcodeKAWAI::setParams(const char *params, int size)
 {
-	if(opcode)		delete opcode;
+	if (opcode)		delete opcode;
 
 //	size = params[0];
-	switch((quint8)params[1])
+	switch ((quint8)params[1])
 	{
 	case 0x00:	opcode = new OpcodeKAWAIEYETX(params + 2, size - 2);
 		break;
@@ -2461,7 +2554,7 @@
 
 void OpcodeBGPDH::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), targetZ & 0xFF, FF7Var::SignedWord));
 }
 
@@ -2497,9 +2590,9 @@
 
 void OpcodeBGSCR::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), targetY & 0xFF, FF7Var::SignedWord));
 }
 
@@ -2539,6 +2632,14 @@
 	setParams(params, size);
 }
 
+OpcodeWindow::OpcodeWindow(quint8 windowID, quint16 targetX,
+                      quint16 targetY, quint16 width,
+                      quint16 height) :
+      windowID(windowID), targetX(targetX), targetY(targetY),
+      width(width), height(height)
+{
+}
+
 void OpcodeWindow::setParams(const char *params, int)
 {
 	windowID = params[0];
@@ -2631,12 +2732,12 @@
 QString OpcodeIfKey::keyString() const
 {
 	QStringList ret;
-	for(quint8 i=0 ; i<16 ; ++i) {
-		if((keys >> i) & 1) {
+	for (quint8 i=0; i<16; ++i) {
+		if ((keys >> i) & 1) {
 			ret.append(Data::key_names.at(i));
 		}
 	}
-	if(ret.isEmpty()) {
+	if (ret.isEmpty()) {
 		return QObject::tr("(no key)");
 	}
 	return ret.join(QObject::tr(" or "));
@@ -2785,7 +2886,7 @@
 QString OpcodeWSPCL::toString(Field *) const
 {
 	QString windowNum;
-	switch(displayType)
+	switch (displayType)
 	{
 	case 0x00:		windowNum = QObject::tr("(none)");					break;
 	case 0x01:		windowNum = QObject::tr("Clock (00:00)");			break;
@@ -2861,9 +2962,9 @@
 
 void OpcodeWNUMB::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), value & 0xFF, FF7Var::Word));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), (value >> 16) & 0xFF, FF7Var::Word));
 }
 
@@ -2900,11 +3001,11 @@
 
 void OpcodeSTTIM::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), h, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), m, FF7Var::Byte));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), s, FF7Var::Byte));
 }
 
@@ -2928,9 +3029,9 @@
 
 void OpcodeGOLD::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), value & 0xFF, FF7Var::Word));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), (value >> 16) & 0xFF, FF7Var::Word));
 }
 
@@ -2995,9 +3096,9 @@
 
 void OpcodeCHGLD::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), var1, FF7Var::Word, true));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), var2, FF7Var::Word, true));
 }
 
@@ -3042,6 +3143,11 @@
 	setParams(params, size);
 }
 
+OpcodeMESSAGE::OpcodeMESSAGE(quint8 windowID, quint8 textID) :
+	windowID(windowID), textID(textID)
+{
+}
+
 void OpcodeMESSAGE::setParams(const char *params, int)
 {
 	windowID = params[0];
@@ -3124,7 +3230,7 @@
 
 void OpcodeMPARA::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), value, FF7Var::Byte));
 }
 
@@ -3170,7 +3276,7 @@
 
 void OpcodeMPRA2::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), value & 0xFF, FF7Var::Word));
 }
 
@@ -3179,6 +3285,11 @@
 	setParams(params, size);
 }
 
+OpcodeMPNAM::OpcodeMPNAM(quint8 textID) :
+	textID(textID)
+{
+}
+
 void OpcodeMPNAM::setParams(const char *params, int)
 {
 	textID = params[0];
@@ -3228,7 +3339,7 @@
 
 void OpcodeHPMP::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), value & 0xFF, FF7Var::Word));
 }
 
@@ -3324,7 +3435,7 @@
 
 void OpcodeASK::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), varAnswer, FF7Var::Byte, true));
 }
 
@@ -3342,7 +3453,7 @@
 
 QString OpcodeMENU::menu22(const QString &param)
 {
-	switch(param.toInt())
+	switch (param.toInt())
 	{
 	case 0: return QObject::tr("all magic materias are present and mastered");
 	case 1: return QObject::tr("all summon materias are present and mastered");
@@ -3354,7 +3465,7 @@
 
 QString OpcodeMENU::menu23(const QString &param)
 {
-	switch(param.toInt())
+	switch (param.toInt())
 	{
 	case 0: return QObject::tr("Remove mastered magic materias and add Master Magic");
 	case 1: return QObject::tr("Remove mastered summon materias and add Master Summon");
@@ -3366,7 +3477,7 @@
 
 QString OpcodeMENU::menu(const QString &param) const
 {
-	switch(menuID)
+	switch (menuID)
 	{
 	case 1:		return QObject::tr("Exit program (parameter %1)").arg(param);
 	case 2:		return QObject::tr("Encount Error (parameter %1)").arg(param);
@@ -3409,7 +3520,7 @@
 
 void OpcodeMENU::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), param, FF7Var::Byte));
 }
 
@@ -3494,6 +3605,13 @@
 {
 }
 
+OpcodeWINDOW::OpcodeWINDOW(quint8 windowID, quint16 targetX,
+                           quint16 targetY, quint16 width,
+                           quint16 height) :
+      OpcodeWindow(windowID, targetX, targetY, width, height)
+{
+}
+
 OpcodeWINDOW::OpcodeWINDOW(const OpcodeWindow &op) :
 	OpcodeWindow(op)
 {
@@ -3562,7 +3680,7 @@
 QString OpcodeWMODE::toString(Field *) const
 {
 	QString typeStr;
-	switch(mode)
+	switch (mode)
 	{
 	case 0x00:		typeStr = QObject::tr("Normal");						break;
 	case 0x01:		typeStr = QObject::tr("No Background/Border");	break;
@@ -3750,13 +3868,13 @@
 
 void OpcodeGWCOL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), corner, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), r, FF7Var::Byte, true));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), g, FF7Var::Byte, true));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), b, FF7Var::Byte, true));
 }
 
@@ -3782,13 +3900,13 @@
 
 void OpcodeSWCOL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), corner, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), r, FF7Var::Byte));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), g, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), b, FF7Var::Byte));
 }
 
@@ -3814,9 +3932,9 @@
 
 void OpcodeItem::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), itemID & 0xFF, FF7Var::Word));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), quantity, FF7Var::Byte));
 }
 
@@ -3874,9 +3992,9 @@
 
 void OpcodeCKITM::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), itemID & 0xFF, FF7Var::Word));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), quantity, FF7Var::Byte, true));
 }
 
@@ -3911,13 +4029,13 @@
 
 void OpcodeSMTRA::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), materiaID, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), APCount & 0xFF, FF7Var::Word));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), (APCount >> 8) & 0xFF, FF7Var::Word));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), (APCount >> 16) & 0xFF, FF7Var::Word)); // FIXME: word?
 }
 
@@ -3955,13 +4073,13 @@
 
 void OpcodeDMTRA::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), materiaID, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), APCount & 0xFF, FF7Var::Word));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), (APCount >> 8) & 0xFF, FF7Var::Word));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), (APCount >> 16) & 0xFF, FF7Var::Word)); // FIXME: word?
 }
 
@@ -4003,15 +4121,15 @@
 
 void OpcodeCMTRA::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), materiaID, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), APCount & 0xFF, FF7Var::Word));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), (APCount >> 8) & 0xFF, FF7Var::Word));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), (APCount >> 16) & 0xFF, FF7Var::Word)); // FIXME: word?
-	if(B2(banks[2]) != 0)
+	if (B2(banks[2]) != 0)
 		vars.append(FF7Var(B2(banks[2]), varQuantity, FF7Var::Byte, true)); // FIXME: word?
 }
 
@@ -4168,7 +4286,7 @@
 
 void OpcodeSCRLA::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), speed & 0xFF, FF7Var::Word));
 }
 
@@ -4201,9 +4319,9 @@
 
 void OpcodeSCR2D::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), targetY & 0xFF, FF7Var::SignedWord));
 }
 
@@ -4249,11 +4367,11 @@
 
 void OpcodeSCR2DC::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), speed & 0xFF, FF7Var::Word));
 }
 
@@ -4299,11 +4417,11 @@
 
 void OpcodeSCR2DL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), speed & 0xFF, FF7Var::Word));
 }
 
@@ -4360,9 +4478,9 @@
 
 void OpcodeVWOFT::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), unknown1 & 0xFF, FF7Var::Word));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), unknown2 & 0xFF, FF7Var::Word));
 }
 
@@ -4408,11 +4526,11 @@
 
 void OpcodeFADE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), r, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), g, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), b, FF7Var::Byte));
 }
 
@@ -4476,7 +4594,7 @@
 
 void OpcodeLSTMP::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), var, FF7Var::Word, true));
 }
 
@@ -4512,7 +4630,7 @@
 
 void OpcodeSCRLP::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), speed & 0xFF, FF7Var::Word));
 }
 
@@ -4542,7 +4660,7 @@
 
 void OpcodeBATTLE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), battleID & 0xFF, FF7Var::Word));
 }
 
@@ -4580,11 +4698,11 @@
 QString OpcodeBTLMD::toString(Field *) const
 {
 	QStringList modes;
-	for(quint8 i=0 ; i<16 ; ++i)
+	for (quint8 i=0; i<16; ++i)
 	{
-		if((battleMode >> i) & 1)
+		if ((battleMode >> i) & 1)
 		{
-			switch(i)
+			switch (i)
 			{
 			case 1:		modes.append(QObject::tr("Countdown"));									break;
 			case 2:		modes.append(QObject::tr("Pre-emptive attack"));						break;
@@ -4635,7 +4753,7 @@
 
 void OpcodePGTDR::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), varDir, FF7Var::Byte, true));
 }
 
@@ -4668,7 +4786,7 @@
 
 void OpcodeGETPC::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), varPC, FF7Var::Byte, true));
 }
 
@@ -4711,13 +4829,13 @@
 
 void OpcodePXYZI::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), varX, FF7Var::SignedWord, true));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), varY, FF7Var::SignedWord, true));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), varZ, FF7Var::SignedWord, true));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), varI, FF7Var::Word, true));
 }
 
@@ -4753,9 +4871,9 @@
 
 void OpcodeOperation::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), var, FF7Var::Byte, true));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), value & 0xFF));
 }
 
@@ -4787,9 +4905,9 @@
 
 void OpcodeOperation2::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), var, FF7Var::Word, true));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), value & 0xFF, FF7Var::Word));
 }
 
@@ -4813,7 +4931,7 @@
 
 void OpcodeUnaryOperation::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), var, FF7Var::Byte, true));
 }
 
@@ -4829,7 +4947,7 @@
 
 void OpcodeUnaryOperation2::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), var, FF7Var::Word, true));
 }
 
@@ -5067,9 +5185,9 @@
 
 void OpcodeBitOperation::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), var, FF7Var::Bit, true));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), position, FF7Var::Byte));
 }
 
@@ -5543,11 +5661,11 @@
 
 void Opcode2BYTE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), var, FF7Var::Word, true));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), value1, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), value2, FF7Var::Byte));
 }
 
@@ -5632,13 +5750,13 @@
 
 void OpcodeSEARCHX::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), start & 0xFF, FF7Var::Word));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), end & 0xFF, FF7Var::Word));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), value, FF7Var::Byte));
-	if(B2(banks[2]) != 0)
+	if (B2(banks[2]) != 0)
 		vars.append(FF7Var(B2(banks[2]), varResult, FF7Var::Byte));
 }
 
@@ -5801,13 +5919,13 @@
 
 void OpcodeXYZI::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), targetZ & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), targetI & 0xFF, FF7Var::Word));
 }
 
@@ -5855,11 +5973,11 @@
 
 void OpcodeXYI::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), targetI & 0xFF, FF7Var::Word));
 }
 
@@ -5906,11 +6024,11 @@
 
 void OpcodeXYZ::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), targetZ & 0xFF, FF7Var::SignedWord));
 }
 
@@ -5954,9 +6072,9 @@
 
 void OpcodeMOVE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), targetY & 0xFF, FF7Var::SignedWord));
 }
 
@@ -5989,9 +6107,9 @@
 
 void OpcodeCMOVE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), targetY & 0xFF, FF7Var::SignedWord));
 }
 
@@ -6083,9 +6201,9 @@
 
 void OpcodeFMOVE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), targetY & 0xFF, FF7Var::SignedWord));
 }
 
@@ -6227,7 +6345,7 @@
 
 void OpcodeMSPED::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), speed & 0xFF, FF7Var::Word));
 }
 
@@ -6257,7 +6375,7 @@
 
 void OpcodeDIR::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), direction, FF7Var::Byte));
 }
 
@@ -6296,7 +6414,7 @@
 
 void OpcodeTURNGEN::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), direction, FF7Var::Byte));
 }
 
@@ -6335,7 +6453,7 @@
 
 void OpcodeTURN::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), direction, FF7Var::Byte));
 }
 
@@ -6390,7 +6508,7 @@
 
 void OpcodeGETDIR::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), varDir, FF7Var::Byte, true));
 }
 
@@ -6426,9 +6544,9 @@
 
 void OpcodeGETAXY::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), varX, FF7Var::SignedWord, true));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), varY, FF7Var::SignedWord, true));
 }
 
@@ -6461,7 +6579,7 @@
 
 void OpcodeGETAI::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), varI, FF7Var::Word, true));
 }
 
@@ -6578,7 +6696,7 @@
 
 void OpcodeASPED::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), speed & 0xFF, FF7Var::Word));
 }
 
@@ -6639,13 +6757,13 @@
 
 void OpcodeJUMP::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), targetI & 0xFF, FF7Var::Word));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), height & 0xFF, FF7Var::SignedWord));
 }
 
@@ -6687,13 +6805,13 @@
 
 void OpcodeAXYZI::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), varX, FF7Var::SignedWord, true));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), varY, FF7Var::SignedWord, true));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), varZ, FF7Var::SignedWord, true));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), varI, FF7Var::Word, true));
 }
 
@@ -6744,13 +6862,13 @@
 
 void OpcodeLADER::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), targetZ & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), targetI & 0xFF, FF7Var::Word));
 }
 
@@ -6792,13 +6910,13 @@
 
 void OpcodeOFST::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), targetZ & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), speed & 0xFF, FF7Var::Word));
 }
 
@@ -6837,7 +6955,7 @@
 
 void OpcodeTALKR::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), distance, FF7Var::Byte));
 }
 
@@ -6867,7 +6985,7 @@
 
 void OpcodeSLIDR::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), distance, FF7Var::Byte));
 }
 
@@ -7207,17 +7325,17 @@
 
 void OpcodeSLINE::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), targetX1 & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), targetY1 & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), targetZ1 & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), targetX2 & 0xFF, FF7Var::SignedWord));
-	if(B1(banks[2]) != 0)
+	if (B1(banks[2]) != 0)
 		vars.append(FF7Var(B1(banks[2]), targetY2 & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[2]) != 0)
+	if (B2(banks[2]) != 0)
 		vars.append(FF7Var(B2(banks[2]), targetZ2 & 0xFF, FF7Var::SignedWord));
 }
 
@@ -7256,13 +7374,13 @@
 
 void OpcodeSIN::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), value1 & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), value2 & 0xFF, FF7Var::SignedWord)); // FIXME: signed word?
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), value3 & 0xFF, FF7Var::SignedWord)); // FIXME: signed word?
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), var, FF7Var::SignedWord, true));
 }
 
@@ -7301,13 +7419,13 @@
 
 void OpcodeCOS::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), value1 & 0xFF, FF7Var::SignedWord));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), value2 & 0xFF, FF7Var::SignedWord)); // FIXME: signed word?
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), value3 & 0xFF, FF7Var::SignedWord)); // FIXME: signed word?
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), var, FF7Var::SignedWord, true));
 }
 
@@ -7337,7 +7455,7 @@
 
 void OpcodeTLKR2::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), distance & 0xFF, FF7Var::Word));
 }
 
@@ -7367,7 +7485,7 @@
 
 void OpcodeSLDR2::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), distance & 0xFF, FF7Var::Word));
 }
 
@@ -7442,18 +7560,35 @@
 
 void OpcodeAKAO2::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), param1 & 0xFF, FF7Var::Word));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), param2 & 0xFF, FF7Var::Word));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), param3 & 0xFF, FF7Var::Word));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), param4 & 0xFF, FF7Var::Word));
-	if(B2(banks[2]) != 0)
+	if (B2(banks[2]) != 0)
 		vars.append(FF7Var(B2(banks[2]), param5 & 0xFF, FF7Var::Word));
 }
 
+bool OpcodeAKAO2::searchOpcode(int opcode) const
+{
+	int op = opcode & 0xFFFF, subOp = (opcode >> 16) - 1;
+
+	if (op == id()) {
+		if (subOp >= 0) {
+			if (subOp == this->opcode) {
+				return true;
+			}
+		} else {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 OpcodeFCFIX::OpcodeFCFIX(const char *params, int size)
 {
 	setParams(params, size);
@@ -7567,15 +7702,15 @@
 
 void OpcodeMPPAL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), start, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), b, FF7Var::Byte));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), g, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), r, FF7Var::Byte));
-	if(B2(banks[2]) != 0)
+	if (B2(banks[2]) != 0)
 		vars.append(FF7Var(B2(banks[2]), colorCount, FF7Var::Byte));
 }
 
@@ -7608,9 +7743,9 @@
 
 void OpcodeBGON::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), paramID, FF7Var::Byte));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), stateID, FF7Var::Byte));
 }
 
@@ -7643,9 +7778,9 @@
 
 void OpcodeBGOFF::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), paramID, FF7Var::Byte));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), stateID, FF7Var::Byte));
 }
 
@@ -7675,7 +7810,7 @@
 
 void OpcodeBGROL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), paramID, FF7Var::Byte));
 }
 
@@ -7705,7 +7840,7 @@
 
 void OpcodeBGROL2::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), paramID, FF7Var::Byte));
 }
 
@@ -7735,7 +7870,7 @@
 
 void OpcodeBGCLR::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), paramID, FF7Var::Byte));
 }
 
@@ -7771,9 +7906,9 @@
 
 void OpcodeSTPAL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), palID, FF7Var::Byte));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), position, FF7Var::Byte));
 }
 
@@ -7809,9 +7944,9 @@
 
 void OpcodeLDPAL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), position, FF7Var::Byte));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), palID, FF7Var::Byte));
 }
 
@@ -7847,9 +7982,9 @@
 
 void OpcodeCPPAL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), posSrc, FF7Var::Byte));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), posDst, FF7Var::Byte));
 }
 
@@ -7888,11 +8023,11 @@
 
 void OpcodeRTPAL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), posSrc, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), posDst, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), start, FF7Var::Byte));
 }
 
@@ -7937,15 +8072,15 @@
 
 void OpcodeADPAL::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), posSrc, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), posDst, FF7Var::Byte));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), b, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), g, FF7Var::Byte));
-	if(B1(banks[2]) != 0)
+	if (B1(banks[2]) != 0)
 		vars.append(FF7Var(B1(banks[2]), r, FF7Var::Byte));
 }
 
@@ -7990,15 +8125,15 @@
 
 void OpcodeMPPAL2::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), posSrc, FF7Var::Byte));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), posDst, FF7Var::Byte));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), b, FF7Var::Byte));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), g, FF7Var::Byte));
-	if(B1(banks[2]) != 0)
+	if (B1(banks[2]) != 0)
 		vars.append(FF7Var(B1(banks[2]), r, FF7Var::Byte));
 }
 
@@ -8177,9 +8312,9 @@
 
 void OpcodeSOUND::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), soundID & 0xFF, FF7Var::Word));
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), position, FF7Var::Byte));
 }
 
@@ -8224,18 +8359,35 @@
 
 void OpcodeAKAO::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks[0]) != 0)
+	if (B1(banks[0]) != 0)
 		vars.append(FF7Var(B1(banks[0]), param1 & 0xFF, FF7Var::Word));
-	if(B2(banks[0]) != 0)
+	if (B2(banks[0]) != 0)
 		vars.append(FF7Var(B2(banks[0]), param2 & 0xFF, FF7Var::Word));
-	if(B1(banks[1]) != 0)
+	if (B1(banks[1]) != 0)
 		vars.append(FF7Var(B1(banks[1]), param3 & 0xFF, FF7Var::Word));
-	if(B2(banks[1]) != 0)
+	if (B2(banks[1]) != 0)
 		vars.append(FF7Var(B2(banks[1]), param4 & 0xFF, FF7Var::Word));
-	if(B2(banks[2]) != 0)
+	if (B2(banks[2]) != 0)
 		vars.append(FF7Var(B2(banks[2]), param5 & 0xFF, FF7Var::Word));
 }
 
+bool OpcodeAKAO::searchOpcode(int opcode) const
+{
+	int op = opcode & 0xFFFF, subOp = (opcode >> 16) - 1;
+
+	if (op == id()) {
+		if (subOp >= 0) {
+			if (subOp == this->opcode) {
+				return true;
+			}
+		} else {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 OpcodeMUSVT::OpcodeMUSVT(const char *params, int size)
 {
 	setParams(params, size);
@@ -8349,9 +8501,9 @@
 
 void OpcodeCHMPH::getVariables(QList<FF7Var> &vars) const
 {
-	if(B1(banks) != 0)
+	if (B1(banks) != 0)
 		vars.append(FF7Var(B1(banks), var1, FF7Var::Byte, true)); // FIXME: byte?
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), var2, FF7Var::Byte, true)); // FIXME: byte?
 }
 
@@ -8411,7 +8563,7 @@
 
 void OpcodeMVIEF::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), varCurMovieFrame, FF7Var::Word, true));
 }
 
@@ -8523,7 +8675,7 @@
 
 void OpcodeCHMST::getVariables(QList<FF7Var> &vars) const
 {
-	if(B2(banks) != 0)
+	if (B2(banks) != 0)
 		vars.append(FF7Var(B2(banks), var, FF7Var::Byte, true));
 }
 
@@ -8565,8 +8717,8 @@
 /*17*//* IFSWL */		9,
 /*18*//* IFUW */		8,
 /*19*//* IFUWL */		9,
-/*1a*//*  */			1,
-/*1b*//*  */			1,
+/*1a*//*  */			10,
+/*1b*//*  */			3,
 /*1c*//*  */			1,
 /*1d*//*  */			1,
 /*1e*//*  */			1,
diff -Nru makoureactor-1.7.2/core/field/Opcode.h makoureactor-1.8.0/core/field/Opcode.h
--- makoureactor-1.7.2/core/field/Opcode.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Opcode.h	2020-08-08 18:46:56.000000000 +0000
@@ -56,7 +56,7 @@
 }
 
 inline bool operator<(const FF7Var &v1, const FF7Var &v2) {
-	if(v1.bank == v2.bank) {
+	if (v1.bank == v2.bank) {
 		return v1.address < v2.address;
 	}
 	return v1.bank < v2.bank;
@@ -186,6 +186,7 @@
 	static Opcode *unserialize(const QByteArray &data);
 	inline virtual bool isExec() const { return false; }
 	inline virtual bool isJump() const { return false; }
+	inline virtual bool isIf() const { return false; }
 	inline virtual bool isLabel() const { return false; }
 	int subParam(int cur, int paramSize) const;
 
@@ -204,6 +205,7 @@
 	inline virtual bool getWindow(FF7Window &window) const { Q_UNUSED(window) return false; }
 	inline virtual void setWindow(const FF7Window &window) { Q_UNUSED(window) }
 	inline virtual void getVariables(QList<FF7Var> &vars) const { Q_UNUSED(vars) }
+	virtual bool searchOpcode(int opcode) const;
 	bool searchExec(quint8 group, quint8 script) const;
 	bool searchMapJump(quint16 fieldID) const;
 	bool searchTextInScripts(const QRegExp &text, const Section1File *scriptsAndTexts) const;
@@ -220,7 +222,7 @@
 	void backgroundMove(qint16 z[2], qint16 *x, qint16 *y) const;
 
 	static QString character(quint8 persoID);
-	static QString akao(quint8 akaoOp, bool *ok = NULL);
+	static QString akao(quint8 akaoOp, bool *ok = nullptr);
 
 	static const quint8 length[257];
 	static const QString names[257];
@@ -547,6 +549,7 @@
 	inline virtual bool isBackJump() { return false; }
 	quint32 maxJump() const;
 	virtual quint8 jumpPosData() const=0;
+	QByteArray serialize() const;
 protected:
 	qint32 _jump;
 	quint32 _label;
@@ -627,6 +630,7 @@
 	explicit OpcodeIf();
 	explicit OpcodeIf(const OpcodeJump &op);
 	virtual void getVariables(QList<FF7Var> &vars) const;
+	inline virtual bool isIf() const { return true; }
 	quint8 banks;
 	qint32 value1, value2;
 	quint8 oper;
@@ -708,6 +712,26 @@
 	void getVariables(QList<FF7Var> &vars) const;
 };
 
+class Opcode1A : public Opcode {
+public:
+	explicit Opcode1A(const char *params, int size);
+	inline int id() const { return 0x1A; }
+	QString toString(Field *field) const;
+	void setParams(const char *params, int size);
+	QByteArray params() const;
+	quint16 from, to;
+	quint32 absValue;
+	quint8 flag;
+};
+
+class Opcode1B : public OpcodeJMPFL {
+public:
+	explicit Opcode1B(const char *params, int size);
+	explicit Opcode1B(const OpcodeJump &op);
+	inline int id() const { return 0x1B; }
+	QString toString(Field *field) const;
+};
+
 class OpcodeMINIGAME : public Opcode {
 public:
 	explicit OpcodeMINIGAME(const char *params, int size);
@@ -977,6 +1001,9 @@
 class OpcodeWindow : public Opcode {
 public:
 	explicit OpcodeWindow(const char *params, int size);
+	explicit OpcodeWindow(quint8 windowID, quint16 targetX,
+	                      quint16 targetY, quint16 width,
+	                      quint16 height);
 	void setParams(const char *params, int size);
 	QByteArray params() const;
 	int getWindowID() const;
@@ -1005,6 +1032,7 @@
 	QString keyString() const;
 	inline bool isLongJump() const { return false; }
 	inline quint8 jumpPosData() const { return 3; }
+	inline virtual bool isIf() const { return true; }
 	quint16 keys;
 };
 
@@ -1175,6 +1203,7 @@
 class OpcodeMESSAGE : public Opcode {
 public:
 	explicit OpcodeMESSAGE(const char *params, int size);
+	explicit OpcodeMESSAGE(quint8 windowID, quint8 textID);
 	inline int id() const { return 0x40; }
 	QString toString(Field *field) const;
 	void setParams(const char *params, int size);
@@ -1216,6 +1245,7 @@
 class OpcodeMPNAM : public Opcode {
 public:
 	explicit OpcodeMPNAM(const char *params, int size);
+	explicit OpcodeMPNAM(quint8 textID);
 	inline int id() const { return 0x43; }
 	QString toString(Field *field) const;
 	void setParams(const char *params, int size);
@@ -1319,6 +1349,9 @@
 class OpcodeWINDOW : public OpcodeWindow {
 public:
 	explicit OpcodeWINDOW(const char *params, int size);
+	explicit OpcodeWINDOW(quint8 windowID, quint16 targetX,
+	                      quint16 targetY, quint16 width,
+	                      quint16 height);
 	explicit OpcodeWINDOW(const OpcodeWindow &op);
 	inline int id() const { return 0x50; }
 	QString toString(Field *field) const;
@@ -2638,6 +2671,7 @@
 	QByteArray params() const;
 	inline bool isLongJump() const { return false; }
 	inline quint8 jumpPosData() const { return 2; }
+	inline virtual bool isIf() const { return true; }
 	quint8 charID;
 };
 
@@ -2805,6 +2839,7 @@
 	void setParams(const char *params, int size);
 	QByteArray params() const;
 	void getVariables(QList<FF7Var> &vars) const;
+	bool searchOpcode(int opcode) const;
 	quint8 banks[3], opcode;
 	quint16 param1, param2, param3, param4, param5;
 };
@@ -3058,6 +3093,7 @@
 	void setParams(const char *params, int size);
 	QByteArray params() const;
 	void getVariables(QList<FF7Var> &vars) const;
+	bool searchOpcode(int opcode) const;
 	quint8 banks[3], opcode, param1;
 	quint16 param2, param3, param4, param5;
 };
diff -Nru makoureactor-1.7.2/core/field/Palette.cpp makoureactor-1.8.0/core/field/Palette.cpp
--- makoureactor-1.7.2/core/field/Palette.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Palette.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -33,7 +33,7 @@
 
 void Palette::fromData(const char *data)
 {
-	for(quint16 i=0 ; i<256 ; ++i) {
+	for (quint16 i=0; i<256; ++i) {
 		quint16 color;
 		memcpy(&color, data, 2);
 
@@ -49,7 +49,7 @@
 	QByteArray data;
 	quint8 colorId = 0;
 
-	foreach(const QRgb color, _colors) {
+	for (const QRgb color : _colors) {
 		quint16 psColor = (PsColor::toPsColor(color) & 0x7FFF)
 				| (_masks.at(colorId) << 15);
 		data.append((char *)&psColor, 2);
@@ -64,8 +64,8 @@
 	const quint8 size = 16;
 	QImage image(size, size, QImage::Format_ARGB32);
 
-	for(int y=0 ; y<size ; ++y) {
-		for(int x=0 ; x<size ; ++x) {
+	for (int y=0; y<size; ++y) {
+		for (int x=0; x<size; ++x) {
 			image.setPixel(x, y, color(y * size + x));
 		}
 	}
@@ -90,7 +90,7 @@
 
 QRgb PalettePC::color(int index) const
 {
-	if(Palette::isZero(index)) {
+	if (Palette::isZero(index)) {
 		return Palette::color(0);
 	}
 	return Palette::color(index);
@@ -119,7 +119,7 @@
 {
 	PalettesPS palettesPS;
 
-	foreach(Palette *palette, *this) {
+	for (Palette *palette : *this) {
 		palettesPS.append(new PalettePS(*palette));
 	}
 
@@ -134,7 +134,7 @@
 {
 	PalettesPC palettesPC;
 
-	foreach(Palette *palette, *this) {
+	for (Palette *palette : *this) {
 		palettesPC.append(new PalettePC(*palette));
 	}
 
diff -Nru makoureactor-1.7.2/core/field/PaletteIO.cpp makoureactor-1.8.0/core/field/PaletteIO.cpp
--- makoureactor-1.7.2/core/field/PaletteIO.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/PaletteIO.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -24,13 +24,13 @@
 
 bool PaletteIO::read(Palettes &palettes) const
 {
-	if(!canRead()) {
+	if (!canRead()) {
 		return false;
 	}
 
 	QByteArray palData = device()->read(12);
 
-	if(palData.size() != 12) {
+	if (palData.size() != 12) {
 		qWarning() << "PaletteIO::read Pal size too short";
 		return false;
 	}
@@ -41,12 +41,12 @@
 
 	palData = device()->read(palH * 512);
 
-	if(palData.size() != palH * 512) {
+	if (palData.size() != palH * 512) {
 		qWarning() << "PaletteIO::read Pal size too short 2";
 		return false;
 	}
 
-	for(quint32 i=0 ; i<palH ; ++i) {
+	for (quint32 i=0; i<palH; ++i) {
 		palettes.append(createPalette(palData.constData() + i*512));
 	}
 
@@ -55,7 +55,7 @@
 
 bool PaletteIO::write(const Palettes &palettes) const
 {
-	if(!canWrite()) {
+	if (!canWrite()) {
 		return false;
 	}
 
@@ -69,7 +69,7 @@
 	device()->write((char *)&palW, 2);
 	device()->write((char *)&palH, 2);
 
-	foreach(const Palette *pal, palettes) {
+	for (const Palette *pal : palettes) {
 		device()->write(pal->toByteArray());
 	}
 
@@ -93,8 +93,8 @@
 
 bool PaletteIOPC::canReadAlpha() const
 {
-	if(_deviceAlpha) {
-		if(!_deviceAlpha->isOpen()) {
+	if (_deviceAlpha) {
+		if (!_deviceAlpha->isOpen()) {
 			return _deviceAlpha->open(QIODevice::ReadOnly);
 		}
 		return _deviceAlpha->isReadable();
@@ -104,8 +104,8 @@
 
 bool PaletteIOPC::canWriteAlpha() const
 {
-	if(_deviceAlpha) {
-		if(!_deviceAlpha->isOpen()) {
+	if (_deviceAlpha) {
+		if (!_deviceAlpha->isOpen()) {
 			return _deviceAlpha->open(QIODevice::WriteOnly);
 		}
 		return _deviceAlpha->isWritable();
@@ -115,20 +115,20 @@
 
 bool PaletteIOPC::readAfter(Palettes &palettes) const
 {
-	if(!canReadAlpha()) {
+	if (!canReadAlpha()) {
 		return false;
 	}
 
 	QByteArray palFlags = deviceAlpha()->read(16);
 
-	if(palFlags.size() < 16) {
+	if (palFlags.size() < 16) {
 		return false;
 	}
 
 	quint8 palId=0;
 
-	foreach(Palette *palette, palettes) {
-		if(palId >= 16) {
+	for (Palette *palette : palettes) {
+		if (palId >= 16) {
 			break;
 		}
 
@@ -142,26 +142,26 @@
 
 bool PaletteIOPC::writeAfter(const Palettes &palettes) const
 {
-	if(!canWriteAlpha()) {
+	if (!canWriteAlpha()) {
 		return false;
 	}
 
 	quint8 palId=0;
 
-	foreach(const Palette *palette, palettes) {
-		if(palId >= 16) {
+	for (const Palette *palette : palettes) {
+		if (palId >= 16) {
 			break;
 		}
 
 		quint8 trans = static_cast<const PalettePC *>(palette)->transparency();
-		if(deviceAlpha()->write((char *)&trans, 1) != 1) {
+		if (deviceAlpha()->write((char *)&trans, 1) != 1) {
 			return false;
 		}
 
 		++palId;
 	}
 
-	if(deviceAlpha()->write(QByteArray(24 - palId, '\0')) != 24 - palId) {
+	if (deviceAlpha()->write(QByteArray(24 - palId, '\0')) != 24 - palId) {
 		return false;
 	}
 
diff -Nru makoureactor-1.7.2/core/field/PFile.cpp makoureactor-1.8.0/core/field/PFile.cpp
--- makoureactor-1.7.2/core/field/PFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/PFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -25,32 +25,41 @@
 
 bool PFile::read(FieldModelPart *part, const QList<int> &texIds) const
 {
-	if(!canRead()) {
+	if (!canRead()) {
 		return false;
 	}
 
-	QList<PolyVertex> vertices/*, normals*/;
+	QList<PolyVertex> vertices, normals;
+	QList<QByteArray> unknown1;
 	QList<TexCoord> texCs;
 	QList<ColorBGRA> vertexColors;
+	QList<QByteArray> polyColors;
+	QList<Edge> edges;
 	QList<PolygonP> polys;
+	QList<Hundred> hundreds;
 	QList<Group> groups;
 	QList<FieldModelGroup *> _groups;
+	QList<BoundingBox> boundingBoxes;
+	QList<quint32> normIndexTable;
 	PHeader header;
 	PolyVertex vertex;
 	TexCoord texC;
 	ColorBGRA vertexColor;
+	Edge edge;
 	PolygonP poly;
+	Hundred hundred;
 	Group group;
-	quint32 i;
+	BoundingBox boundingBox;
+	quint32 i, normIndex;
 
-	if(device()->read((char *)&header, 128) != 128
+	if (device()->read((char *)&header, 128) != 128
 	        || header.version != 1 || header.off04 != 1
 	        || header.vertexType > 1) {
 		return false;
 	}
 
-	for(i = 0 ; i < header.numVertices ; ++i) {
-		if(device()->read((char *)&vertex, 12) != 12) {
+	for (i = 0; i < header.numVertices; ++i) {
+		if (device()->read((char *)&vertex, 12) != 12) {
 			return false;
 		}
 		vertex.x = vertex.x / MODEL_SCALE_PC;
@@ -59,76 +68,109 @@
 		vertices.append(vertex);
 	}
 
-//	for(i = 0 ; i < header.numNormals ; ++i) {
-//		if(device()->read((char *)&vertex, 12) != 12) {
-//			return false;
-//		}
-//		normals.append(vertex);
-//	}
+	for (i = 0; i < header.numNormals; ++i) {
+		if (device()->read((char *)&vertex, 12) != 12) {
+			return false;
+		}
+		normals.append(vertex);
+	}
 
-	if(!device()->seek(device()->pos() + header.numNormals * 12 + header.numUnknown1 * 12)) {
-		return false;
+	for (i = 0; i < header.numUnknown1; ++i) {
+		QByteArray u1 = device()->read(12);
+		if (u1.size() != 12) {
+			return false;
+		}
+		unknown1.append(u1);
 	}
 
-	for(i = 0 ; i < header.numTexCs ; ++i) {
-		if(device()->read((char *)&texC, 8) != 8) {
+	for (i = 0; i < header.numTexCs; ++i) {
+		if (device()->read((char *)&texC, 8) != 8) {
 			return false;
 		}
 		texCs.append(texC);
 	}
 
-	for(i = 0 ; i < header.numVertexColors ; ++i) {
-		if(device()->read((char *)&vertexColor, 4) != 4) {
+	for (i = 0; i < header.numVertexColors; ++i) {
+		if (device()->read((char *)&vertexColor, 4) != 4) {
 			return false;
 		}
 		vertexColors.append(vertexColor);
 	}
 
-	if(!device()->seek(device()->pos() + (header.numPolys + header.numEdges) * 4)) {
-		return false;
+	for (i = 0; i < header.numPolys; ++i) {
+		QByteArray polyColor = device()->read(4);
+		if (polyColor.size() != 4) {
+			return false;
+		}
+		polyColors.append(polyColor);
+	}
+
+	for (i = 0; i < header.numEdges; ++i) {
+		if (device()->read((char *)&edge, 4) != 4) {
+			return false;
+		}
+		edges.append(edge);
 	}
 
-	for(i = 0 ; i < header.numPolys ; ++i) {
-		if(device()->read((char *)&poly, 24) != 24) {
+	for (i = 0; i < header.numPolys; ++i) {
+		if (device()->read((char *)&poly, 24) != 24) {
 			return false;
 		}
 		polys.append(poly);
 	}
 
-	if(!device()->seek(device()->pos() + header.numHundreds * 100)) {
-		return false;
+	for (i = 0; i < header.numHundreds; ++i) {
+		if (device()->read((char *)&hundred, 100) != 100) {
+			return false;
+		}
+		hundreds.append(hundred);
+		//qDebug() << "hundred" << header.numTexCs << QByteArray((char *)&hundred, 100).toHex();
 	}
 
-	for(i = 0 ; i < header.numGroups ; ++i) {
-		if(device()->read((char *)&group, 56) != 56) {
+	for (i = 0; i < header.numGroups; ++i) {
+		if (device()->read((char *)&group, 56) != 56) {
 			return false;
 		}
 		groups.append(group);
 	}
 
+	for (i = 0; i < header.numBoundingBoxes; ++i) {
+		if (device()->read((char *)&boundingBox, sizeof(boundingBox)) != sizeof(boundingBox)) {
+			return false;
+		}
+		boundingBoxes.append(boundingBox);
+	}
+
+	for (i = 0; i < header.numVertices; ++i) {
+		if (device()->read((char *)&normIndex, sizeof(normIndex)) != sizeof(normIndex)) {
+			return false;
+		}
+		normIndexTable.append(normIndex);
+	}
+
 	PolyVertex polyVertex;
 	QRgb color;
 
-	foreach(const Group &g, groups) {
+	for (const Group &g : groups) {
 		FieldModelGroup *grp = new FieldModelGroup();
 
-		if(g.areTexturesUsed) {
-			if(g.textureNumber < quint32(texIds.size())) {
+		if (g.areTexturesUsed) {
+			if (g.textureNumber < quint32(texIds.size())) {
 				// Convert relative group tex IDs to absolute tex IDs
 				grp->setTextureRef(new FieldModelTextureRefPC(texIds.at(g.textureNumber)));
 			}
 		}
 
-		for(quint32 polyID = 0 ; polyID < g.numPolygons && g.polygonStartIndex + polyID < (quint32)polys.size() ; ++polyID) {
+		for (quint32 polyID = 0; polyID < g.numPolygons && g.polygonStartIndex + polyID < (quint32)polys.size(); ++polyID) {
 			const PolygonP &poly = polys.at(g.polygonStartIndex + polyID);
 			QList<PolyVertex> polyVertices;
 			QList<QRgb> polyColors;
 			QList<TexCoord> polyTexCoords;
 
-			for(quint8 j = 0 ; j < 3 ; ++j) {
+			for (quint8 j = 0; j < 3; ++j) {
 				int vertexIndex = g.verticesStartIndex + poly.VertexIndex[j];
 
-				if(vertexIndex < vertices.size() &&
+				if (vertexIndex < vertices.size() &&
 						vertexIndex < vertexColors.size()) {
 					// vertex
 					vertex = vertices.at(vertexIndex);
@@ -141,10 +183,10 @@
 					color = qRgb(vertexColor.red, vertexColor.green, vertexColor.blue);
 					polyColors.append(color);
 
-					if(g.areTexturesUsed) {
+					if (g.areTexturesUsed) {
 						int texCoordIndex = g.texCoordStartIndex + poly.VertexIndex[j];
 
-						if(texCoordIndex < texCs.size()) {
+						if (texCoordIndex < texCs.size()) {
 							// tex coord
 							polyTexCoords.append(texCs.at(texCoordIndex));
 						}
diff -Nru makoureactor-1.7.2/core/field/PFile.h makoureactor-1.8.0/core/field/PFile.h
--- makoureactor-1.7.2/core/field/PFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/PFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -55,6 +55,38 @@
 	quint16 u[2];
 };
 
+struct Edge {
+	quint16 vertex1, vertex2;
+};
+
+struct Hundred {
+	quint32 zz1;
+	quint32 zz2;
+	quint32 zz3;
+	quint32 zz4;
+	quint32 texture_id;
+	quint32 texture_set;
+	quint32 zz7;
+	quint32 zz8;
+	quint32 zz9;
+	quint32 shademode;
+	quint32 lightstate_ambient;
+	quint32 zz12;
+	quint32 lightstate_material_pointer;
+	quint32 srcblend;
+	quint32 destblend;
+	quint32 zz16;
+	quint32 alpharef;
+	quint32 blend_mode;
+	quint32 zsort;
+	quint32 zz20;
+	quint32 zz21;
+	quint32 zz22;
+	quint32 zz23;
+	quint32 vertex_alpha;
+	quint32 zz25;
+};
+
 struct Group {
 	quint32 primitiveType;
 	quint32 polygonStartIndex;
@@ -72,6 +104,16 @@
 	quint32 textureNumber;
 };
 
+struct BoundingBox {
+	quint32 field_0;
+	float max_x;
+	float max_y;
+	float max_z;
+	float min_x;
+	float min_y;
+	float min_z;
+};
+
 class PFile : public IO
 {
 public:
diff -Nru makoureactor-1.7.2/core/field/RsdFile.cpp makoureactor-1.8.0/core/field/RsdFile.cpp
--- makoureactor-1.7.2/core/field/RsdFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/RsdFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -34,37 +34,37 @@
 	int index;
 	bool ok;
 
-	while(device()->canReadLine()) {
+	while (device()->canReadLine()) {
 		QString line = QString(device()->readLine()).trimmed();
-		if(pname.isNull() && (line.startsWith(QString("PLY="))
+		if (pname.isNull() && (line.startsWith(QString("PLY="))
 							  || line.startsWith(QString("MAT="))
 							  || line.startsWith(QString("GRP=")))) {
 			index = line.lastIndexOf('.');
-			if(index != -1) {
+			if (index != -1) {
 				line.truncate(index);
 			}
 			pname = line.mid(4).toLower();
-		} else if(!pname.isNull() && nTex == 0
+		} else if (!pname.isNull() && nTex == 0
 				  && line.startsWith(QString("NTEX="))) {
 			nTex = line.mid(5).toUInt(&ok);
-			if(!ok) {
+			if (!ok) {
 				return false;
 			}
 
-			for(quint32 i = 0 ; i < nTex && device()->canReadLine() ; ++i) {
+			for (quint32 i = 0; i < nTex && device()->canReadLine(); ++i) {
 				line = QString(device()->readLine()).trimmed();
-				if(!line.startsWith(QString("TEX[%1]=").arg(i))) {
+				if (!line.startsWith(QString("TEX[%1]=").arg(i))) {
 					return false;
 				}
 
 				index = line.lastIndexOf('.');
-				if(index != -1) {
+				if (index != -1) {
 					line.truncate(index);
 				}
 				QString tex = line.mid(line.indexOf('=') + 1).toLower();
 
 				index = textureNames.indexOf(tex);
-				if(index > -1) {
+				if (index > -1) {
 					texIds.append(index);
 				} else {
 					texIds.append(textureNames.size());
diff -Nru makoureactor-1.7.2/core/field/Script.cpp makoureactor-1.8.0/core/field/Script.cpp
--- makoureactor-1.7.2/core/field/Script.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Script.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -40,7 +40,7 @@
 Script::Script(const Script &other) :
 	lastError(other.lastError), valid(other.valid)
 {
-	foreach(Opcode *opcode, other.opcodes()) {
+	for (Opcode *opcode : other.opcodes()) {
 		_opcodes.append(Script::copyOpcode(opcode));
 	}
 }
@@ -56,11 +56,11 @@
 	QList<int> positions;
 	QMultiMap<int, OpcodeJump *> indents;
 
-	while(pos < scriptSize) {
+	while (pos < scriptSize) {
 		Opcode *op = createOpcode(script, initPos + pos);
 		_opcodes.append(op);
 		positions.append(pos);
-		if(op->isJump()) {
+		if (op->isJump()) {
 			indents.insert(pos + static_cast<OpcodeJump *>(op)->jump(), static_cast<OpcodeJump *>(op));
 //			qDebug() << opcodeID << "jump to" << (pos + ((OpcodeJump *)op)->jump());
 		}
@@ -71,25 +71,25 @@
 
 	QList<int> indentsKeys = indents.uniqueKeys();
 
-	for(int i=indentsKeys.size()-1 ; i >= 0 ; --i) {
+	for (int i=indentsKeys.size()-1; i >= 0; --i) {
 		int jump = indentsKeys.at(i);
 		int index = positions.indexOf(jump);
-		if(index != -1) {
+		if (index != -1) {
 			_opcodes.insert(index, new OpcodeLabel(i+1));
 //			qDebug() << (index+1) << "label" << (i+1);
-			foreach(OpcodeJump *opJump, indents.values(jump)) {
+			for (OpcodeJump *opJump : indents.values(jump)) {
 				opJump->setLabel(i+1);
 			}
 		} else {
 			qWarning() << "Error" << jump << "label" << (i+1);
-			foreach(OpcodeJump *opJump, indents.values(jump)) {
+			for (OpcodeJump *opJump : indents.values(jump)) {
 				opJump->setBadJump(true);
 			}
 //			return false;
 			/*int opID=0;
 			bool repaired=false;
-			foreach(const int &pos, positions) {
-				if(pos > jump) {
+			for (const int &pos : positions) {
+				if (pos > jump) {
 					// Repair bad jump: Insert label to the nearest valid position
 					_opcodes.insert(opID, new OpcodeLabel(i+1));
 //					qDebug() << (opID+1) << "repair label" << (i+1);
@@ -98,7 +98,7 @@
 				}
 				++opID;
 			}
-			if(!repaired) {
+			if (!repaired) {
 				// Repair bad jump: Put label at the end
 				_opcodes.append(new OpcodeLabel(i+1));
 //				qDebug() << "repair label" << (i+1);
@@ -115,12 +115,12 @@
 	quint8 size = Opcode::length[opcode] - 1; // length of arguments
 	const char *data = script.constData() + pos + 1;
 
-	if(script.size() < pos + 1 + size) {
+	if (script.size() < pos + 1 + size) {
 		qWarning() << "unknown opcode" << opcode << script.size() << pos << size << (pos + 1 + size);
 		return new OpcodeUnknown(opcode, script.mid(pos + 1));
 	}
 
-	switch(opcode)
+	switch (opcode)
 	{
 	case 0x00:	return new OpcodeRET();
 	case 0x01:	return new OpcodeREQ(data, size);
@@ -136,7 +136,7 @@
 	case 0x0B:	return new OpcodeGTPYE(data, size);
 	case 0x0E:	return new OpcodeDSKCG(data, size);
 	case 0x0F://SPECIAL
-		switch((quint8)script.at(pos+1)) {
+		switch ((quint8)script.at(pos+1)) {
 		case 0xF5:case 0xF6:case 0xF7:case 0xFB:case 0xFC:
 			size += 1;
 			break;
@@ -144,7 +144,7 @@
 			size += 2;
 			break;
 		}
-		if(script.size() < pos + 1 + size) {
+		if (script.size() < pos + 1 + size) {
 			qWarning() << "unknown opcode SPECIAL" << opcode << (script.size() - pos - 1);
 			return new OpcodeUnknown(opcode, script.mid(pos + 1));
 		}
@@ -159,6 +159,8 @@
 	case 0x17:	return new OpcodeIFSWL(data, size);
 	case 0x18:	return new OpcodeIFUW(data, size);
 	case 0x19:	return new OpcodeIFUWL(data, size);
+	case 0x1A:	return new Opcode1A(data, size);
+	case 0x1B:	return new Opcode1B(data, size);
 	case 0x20:	return new OpcodeMINIGAME(data, size);
 	case 0x21:	return new OpcodeTUTOR(data, size);
 	case 0x22:	return new OpcodeBTMD2(data, size);
@@ -168,13 +170,13 @@
 	case 0x26:	return new OpcodeBLINK(data, size);
 	case 0x27:	return new OpcodeBGMOVIE(data, size);
 	case 0x28://KAWAI
-		if(pos + 1 < script.size()) {
-			if((quint8)script.at(pos+1) == 0) {
+		if (pos + 1 < script.size()) {
+			if ((quint8)script.at(pos+1) == 0) {
 				qWarning() << "unknown opcode KAWAI" << opcode << size << (script.size() - pos - 1);
 				return new OpcodeUnknown(0x28, data, 1);
 			} else {
 				size = (quint8)script.at(pos+1) - 1;
-				if(pos + 1 + size <= script.size()) {
+				if (pos + 1 + size <= script.size()) {
 					return new OpcodeKAWAI(data, size);
 				}
 			}
@@ -404,7 +406,7 @@
 
 Opcode *Script::copyOpcode(Opcode *opcode)
 {
-	switch(opcode->id())
+	switch (opcode->id())
 	{
 	case 0x00:	return new OpcodeRET(*static_cast<OpcodeRET *>(opcode));
 	case 0x01:	return new OpcodeREQ(*static_cast<OpcodeREQ *>(opcode));
@@ -430,6 +432,8 @@
 	case 0x17:	return new OpcodeIFSWL(*static_cast<OpcodeIFSWL *>(opcode));
 	case 0x18:	return new OpcodeIFUW(*static_cast<OpcodeIFUW *>(opcode));
 	case 0x19:	return new OpcodeIFUWL(*static_cast<OpcodeIFUWL *>(opcode));
+	case 0x1A:	return new Opcode1A(*static_cast<Opcode1A *>(opcode));
+	case 0x1B:	return new Opcode1B(*static_cast<Opcode1B *>(opcode));
 	case 0x20:	return new OpcodeMINIGAME(*static_cast<OpcodeMINIGAME *>(opcode));
 	case 0x21:	return new OpcodeTUTOR(*static_cast<OpcodeTUTOR *>(opcode));
 	case 0x22:	return new OpcodeBTMD2(*static_cast<OpcodeBTMD2 *>(opcode));
@@ -664,15 +668,15 @@
 	int gotoLabel = -1;
 	int opcodeID = 0;
 
-	foreach(Opcode *opcode, _opcodes) {
-		if(opcode->isLabel()) {
-			if(gotoLabel != -1 && static_cast<OpcodeLabel *>(opcode)->label() == (quint32)gotoLabel) {
+	for (Opcode *opcode : qAsConst(_opcodes)) {
+		if (opcode->isLabel()) {
+			if (gotoLabel != -1 && static_cast<OpcodeLabel *>(opcode)->label() == (quint32)gotoLabel) {
 				gotoLabel = -1;
 			}
-		} else if(gotoLabel == -1) {
-			if(opcode->isJump() && !static_cast<OpcodeJump *>(opcode)->isBackJump()) {
+		} else if (gotoLabel == -1) {
+			if (opcode->isJump() && !static_cast<OpcodeJump *>(opcode)->isBackJump()) {
 				gotoLabel = static_cast<OpcodeJump *>(opcode)->label();
-			} else if(opcode->id() == Opcode::RET || opcode->id() == Opcode::RETTO) {
+			} else if (opcode->id() == Opcode::RET || opcode->id() == Opcode::RETTO) {
 				++opcodeID;
 				break;
 			}
@@ -682,7 +686,7 @@
 
 	Script *s = new Script(_opcodes.mid(opcodeID));
 	int size = _opcodes.size();
-	for( ; opcodeID < size ; ++opcodeID) {
+	for ( ; opcodeID < size; ++opcodeID) {
 		_opcodes.removeLast();
 	}
 
@@ -718,30 +722,30 @@
 {
 	// Warning: this not change the opcode size when converted, if short jump => keep short jump, if long jump => keep long jump
 	qint32 jump = opcodeJump->jump();
-	if(ok)	*ok = true;
+	if (ok)	*ok = true;
 
 //	qDebug() << "opcodeJump" << opcodeJump->name() << jump << "label" << opcodeJump->label();
 
-	if(jump - opcodeJump->jumpPosData() < 0) {
-		if(opcodeJump->isBackJump()) {
+	if (jump - opcodeJump->jumpPosData() < 0) {
+		if (opcodeJump->isBackJump()) {
 			// OK: jump back
 //			qDebug() << "OK -> jump back" << jump << opcodeJump->jumpPosData();
-		} else if(opcodeJump->id() == Opcode::JMPF) {
+		} else if (opcodeJump->id() == Opcode::JMPF) {
 //			qDebug() << "convert" << opcodeJump->name() << "to JMPB";
 			return new OpcodeJMPB(*opcodeJump);
-		} else if(opcodeJump->id() == Opcode::JMPFL) {
+		} else if (opcodeJump->id() == Opcode::JMPFL) {
 //			qDebug() << "convert" << opcodeJump->name() << "to JMPBL";
 			return new OpcodeJMPBL(*opcodeJump);
 		} else {
-			if(ok)	*ok = false;
+			if (ok)	*ok = false;
 			qWarning() << "Le label doit se trouver après la commande.";
 //			lastError = QObject::tr("Le label doit se trouver après la commande.");
 		}
-	} else if(jump - opcodeJump->jumpPosData() > 0) {
-		if(opcodeJump->id() == Opcode::JMPB) {
+	} else if (jump - opcodeJump->jumpPosData() > 0) {
+		if (opcodeJump->id() == Opcode::JMPB) {
 //			qDebug() << "convert" << opcodeJump->name() << "to JMPF";
 			return new OpcodeJMPF(*opcodeJump);
-		} else if(opcodeJump->id() == Opcode::JMPBL) {
+		} else if (opcodeJump->id() == Opcode::JMPBL) {
 //			qDebug() << "convert" << opcodeJump->name() << "to JMPFL";
 			return new OpcodeJMPFL(*opcodeJump);
 		} else {
@@ -751,6 +755,45 @@
 
 	return opcodeJump;
 }
+
+bool Script::canConvertOpcodeJumpRangeToLong(OpcodeJump *opcodeJump) const
+{
+	bool ok = false;
+
+	OpcodeJump *op = convertOpcodeJumpRangeToLong(opcodeJump, &ok);
+	if (ok) {
+		delete op;
+
+		return true;
+	}
+
+	return false;
+}
+
+OpcodeJump *Script::convertOpcodeJumpRangeToLong(OpcodeJump *opcodeJump, bool *ok) const
+{
+	if (ok)	*ok = true;
+
+	if (opcodeJump->isLongJump()) {
+		return opcodeJump;
+	}
+
+	if (opcodeJump->id() == Opcode::JMPF) {
+		return new OpcodeJMPFL(*opcodeJump);
+	} else if (opcodeJump->id() == Opcode::JMPB) {
+		return new OpcodeJMPBL(*opcodeJump);
+	} else if (opcodeJump->id() == Opcode::IFUB) {
+		return new OpcodeIFUBL(*(OpcodeIf *)opcodeJump);
+	} else if (opcodeJump->id() == Opcode::IFSW) {
+		return new OpcodeIFSWL(*(OpcodeIf *)opcodeJump);
+	} else if (opcodeJump->id() == Opcode::IFUW) {
+		return new OpcodeIFUWL(*(OpcodeIf *)opcodeJump);
+	}
+
+	if (ok)	*ok = false;
+
+	return opcodeJump;
+}
 /*
 bool Script::verifyOpcodeJumpRange(OpcodeJump *opcodeJump, QString &errorStr) const
 {
@@ -761,9 +804,9 @@
 	qDebug() << "opcodeJump" << opcodeJump->name() << jump << "label" << opcodeJump->label();
 
 	// if this is a long jump and opcode is a short jump
-	if(!opcodeJump->isLongJump() && jump > opcodeJump->maxJump()) {
-//		if(jump < 65535) {
-//			switch((Opcode::Keys)opcodeJump->id()) {
+	if (!opcodeJump->isLongJump() && jump > opcodeJump->maxJump()) {
+//		if (jump < 65535) {
+//			switch ((Opcode::Keys)opcodeJump->id()) {
 //			case Opcode::JMPF:
 //				return opcodeJump;
 ////				qDebug() << "convert" << opcodeJump->name() << "to JMPFL because" << jump << "<=" << 65535;
@@ -799,8 +842,8 @@
 	return true;
 
 	// Optimization: if this is a short jump and opcode is a long jump
-//	if(opcodeJump->isLongJump() && jump - opcodeJump->jumpPosData() <= 240) {
-//		switch((Opcode::Keys)opcodeJump->id()) {
+//	if (opcodeJump->isLongJump() && jump - opcodeJump->jumpPosData() <= 240) {
+//		switch ((Opcode::Keys)opcodeJump->id()) {
 //		case Opcode::JMPFL:
 //			qDebug() << "convert" << opcodeJump->name() << "to JMPF because" << jump << "<=" << 240;
 //			return new OpcodeJMPF(*opcodeJump);
@@ -831,9 +874,9 @@
 
 	// Search labels
 	opcodeID = 0;
-	foreach(Opcode *opcode, _opcodes) {
-		if(opcode->isLabel()) {
-			if(!labelPositions.contains(static_cast<OpcodeLabel *>(opcode)->label())) {
+	for (Opcode *opcode : qAsConst(_opcodes)) {
+		if (opcode->isLabel()) {
+			if (!labelPositions.contains(static_cast<OpcodeLabel *>(opcode)->label())) {
 				labelPositions.insert(static_cast<OpcodeLabel *>(opcode)->label(), pos);
 			} else {
 				errorStr = QObject::tr("Label %1 is declared several times.")
@@ -848,10 +891,10 @@
 
 	// Search jumps
 	opcodeID = pos = 0;
-	foreach(Opcode *opcode, _opcodes) {
-		if(opcode->isJump()) {
+	for (Opcode *opcode : qAsConst(_opcodes)) {
+		if (opcode->isJump()) {
 			OpcodeJump *opcodeJump = static_cast<OpcodeJump *>(opcode);
-			if(opcodeJump->isBadJump()) {
+			if (opcodeJump->isBadJump()) {
 				qWarning() << "invalid jump" << opcodeID;
 				//errorStr = QObject::tr("Ce saut est invalide, veuillez mettre un label valide.");
 				//return false;
@@ -859,15 +902,17 @@
 				qint32 jump = labelPositions.value(opcodeJump->label()) - pos;
 				opcodeJump->setJump(jump);
 
-				if(!opcodeJump->isLongJump() && quint32(qAbs(jump)) > opcodeJump->maxJump()) {
-					errorStr = QObject::tr("Label %1 is unreachable, please use a long jump.").arg(opcodeJump->label());
-					return false;
+				if (!opcodeJump->isLongJump() && quint32(qAbs(jump)) > opcodeJump->maxJump()) {
+					if (!canConvertOpcodeJumpRangeToLong(opcodeJump)) {
+						errorStr = QObject::tr("Label %1 is unreachable, please bring this instruction closer.").arg(opcodeJump->label());
+						return false;
+					}
 				}
-				if(opcodeJump->isLongJump() && quint32(qAbs(jump)) > opcodeJump->maxJump()) {
+				if (opcodeJump->isLongJump() && quint32(qAbs(jump)) > opcodeJump->maxJump()) {
 					errorStr = QObject::tr("Label %1 is unreachable because your script exceeds 65535 bytes, please reduce the size of the script.").arg(opcodeJump->label());
 					return false;
 				}
-				if(opcodeJump->id() != Opcode::JMPF
+				if (opcodeJump->id() != Opcode::JMPF
 						&& opcodeJump->id() != Opcode::JMPFL
 						&& opcodeJump->id() != Opcode::JMPB
 						&& opcodeJump->id() != Opcode::JMPBL
@@ -881,7 +926,7 @@
 		++opcodeID;
 	}
 
-	if(pos > 65535) {
+	if (pos > 65535) {
 		errorStr = QObject::tr("Script too big, it should not exceed 65535 bytes. Actual size: %1.").arg(pos);
 		return false;
 	}
@@ -896,8 +941,8 @@
 	QByteArray ret;
 
 	// Search labels
-	foreach(const Opcode *opcode, _opcodes) {
-		if(opcode->isLabel()) {
+	for (const Opcode *opcode : _opcodes) {
+		if (opcode->isLabel()) {
 			labelPositions.insert(static_cast<const OpcodeLabel *>(opcode)->label(), pos);
 		} else {
 			pos += opcode->size();
@@ -905,21 +950,29 @@
 	}
 
 	pos = 0;
-	foreach(Opcode *opcode, _opcodes) {
-		bool delPlease = false;
-		if(opcode->isJump()) {
+	for (Opcode *opcode : _opcodes) {
+		QList<Opcode *> delPlease;
+		if (opcode->isJump()) {
 			OpcodeJump *opcodeJump = static_cast<OpcodeJump *>(opcode);
 			opcodeJump->setJump(labelPositions.value(opcodeJump->label()) - pos);
 
+			if (!opcodeJump->isLongJump() && quint32(qAbs(opcodeJump->jump())) > opcodeJump->maxJump()) {
+				bool ok = false;
+				opcodeJump = convertOpcodeJumpRangeToLong(opcodeJump, &ok);
+
+				if (opcodeJump != opcode) {
+					delPlease.append(opcodeJump);
+				}
+			}
+
 			opcode = convertOpcodeJumpDirection(opcodeJump);
-			delPlease = opcode != opcodeJump;
+			if (opcode != opcodeJump) {
+				delPlease.append(opcode);
+			}
 		}
 		ret.append(opcode->toByteArray());
 		pos += opcode->size();
-
-		if(delPlease) {
-			delete opcode;
-		}
+		qDeleteAll(delPlease);
 	}
 
 	return ret;
@@ -927,8 +980,8 @@
 
 bool Script::isVoid() const
 {
-	foreach(const Opcode *opcode, _opcodes) {
-		if(!opcode->isVoid())	return false;
+	for (const Opcode *opcode : _opcodes) {
+		if (!opcode->isVoid())	return false;
 	}
 	return true;
 }
@@ -958,16 +1011,16 @@
 
 bool Script::moveOpcode(quint16 opcodeID, MoveDirection direction)
 {
-	if(opcodeID >= _opcodes.size())	return false;
+	if (opcodeID >= _opcodes.size())	return false;
 	
-	if(direction == Down)
+	if (direction == Down)
 	{
-		if(opcodeID == _opcodes.size()-1)	return false;
+		if (opcodeID == _opcodes.size()-1)	return false;
 		_opcodes.swap(opcodeID, opcodeID+1);
 	}
 	else
 	{
-		if(opcodeID == 0)	return false;
+		if (opcodeID == 0)	return false;
 		_opcodes.swap(opcodeID, opcodeID-1);
 	}
 	return true;
@@ -975,140 +1028,220 @@
 
 bool Script::searchOpcode(int opcode, int &opcodeID) const
 {
-	if(opcodeID < 0) 	opcodeID = 0;
-	if(opcodeID >= _opcodes.size())				return false;
-	if(opcode == _opcodes.at(opcodeID)->id())	return true;
+	if (opcodeID < 0) {
+		opcodeID = 0;
+	}
+
+	if (opcodeID >= _opcodes.size()) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchOpcode(opcode)) {
+		return true;
+	}
 
 	return searchOpcode(opcode, ++opcodeID);
 }
 
 bool Script::searchVar(quint8 bank, quint16 address, Opcode::Operation op, int value, int &opcodeID) const
 {
-	if(opcodeID < 0) 	opcodeID = 0;
-	if(opcodeID >= _opcodes.size())								return false;
-	if(_opcodes.at(opcodeID)->searchVar(bank, address, op, value))	return true;
+	if (opcodeID < 0) {
+		opcodeID = 0;
+	}
+
+	if (opcodeID >= _opcodes.size()) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchVar(bank, address, op, value)) {
+		return true;
+	}
 
 	return searchVar(bank, address, op, value, ++opcodeID);
 }
 
 void Script::searchAllVars(QList<FF7Var> &vars) const
 {
-	foreach(Opcode *opcode, _opcodes) {
+	for (Opcode *opcode : _opcodes) {
 		opcode->getVariables(vars);
 	}
 }
 
 bool Script::searchExec(quint8 group, quint8 script, int &opcodeID) const
 {
-	if(opcodeID < 0) 	opcodeID = 0;
-	if(opcodeID >= _opcodes.size())						return false;
-	if(_opcodes.at(opcodeID)->searchExec(group, script))	return true;
+	if (opcodeID < 0) {
+		opcodeID = 0;
+	}
+
+	if (opcodeID >= _opcodes.size()) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchExec(group, script)) {
+		return true;
+	}
 
 	return searchExec(group, script, ++opcodeID);
 }
 
 bool Script::searchMapJump(quint16 field, int &opcodeID) const
 {
-	if(opcodeID < 0) 	opcodeID = 0;
-	if(opcodeID >= _opcodes.size())					return false;
-	if(_opcodes.at(opcodeID)->searchMapJump(field))	return true;
+	if (opcodeID < 0) {
+		opcodeID = 0;
+	}
+
+	if (opcodeID >= _opcodes.size()) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchMapJump(field)) {
+		return true;
+	}
 
 	return searchMapJump(field, ++opcodeID);
 }
 
 bool Script::searchTextInScripts(const QRegExp &text, int &opcodeID, const Section1File *scriptsAndTexts) const
 {
-	if(opcodeID < 0) 	opcodeID = 0;
-	if(opcodeID >= _opcodes.size())					return false;
-	if(_opcodes.at(opcodeID)->searchTextInScripts(text, scriptsAndTexts))		return true;
+	if (opcodeID < 0) {
+		opcodeID = 0;
+	}
+
+	if (opcodeID >= _opcodes.size()) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchTextInScripts(text, scriptsAndTexts)) {
+		return true;
+	}
 
 	return searchTextInScripts(text, ++opcodeID, scriptsAndTexts);
 }
 
 bool Script::searchOpcodeP(int opcode, int &opcodeID) const
 {
-	if(opcodeID >= _opcodes.size()) opcodeID = _opcodes.size()-1;
-	if(opcodeID < 0)							return false;
-	if(opcode == _opcodes.at(opcodeID)->id())	return true;
+	if (opcodeID >= _opcodes.size()) {
+		opcodeID = _opcodes.size() - 1;
+	}
+
+	if (opcodeID < 0) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchOpcode(opcode)) {
+		return true;
+	}
 
 	return searchOpcodeP(opcode, --opcodeID);
 }
 
 bool Script::searchVarP(quint8 bank, quint16 address, Opcode::Operation op, int value, int &opcodeID) const
 {
-	if(opcodeID >= _opcodes.size()) opcodeID = _opcodes.size()-1;
-	if(opcodeID < 0)											return false;
-	if(_opcodes.at(opcodeID)->searchVar(bank, address, op, value))	return true;
+	if (opcodeID >= _opcodes.size()) {
+		opcodeID = _opcodes.size()-1;
+	}
+
+	if (opcodeID < 0) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchVar(bank, address, op, value)) {
+		return true;
+	}
 
 	return searchVarP(bank, address, op, value, --opcodeID);
 }
 
 bool Script::searchExecP(quint8 group, quint8 script, int &opcodeID) const
 {
-	if(opcodeID >= _opcodes.size()) opcodeID = _opcodes.size()-1;
-	if(opcodeID < 0)										return false;
-	if(_opcodes.at(opcodeID)->searchExec(group, script))	return true;
+	if (opcodeID >= _opcodes.size()) {
+		opcodeID = _opcodes.size()-1;
+	}
+
+	if (opcodeID < 0) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchExec(group, script)) {
+		return true;
+	}
 
 	return searchExecP(group, script, --opcodeID);
 }
 
 bool Script::searchMapJumpP(quint16 field, int &opcodeID) const
 {
-	if(opcodeID >= _opcodes.size()) opcodeID = _opcodes.size()-1;
-	if(opcodeID < 0)								return false;
-	if(_opcodes.at(opcodeID)->searchMapJump(field))	return true;
+	if (opcodeID >= _opcodes.size()) {
+		opcodeID = _opcodes.size()-1;
+	}
+
+	if (opcodeID < 0) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchMapJump(field)) {
+		return true;
+	}
 
 	return searchMapJumpP(field, --opcodeID);
 }
 
 bool Script::searchTextInScriptsP(const QRegExp &text, int &opcodeID, const Section1File *scriptsAndTexts) const
 {
-	if(opcodeID >= _opcodes.size()) opcodeID = _opcodes.size()-1;
-	if(opcodeID < 0)								return false;
-	if(_opcodes.at(opcodeID)->searchTextInScripts(text, scriptsAndTexts))		return true;
+	if (opcodeID >= _opcodes.size()) {
+		opcodeID = _opcodes.size()-1;
+	}
+
+	if (opcodeID < 0) {
+		return false;
+	}
+
+	if (_opcodes.at(opcodeID)->searchTextInScripts(text, scriptsAndTexts)) {
+		return true;
+	}
 
 	return searchTextInScriptsP(text, --opcodeID, scriptsAndTexts);
 }
 
 void Script::listUsedTexts(QSet<quint8> &usedTexts) const
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : _opcodes)
 		opcode->listUsedTexts(usedTexts);
 }
 
 void Script::listUsedTuts(QSet<quint8> &usedTuts) const
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : _opcodes)
 		opcode->listUsedTuts(usedTuts);
 }
 
 void Script::shiftGroupIds(int groupId, int steps)
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : qAsConst(_opcodes))
 		opcode->shiftGroupIds(groupId, steps);
 }
 
 void Script::shiftTextIds(int textId, int steps)
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : qAsConst(_opcodes))
 		opcode->shiftTextIds(textId, steps);
 }
 
 void Script::shiftTutIds(int tutId, int steps)
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : qAsConst(_opcodes))
 		opcode->shiftTutIds(tutId, steps);
 }
 
 void Script::swapGroupIds(int groupId1, int groupId2)
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : qAsConst(_opcodes))
 		opcode->swapGroupIds(groupId1, groupId2);
 }
 
 void Script::setWindow(const FF7Window &win)
 {
-	if(win.opcodeID < _opcodes.size()) {
+	if (win.opcodeID < _opcodes.size()) {
 		_opcodes.at(win.opcodeID)->setWindow(win);
 	}
 }
@@ -1116,8 +1249,8 @@
 int Script::opcodePositionInBytes(quint16 opcodeID)
 {
 	int pos=0, i=0;
-	foreach(Opcode *op, _opcodes) {
-		if(i == opcodeID) {
+	for (Opcode *op : qAsConst(_opcodes)) {
+		if (i == opcodeID) {
 			return pos;
 		}
 		pos += op->size();
@@ -1128,21 +1261,66 @@
 
 void Script::listWindows(int groupID, int scriptID, QMultiMap<quint64, FF7Window> &windows, QMultiMap<quint8, quint64> &text2win) const
 {
-	int opcodeID=0;
-	foreach(Opcode *opcode, _opcodes)
+	int opcodeID = 0;
+	for (Opcode *opcode : _opcodes) {
 		opcode->listWindows(groupID, scriptID, opcodeID++, windows, text2win);
+	}
+}
+
+void Script::listWindows(int groupID, int scriptID, int textID, QList<FF7Window> &windows) const
+{
+	int opcodeID = 0;
+	QMap<int, FF7Window> lastWinPerWindowID;
+	for (Opcode *opcode : _opcodes) {
+		if (opcode->isJump() || (opcode->id() <= Opcode::RETTO
+		                         && opcode->id() != Opcode::REQ
+		                         && opcode->id() != Opcode::PREQ)) {
+			lastWinPerWindowID.clear();
+		} else {
+			FF7Window win = FF7Window();
+			win.groupID = quint16(groupID);
+			win.scriptID = quint16(scriptID);
+			win.opcodeID = quint16(opcodeID);
+			if (opcode->getWindow(win)) {
+				win.type = quint8(opcode->id());
+				if (lastWinPerWindowID.contains(opcode->getWindowID())) {
+					win.mode = lastWinPerWindowID.value(opcode->getWindowID()).mode;
+				}
+				lastWinPerWindowID.insert(opcode->getWindowID(), win);
+			} else if (opcode->getTextID() == textID
+			           && lastWinPerWindowID.contains(opcode->getWindowID())) {
+				win = lastWinPerWindowID.value(opcode->getWindowID());
+				if (win.type != 255) {
+					if (opcode->id() == Opcode::ASK) {
+						OpcodeASK *opcodeAsk = static_cast<OpcodeASK *>(opcode);
+						win.ask_first = opcodeAsk->firstLine;
+						win.ask_last = opcodeAsk->lastLine;
+						win.type = Opcode::ASK;
+					}
+					windows.append(win);
+				}
+			} else if (opcode->id() == Opcode::WMODE) {
+				win.type = 255;
+				win.mode = static_cast<OpcodeWMODE *>(opcode)->mode;
+				lastWinPerWindowID.insert(opcode->getWindowID(), win);
+			}
+		}
+
+		opcodeID += 1;
+	}
 }
 
 void Script::listModelPositions(QList<FF7Position> &positions) const
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : _opcodes) {
 		opcode->listModelPositions(positions);
+	}
 }
 
 bool Script::linePosition(FF7Position position[2]) const
 {
-	foreach(Opcode *opcode, _opcodes) {
-		if(opcode->linePosition(position)) {
+	for (Opcode *opcode : _opcodes) {
+		if (opcode->linePosition(position)) {
 			return true;
 		}
 	}
@@ -1151,28 +1329,30 @@
 
 //void Script::searchWindows() const
 //{
-//	foreach(Opcode *opcode, _opcodes) {
+//	for (Opcode *opcode : _opcodes) {
 
 //	}
 //}
 
 void Script::backgroundParams(QHash<quint8, quint8> &paramActifs) const
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : _opcodes) {
 		opcode->backgroundParams(paramActifs);
+	}
 }
 
 void Script::backgroundMove(qint16 z[2], qint16 *x, qint16 *y) const
 {
-	foreach(Opcode *opcode, _opcodes)
+	for (Opcode *opcode : _opcodes) {
 		opcode->backgroundMove(z, x, y);
+	}
 }
 
 bool Script::removeTexts()
 {
 	bool modified = false;
-	foreach(Opcode *opcode, _opcodes) {
-		if(opcode->id() != Opcode::ASK
+	for (Opcode *opcode : qAsConst(_opcodes)) {
+		if (opcode->id() != Opcode::ASK
 				&& opcode->id() != Opcode::MPNAM
 				&& opcode->getTextID() != -1) {
 			_opcodes.removeOne(opcode);
@@ -1187,7 +1367,7 @@
 {
 	QString ret;
 
-	foreach(Opcode *opcode, _opcodes) {
+	for (Opcode *opcode : _opcodes) {
 		ret.append(opcode->toString(field));
 		ret.append("\n");
 	}
@@ -1199,7 +1379,7 @@
 {
 	stream << script.size();
 
-	foreach(Opcode *opcode, script) {
+	for (Opcode *opcode : script) {
 		stream << opcode->serialize();
 	}
 
@@ -1211,12 +1391,12 @@
 	int size;
 	stream >> size;
 
-	for(int i = 0 ; i < size ; ++i) {
+	for (int i = 0; i < size; ++i) {
 		QByteArray data;
 		stream >> data;
 
 		Opcode *op = Opcode::unserialize(data);
-		if(op) {
+		if (op) {
 			script.append(op);
 		}
 	}
diff -Nru makoureactor-1.7.2/core/field/Script.h makoureactor-1.8.0/core/field/Script.h
--- makoureactor-1.7.2/core/field/Script.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Script.h	2020-08-08 18:46:56.000000000 +0000
@@ -75,6 +75,7 @@
 	void listUsedTexts(QSet<quint8> &usedTexts) const;
 	void listUsedTuts(QSet<quint8> &usedTuts) const;
 	void listWindows(int groupID, int scriptID, QMultiMap<quint64, FF7Window> &windows, QMultiMap<quint8, quint64> &text2win) const;
+	void listWindows(int groupID, int scriptID, int textID, QList<FF7Window> &windows) const;
 	void listModelPositions(QList<FF7Position> &positions) const;
 	bool linePosition(FF7Position position[2]) const;
 	void backgroundParams(QHash<quint8, quint8> &paramActifs) const;
@@ -87,7 +88,9 @@
 
 	QString toString(Field *field) const;
 private:
-	OpcodeJump *convertOpcodeJumpDirection(OpcodeJump *opcodeJump, bool *ok=0) const;
+	OpcodeJump *convertOpcodeJumpDirection(OpcodeJump *opcodeJump, bool *ok=nullptr) const;
+	OpcodeJump *convertOpcodeJumpRangeToLong(OpcodeJump *opcodeJump, bool *ok=nullptr) const;
+	bool canConvertOpcodeJumpRangeToLong(OpcodeJump *opcodeJump) const;
 //	bool verifyOpcodeJumpRange(OpcodeJump *opcodeJump, QString &errorStr) const;
 	QList<Opcode *> _opcodes;
 	QString lastError;
diff -Nru makoureactor-1.7.2/core/field/Section1File.cpp makoureactor-1.8.0/core/field/Section1File.cpp
--- makoureactor-1.7.2/core/field/Section1File.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Section1File.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -18,6 +18,7 @@
 #include "Section1File.h"
 #include "Field.h"
 #include "core/Config.h"
+#include "widgets/TextPreview.h"
 
 GrpScriptsIterator::GrpScriptsIterator(const GrpScriptsIterator &other) :
 	QListIterator<GrpScript *>(other), _scriptsIt(0)
@@ -63,7 +64,7 @@
 		next();
 		return nextScript();
 	}
-	return NULL;
+	return nullptr;
 }
 
 Script *GrpScriptsIterator::previousScript()
@@ -75,7 +76,7 @@
 		previous();
 		return previousScript();
 	}
-	return NULL;
+	return nullptr;
 }
 
 Opcode *GrpScriptsIterator::nextOpcode()
@@ -94,7 +95,7 @@
 		return nextOpcode();
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 Opcode *GrpScriptsIterator::previousOpcode()
@@ -113,19 +114,19 @@
 		return previousOpcode();
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 Section1File::Section1File(Field *field) :
-	FieldPart(field), _scale(0), _tut(0)
+	FieldPart(field), _scale(0)
 {
 }
 
 Section1File::Section1File(const Section1File &other) :
 	FieldPart(other.field()), _author(other.author()),
-	_scale(other.scale()), _texts(other.texts()), _tut(other.tut())
+	_scale(other.scale()), _texts(other.texts())
 {
-	foreach(const GrpScript *grpScript, other.grpScripts()) {
+	for (const GrpScript *grpScript : other.grpScripts()) {
 		_grpScripts.append(new GrpScript(*grpScript));
 	}
 }
@@ -145,6 +146,72 @@
 	setOpen(false);
 }
 
+void Section1File::initEmpty()
+{
+	clear();
+
+	_author = "makou";
+	_scale = 512;
+	_version = 0x0502;
+
+	_texts.append(FF7Text(QObject::tr("Map name"), false));
+	_texts.append(FF7Text(QObject::tr("Hello world!"), false));
+
+	QList<Script *> scripts;
+	QList<Opcode *> opcodes;
+
+	opcodes.append(new OpcodeMPNAM(0));
+	opcodes.append(new OpcodeRET());
+	scripts.append(new Script(opcodes));
+
+	QSize s = TextPreview::calcSize(_texts.at(1).data());
+
+	opcodes.clear();
+	opcodes.append(new OpcodeWINDOW(0, 0, 0, s.width(), s.height()));
+	opcodes.append(new OpcodeMESSAGE(quint8(0), quint8(1)));
+	opcodes.append(new OpcodeRET());
+	scripts.append(new Script(opcodes));
+
+	opcodes.clear();
+	opcodes.append(new OpcodeRET());
+	scripts.append(new Script(opcodes));
+
+	_grpScripts.append(new GrpScript("dic", scripts));
+
+	QMap<quint8, QString> chars;
+	chars.insert(0, "cloud");
+	chars.insert(2, "tifa");
+	chars.insert(8, "cid");
+
+	QMapIterator<quint8, QString> it(chars);
+	quint8 modelID = 0;
+
+	while (it.hasNext()) {
+		it.next();
+
+		scripts.clear();
+
+		opcodes.clear();
+		opcodes.append(new OpcodeCHAR(modelID));
+		opcodes.append(new OpcodePC(it.key()));
+		opcodes.append(new OpcodeRET());
+		scripts.append(new Script(opcodes));
+
+		opcodes.clear();
+		opcodes.append(new OpcodeRET());
+		scripts.append(new Script(opcodes));
+
+		opcodes.clear();
+		opcodes.append(new OpcodeRET());
+		scripts.append(new Script(opcodes));
+
+		_grpScripts.append(new GrpScript(it.value(), scripts));
+
+		modelID += 1;
+	}
+
+}
+
 bool Section1File::open()
 {
 	return open(field()->sectionData(Field::Scripts));
@@ -157,14 +224,16 @@
 	const char *constData = data.constData();
 	bool isDemo;
 
-	if(dataSize < 32)	return false;
+	if (dataSize < 32)	return false;
 
 	memcpy(&version, constData, 2);
 
+	_version = version;
+
 	isDemo = version == 0x0301; // Check version format
 
 	memcpy(&posTexts, constData + 4, 2); // posTexts (and end of scripts)
-	if((quint32)dataSize < posTexts || posTexts < 32)	return false;
+	if ((quint32)dataSize < posTexts || posTexts < 32)	return false;
 
 	clear();
 
@@ -177,7 +246,7 @@
 	//this->nbObjets3D = (quint8)data.at(3);
 	memcpy(&nbAKAO, constData + 6, 2); // nbAKAO
 
-	if(isDemo) {
+	if (isDemo) {
 		_scale = 0; // FIXME: better value?
 		cur = 8;
 	} else {
@@ -190,14 +259,38 @@
 
 	posScripts = cur + 8*nbScripts + 4*nbAKAO;
 
-	if(posTexts < posScripts+64*nbScripts)	return false;
+	if (posTexts < posScripts+64*nbScripts)	return false;
 
 	quint16 positions[33];
 	const int scriptCount = isDemo ? 16 : 32;
 
-	for(quint8 i=0 ; i<nbScripts ; ++i) {
+	if (nbAKAO > 0) {
+		//INTERGRITY TEST
+		//		QString out;
+		//		bool pasok = false;
+		//		for (int i=0; i<nbAKAO; ++i) {
+		//			memcpy(&posAKAO, &constData[cur+8*nbScripts+i*4], 4);
+		//			out.append(QString("%1 %2 %3 (%4)\n").arg(i).arg(posAKAO).arg(QString(data.mid(posAKAO, 4))).arg(QString(data.mid(posAKAO-4, 8).toHex())));
+		//			if (data.mid(posAKAO, 4) != "AKAO" && data.at(posAKAO) != '\x12') {
+		//				pasok = true;
+		//			}
+		//		}
+		//		if (pasok) {
+		//			qDebug() << out;
+		//		}
+
+		memcpy(&posAKAO, constData + cur + 8*nbScripts, 4); // posAKAO
+	} else {
+		posAKAO = dataSize;
+	}
+
+	// On the Android version, posTexts can be after posAKAO
+	quint32 posAfterScripts = qMin(posAKAO, quint32(posTexts));
+
+	for (quint8 i=0; i<nbScripts; ++i) {
 		GrpScript *grpScript = new GrpScript(QString(data.mid(cur + 8*i, 8)));
-		if(emptyGrps > 1) {
+
+		if (emptyGrps > 1) {
 			emptyGrps--;
 		} else {
 
@@ -205,21 +298,21 @@
 			memcpy(positions, constData + posScripts + scriptCount * 2 * i, scriptCount * 2);
 
 			// Add offset at the end
-			if(i == nbScripts - 1) {
-				positions[scriptCount] = posTexts;
+			if (i == nbScripts - 1) {
+				positions[scriptCount] = posAfterScripts;
 			} else {
 				memcpy(&pos, constData + posScripts + scriptCount * 2 * (i + 1), 2);
 
-				if(pos > positions[scriptCount - 1]) {
+				if (pos > positions[scriptCount - 1]) {
 					positions[scriptCount] = pos;
 				} else {
 					emptyGrps = 1;
-					while(pos <= positions[scriptCount - 1] && i+emptyGrps<nbScripts-1) {
+					while (pos <= positions[scriptCount - 1] && i+emptyGrps<nbScripts-1) {
 						memcpy(&pos, constData + posScripts + scriptCount * 2 * (i + emptyGrps + 1), 2);
 						emptyGrps++;
 					}
-					if(i + emptyGrps == nbScripts) {
-						positions[scriptCount] = posTexts;
+					if (i + emptyGrps == nbScripts) {
+						positions[scriptCount] = posAfterScripts;
 					} else {
 						positions[scriptCount] = pos;
 					}
@@ -227,11 +320,11 @@
 			}
 
 			quint8 scriptID = 0;
-			for(quint8 j=0 ; j<scriptCount ; ++j) {
-				if(positions[j+1] > positions[j]) {
+			for (quint8 j=0; j<scriptCount; ++j) {
+				if (positions[j+1] > positions[j]) {
 					if (scriptID == 0) {
 						Script *script0 = new Script(data, positions[j], positions[j+1]-positions[j]);
-						if(!script0->isValid()) {
+						if (!script0->isValid()) {
 							delete script0;
 							return false;
 						}
@@ -247,46 +340,33 @@
 		_grpScripts.append(grpScript);
 	}
 
-	if(nbAKAO>0) {
-		//INTERGRITY TEST
-//		QString out;
-//		bool pasok = false;
-//		for(int i=0 ; i<nbAKAO ; ++i) {
-//			memcpy(&posAKAO, &constData[cur+8*nbScripts+i*4], 4);
-//			out.append(QString("%1 %2 %3 (%4)\n").arg(i).arg(posAKAO).arg(QString(data.mid(posAKAO, 4))).arg(QString(data.mid(posAKAO-4, 8).toHex())));
-//			if(data.mid(posAKAO, 4) != "AKAO" && data.at(posAKAO) != '\x12') {
-//				pasok = true;
-//			}
-//		}
-//		if(pasok) {
-//			qDebug() << out;
-//		}
+	quint32 sizeTextSection;
 
-		memcpy(&posAKAO, constData + cur + 8*nbScripts, 4); // posAKAO
+	/* ---------- TEXTS ---------- */
+	if (posAKAO >= posTexts) {
+		sizeTextSection = posAKAO - posTexts;
 	} else {
-		posAKAO = dataSize;
+		sizeTextSection = dataSize - posTexts;
 	}
 
-	/* ---------- TEXTS ---------- */
-
-	if((posAKAO -= posTexts) > 4) { //If there are texts
+	if (sizeTextSection > 4) { //If there are texts
 		quint16 posDeb, posFin, nbTextes;
-		if(dataSize < posTexts+2)	return false;
+		if (dataSize < posTexts+2)	return false;
 		memcpy(&posDeb, constData + posTexts + 2, 2);
 		nbTextes = posDeb/2 - 1;
 
-		for(quint32 i=1 ; i<nbTextes ; ++i) {
+		for (quint32 i=1; i<nbTextes; ++i) {
 			memcpy(&posFin, constData + posTexts + 2 + i*2, 2);
 
-			if(dataSize < posTexts+posFin)	return false;
+			if (dataSize < posTexts+posFin)	return false;
 
 			// FIXME: possible hidden data between 0xFF and posFin-posDeb
 			_texts.append(FF7Text(data.mid(posTexts+posDeb, posFin-posDeb)));
 			posDeb = posFin;
 		}
-		if((quint32)dataSize < posAKAO)	return false;
+		if ((quint32)dataSize < sizeTextSection)	return false;
 		// FIXME: possible hidden data between 0xFF and posFin-posDeb
-		_texts.append(FF7Text(data.mid(posTexts+posDeb, posAKAO-posDeb)));
+		_texts.append(FF7Text(data.mid(posTexts+posDeb, sizeTextSection-posDeb)));
 	}
 
 	setOpen(true);
@@ -296,46 +376,56 @@
 
 QByteArray Section1File::save() const
 {
-	QByteArray data = field()->sectionData(Field::Scripts);
+	TutFileStandard *tut = field()->tutosAndSounds();
 	QByteArray grpScriptNames, positionsScripts, positionsAKAO, allScripts, realScript, positionsTexts, allTexts, allAKAOs;
-	quint32 posAKAO, posAKAOs, newPosAKAOs;
-	quint16 posTocAKAOs, posTexts, newPosScripts, newPosTexts, newNbAKAO, pos;
-	quint8 nbGrpScripts, newNbGrpScripts;
-	const char *constData = data.constData();
+	quint32 newPosAKAOs, pos32, newPosTexts32;
+	quint16 newPosScripts, newPosTexts, newNbAKAO, pos;
+	quint8 newNbGrpScripts;
 
-	nbGrpScripts = (quint8)data.at(2);//nbGrpScripts
+	//nbGrpScripts = (quint8)data.at(2);//nbGrpScripts
 	newNbGrpScripts = _grpScripts.size();
-	memcpy(&posTexts, constData + 4, 2);//posTexts (and end of the scripts section)
+	//memcpy(&posTexts, constData + 4, 2);//posTexts (and end of the scripts section)
 
-	if(_tut && _tut->isModified()) {
-		newNbAKAO = _tut->size();
-	} else {
-		memcpy(&newNbAKAO, constData + 6, 2);//nbAKAO
-	}
+	newNbAKAO = tut->size(); // 255 maximum
 
 	newPosScripts = 32 + newNbGrpScripts * 72 + newNbAKAO * 4;
-	pos = newPosScripts;
+	pos32 = newPosScripts;
 
 	// Creation newPosScripts + scripts
 	quint8 nbObjets3D = 0;
-	foreach(GrpScript *grpScript, _grpScripts) {
-		grpScriptNames.append( grpScript->realName().leftJustified(8, QChar('\x00'), true) );
-		for(quint8 j=0 ; j<32 ; ++j) {
+	for (GrpScript *grpScript : _grpScripts) {
+		grpScriptNames.append( grpScript->realName().toLatin1().leftJustified(8, '\x00', true) );
+		for (quint8 j=0; j<32; ++j) {
 			realScript = grpScript->toByteArray(j);
-			if(!realScript.isEmpty())	pos = newPosScripts + allScripts.size();
+			if (!realScript.isEmpty())	pos32 = newPosScripts + allScripts.size();
+			if (pos32 > 65535) {
+				qWarning() << "Section1File::save script size overflow";
+				return QByteArray();
+			}
+			pos = quint16(pos32);
 			positionsScripts.append((char *)&pos, 2);
 			allScripts.append(realScript);
 		}
-		if(grpScript->typeID() == GrpScript::Model)		++nbObjets3D;
+		if (grpScript->typeID() == GrpScript::Model)		++nbObjets3D;
 	}
 
 	// Creation new positions Texts
-	newPosTexts = newPosScripts + allScripts.size();
+	newPosTexts32 = newPosScripts + allScripts.size();
+	if (newPosTexts32 > 65535) {
+		qWarning() << "Section1File::save script size overflow";
+		return QByteArray();
+	}
+	newPosTexts = quint16(newPosTexts32);
 
 	quint16 newNbText = textCount();
 
-	foreach(const FF7Text &text, texts()) {
-		pos = 2 + newNbText*2 + allTexts.size();
+	for (const FF7Text &text : texts()) {
+		pos32 = 2 + newNbText*2 + allTexts.size();
+		if (pos32 > 65535) {
+			qWarning() << "Section1File::save script + text size overflow";
+			return QByteArray();
+		}
+		pos = quint16(pos32);
 		positionsTexts.append((char *)&pos, 2);
 		allTexts.append(text.data());
 		allTexts.append('\xff');// end of text
@@ -343,62 +433,50 @@
 
 	// Word padding
 	int scriptsAndTextsSize = allScripts.size() + 2 + positionsTexts.size() + allTexts.size();
-	if(scriptsAndTextsSize % 4 != 0) {
+	if (scriptsAndTextsSize % 4 != 0) {
 		allTexts.append(QByteArray(4 - scriptsAndTextsSize % 4, '\0'));
 	}
 
 	newPosAKAOs = newPosTexts + (2 + newNbText*2 + allTexts.size());
 
-	if(_tut && _tut->isModified()) {
-		allAKAOs = _tut->save(positionsAKAO, newPosAKAOs);
-	} else if(newNbAKAO > 0) {
-		posTocAKAOs = 32 + nbGrpScripts*8;
-		memcpy(&posAKAOs, constData + posTocAKAOs, 4);
-		qint32 diff = newPosAKAOs - posAKAOs;
-
-		// Creation new positions AKAO
-		for(quint32 i=0 ; i<newNbAKAO ; ++i) {
-			memcpy(&posAKAO, constData + posTocAKAOs + i*4, 4);
-			posAKAO += diff;
-			positionsAKAO.append((char *)&posAKAO, 4);
-		}
-
-		allAKAOs = data.mid(posAKAOs);
-	}
-
-	QByteArray mapauthor = _author.toLatin1().leftJustified(8, '\x00', true);
-	mapauthor[7] = '\x00';
-
-	return data.left(2) // Header
-			.append((char)newNbGrpScripts) // nbGrpScripts
-			.append((char)nbObjets3D) // nb3DObjects
-			.append((char *)&newPosTexts, 2) // PosTexts
-			.append((char *)&newNbAKAO, 2) // AKAO count
-			.append((char *)&_scale, 2)
-			.append(constData + 10, 6) // Empty
-			.append(mapauthor) // mapAuthor
-			.append(constData + 24, 8) // mapName
-			.append(grpScriptNames) // Names of grpScripts
-			.append(positionsAKAO) // PosAKAO
-			.append(positionsScripts) // PosScripts
-			.append(allScripts) // Scripts
-			.append((char *)&newNbText, 2) // nbTexts
-			.append(positionsTexts) // positionsTexts
-			.append(allTexts) // Texts
-			.append(allAKAOs); // AKAO / tutos
+	allAKAOs = tut->save(positionsAKAO, newPosAKAOs);
+
+	QByteArray mapauthor = _author.toLatin1().leftJustified(8, '\0', true);
+	mapauthor[7] = '\0';
+	QByteArray mapname = field()->name().toLatin1().leftJustified(8, '\0', true);
+	mapname[7] = '\0';
+
+	return QByteArray()
+	    .append((char *)&_version, 2) // Version
+	    .append((char)newNbGrpScripts) // nbGrpScripts
+	    .append((char)nbObjets3D) // nb3DObjects
+	    .append((char *)&newPosTexts, 2) // PosTexts
+	    .append((char *)&newNbAKAO, 2) // AKAO count
+	    .append((char *)&_scale, 2)
+	    .append(_empty.leftJustified(6, '\0', true)) // Empty
+	    .append(mapauthor) // mapAuthor
+	    .append(mapname) // mapName
+	    .append(grpScriptNames) // Names of grpScripts
+	    .append(positionsAKAO) // PosAKAO
+	    .append(positionsScripts) // PosScripts
+	    .append(allScripts) // Scripts
+	    .append((char *)&newNbText, 2) // nbTexts
+	    .append(positionsTexts) // positionsTexts
+	    .append(allTexts) // Texts
+	    .append(allAKAOs); // AKAO / tutos
 }
 
 bool Section1File::exporter(QIODevice *device, ExportFormat format)
 {
 	bool jp = Config::value("jp_txt", false).toBool();
 
-	switch(format) {
+	switch (format) {
 	case TXTText: {
-		if(!device->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+		if (!device->open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
 			return false;
 		}
 		int i=0;
-		foreach(const FF7Text &text, texts()) {
+		for (const FF7Text &text : texts()) {
 			device->write(QString("---TEXT%1---\n%2\n")
 						  .arg(i++, 3, 10, QChar('0'))
 						  .arg(text.text(jp))
@@ -408,7 +486,7 @@
 		return true;
 	}
 	case XMLText: {
-		if(!device->open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+		if (!device->open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 			return false;
 		}
 		QXmlStreamWriter stream(device);
@@ -419,7 +497,7 @@
 		stream.writeAttribute("name", field()->name());
 		stream.writeStartElement("texts");
 		int id=0;
-		foreach(const FF7Text &text, texts()) {
+		for (const FF7Text &text : texts()) {
 			stream.writeStartElement("text");
 			stream.writeAttribute("id", QString::number(id));
 			stream.writeCharacters(text.text(jp));
@@ -447,17 +525,17 @@
 
 	QXmlStreamReader stream(device);
 
-	while(!stream.atEnd()) {
+	while (!stream.atEnd()) {
 		QXmlStreamReader::TokenType type = stream.readNext();
-		if(!start && type == QXmlStreamReader::StartDocument) {
+		if (!start && type == QXmlStreamReader::StartDocument) {
 			start = true;
-		} else if(start && !field && type == QXmlStreamReader::StartElement
+		} else if (start && !field && type == QXmlStreamReader::StartElement
 				  && stream.name() == "field") {
 			field = true;
-		} else if(field && !texts && type == QXmlStreamReader::StartElement
+		} else if (field && !texts && type == QXmlStreamReader::StartElement
 				  && stream.name() == "texts") {
 			texts = true;
-		} else if(texts && type == QXmlStreamReader::StartElement
+		} else if (texts && type == QXmlStreamReader::StartElement
 				  && stream.name() == "text") {
 //			stream.attributes().value("id");
 		}
@@ -468,18 +546,19 @@
 
 bool Section1File::isModified() const
 {
-	return FieldPart::isModified() || (_tut && _tut->isModified());
+	TutFileStandard *tut = field()->tutosAndSounds();
+	return FieldPart::isModified() || (tut && tut->isModified());
 }
 
 int Section1File::modelID(quint8 grpScriptID) const
 {
-	if(_grpScripts.at(grpScriptID)->typeID() != GrpScript::Model)	return -1;
+	if (_grpScripts.at(grpScriptID)->typeID() != GrpScript::Model)	return -1;
 
 	int ID=0;
 
-	for(int i=0 ; i<grpScriptID ; ++i)
+	for (int i=0; i<grpScriptID; ++i)
 	{
-		if(_grpScripts.at(i)->typeID()==GrpScript::Model)
+		if (_grpScripts.at(i)->typeID()==GrpScript::Model)
 			++ID;
 	}
 	return ID;
@@ -487,9 +566,9 @@
 
 void Section1File::bgParamAndBgMove(QHash<quint8, quint8> &paramActifs, qint16 *z, qint16 *x, qint16 *y) const
 {
-	foreach(GrpScript *grpScript, _grpScripts) {
+	for (GrpScript *grpScript : _grpScripts) {
 		grpScript->backgroundParams(paramActifs);
-		if(z)	grpScript->backgroundMove(z, x, y);
+		if (z)	grpScript->backgroundMove(z, x, y);
 	}
 }
 
@@ -515,9 +594,9 @@
 
 bool Section1File::insertGrpScript(int row, GrpScript *grpScript)
 {
-	if(grpScriptCount() < maxGrpScriptCount()) {
+	if (grpScriptCount() < maxGrpScriptCount()) {
 		_grpScripts.insert(row, grpScript);
-		foreach(GrpScript *grpScript, _grpScripts)
+		for (GrpScript *grpScript : qAsConst(_grpScripts))
 			grpScript->shiftGroupIds(row-1, +1);
 		setModified(true);
 		return true;
@@ -527,9 +606,9 @@
 
 void Section1File::deleteGrpScript(int row)
 {
-	if(row < _grpScripts.size()) {
+	if (row < _grpScripts.size()) {
 		delete _grpScripts.takeAt(row);
-		foreach(GrpScript *grpScript, _grpScripts)
+		for (GrpScript *grpScript : qAsConst(_grpScripts))
 			grpScript->shiftGroupIds(row, -1);
 		setModified(true);
 	}
@@ -537,9 +616,9 @@
 
 void Section1File::removeGrpScript(int row)
 {
-	if(row < _grpScripts.size()) {
+	if (row < _grpScripts.size()) {
 		_grpScripts.removeAt(row);
-		foreach(GrpScript *grpScript, _grpScripts)
+		for (GrpScript *grpScript : qAsConst(_grpScripts))
 			grpScript->shiftGroupIds(row, -1);
 		setModified(true);
 	}
@@ -547,21 +626,21 @@
 
 bool Section1File::moveGrpScript(int row, bool direction)
 {
-	if(row >= _grpScripts.size())	return false;
+	if (row >= _grpScripts.size())	return false;
 
-	if(direction) { // down
-		if(row == _grpScripts.size()-1) {
+	if (direction) { // down
+		if (row == _grpScripts.size()-1) {
 			return false;
 		}
 		_grpScripts.swap(row, row+1);
-		foreach(GrpScript *grpScript, _grpScripts)
+		for (GrpScript *grpScript : qAsConst(_grpScripts))
 			grpScript->swapGroupIds(row, row+1);
 	} else { // up
-		if(row == 0) {
+		if (row == 0) {
 			return false;
 		}
 		_grpScripts.swap(row, row-1);
-		foreach(GrpScript *grpScript, _grpScripts)
+		for (GrpScript *grpScript : qAsConst(_grpScripts))
 			grpScript->swapGroupIds(row, row-1);
 	}
 	setModified(true);
@@ -571,17 +650,17 @@
 
 void Section1File::searchAllVars(QList<FF7Var> &vars) const
 {
-	foreach(GrpScript *group, _grpScripts)
+	for (GrpScript *group : _grpScripts)
 		group->searchAllVars(vars);
 }
 
 bool Section1File::searchOpcode(int opcode, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID < 0)
+	if (groupID < 0)
 		groupID = scriptID = opcodeID = 0;
-	if(groupID >= _grpScripts.size())
+	if (groupID >= _grpScripts.size())
 		return false;
-	if(_grpScripts.at(groupID)->searchOpcode(opcode, scriptID, opcodeID))
+	if (_grpScripts.at(groupID)->searchOpcode(opcode, scriptID, opcodeID))
 		return true;
 
 	return searchOpcode(opcode, ++groupID, scriptID = 0, opcodeID = 0);
@@ -589,11 +668,11 @@
 
 bool Section1File::searchVar(quint8 bank, quint16 address, Opcode::Operation op, int value, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID < 0)
+	if (groupID < 0)
 		groupID = scriptID = opcodeID = 0;
-	if(groupID >= _grpScripts.size())
+	if (groupID >= _grpScripts.size())
 		return false;
-	if(_grpScripts.at(groupID)->searchVar(bank, address, op, value, scriptID, opcodeID))
+	if (_grpScripts.at(groupID)->searchVar(bank, address, op, value, scriptID, opcodeID))
 		return true;
 
 	return searchVar(bank, address, op, value, ++groupID, scriptID = 0, opcodeID = 0);
@@ -601,11 +680,11 @@
 
 bool Section1File::searchExec(quint8 group, quint8 script, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID < 0)
+	if (groupID < 0)
 		groupID = scriptID = opcodeID = 0;
-	if(groupID >= _grpScripts.size())
+	if (groupID >= _grpScripts.size())
 		return false;
-	if(_grpScripts.at(groupID)->searchExec(group, script, scriptID, opcodeID))
+	if (_grpScripts.at(groupID)->searchExec(group, script, scriptID, opcodeID))
 		return true;
 
 	return searchExec(group, script, ++groupID, scriptID = 0, opcodeID = 0);
@@ -613,11 +692,11 @@
 
 bool Section1File::searchMapJump(quint16 field, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID < 0)
+	if (groupID < 0)
 		groupID = scriptID = opcodeID = 0;
-	if(groupID >= _grpScripts.size())
+	if (groupID >= _grpScripts.size())
 		return false;
-	if(_grpScripts.at(groupID)->searchMapJump(field, scriptID, opcodeID))
+	if (_grpScripts.at(groupID)->searchMapJump(field, scriptID, opcodeID))
 		return true;
 
 	return searchMapJump(field, ++groupID, scriptID = 0, opcodeID = 0);
@@ -625,12 +704,12 @@
 
 bool Section1File::searchTextInScripts(const QRegExp &text, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID < 0)
+	if (groupID < 0)
 		groupID = scriptID = opcodeID = 0;
-	if(groupID >= _grpScripts.size())
+	if (groupID >= _grpScripts.size())
 		return false;
 
-	if(_grpScripts.at(groupID)->searchTextInScripts(text, scriptID, opcodeID, this))
+	if (_grpScripts.at(groupID)->searchTextInScripts(text, scriptID, opcodeID, this))
 		return true;
 
 	return searchTextInScripts(text, ++groupID, scriptID = 0, opcodeID = 0);
@@ -638,11 +717,11 @@
 
 bool Section1File::searchText(const QRegExp &text, int &textID, int &from, int &size) const
 {
-	if(textID < 0)
+	if (textID < 0)
 		textID = 0;
-	if(textID >= textCount())
+	if (textID >= textCount())
 		return false;
-	if((from = this->text(textID).indexOf(text, from, size)) != -1)
+	if ((from = this->text(textID).indexOf(text, from, size)) != -1)
 		return true;
 
 	return searchText(text, ++textID, from = 0, size);
@@ -650,13 +729,13 @@
 
 bool Section1File::searchOpcodeP(int opcode, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID >= _grpScripts.size()) {
+	if (groupID >= _grpScripts.size()) {
 		groupID = _grpScripts.size()-1;
 		scriptID = opcodeID = 2147483647;
 	}
-	if(groupID < 0)
+	if (groupID < 0)
 		return false;
-	if(_grpScripts.at(groupID)->searchOpcodeP(opcode, scriptID, opcodeID))
+	if (_grpScripts.at(groupID)->searchOpcodeP(opcode, scriptID, opcodeID))
 		return true;
 
 	return searchOpcodeP(opcode, --groupID, scriptID = 2147483647, opcodeID = 2147483647);
@@ -664,13 +743,13 @@
 
 bool Section1File::searchVarP(quint8 bank, quint16 address, Opcode::Operation op, int value, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID >= _grpScripts.size()) {
+	if (groupID >= _grpScripts.size()) {
 		groupID = _grpScripts.size()-1;
 		scriptID = opcodeID = 2147483647;
 	}
-	if(groupID < 0)
+	if (groupID < 0)
 		return false;
-	if(_grpScripts.at(groupID)->searchVarP(bank, address, op, value, scriptID, opcodeID))
+	if (_grpScripts.at(groupID)->searchVarP(bank, address, op, value, scriptID, opcodeID))
 		return true;
 
 	return searchVarP(bank, address, op, value, --groupID, scriptID = 2147483647, opcodeID = 2147483647);
@@ -678,13 +757,13 @@
 
 bool Section1File::searchExecP(quint8 group, quint8 script, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID >= _grpScripts.size()) {
+	if (groupID >= _grpScripts.size()) {
 		groupID = _grpScripts.size()-1;
 		scriptID = opcodeID = 2147483647;
 	}
-	if(groupID < 0)
+	if (groupID < 0)
 		return false;
-	if(_grpScripts.at(groupID)->searchExecP(group, script, scriptID, opcodeID))
+	if (_grpScripts.at(groupID)->searchExecP(group, script, scriptID, opcodeID))
 		return true;
 
 	return searchExecP(group, script, --groupID, scriptID = 2147483647, opcodeID = 2147483647);
@@ -692,13 +771,13 @@
 
 bool Section1File::searchMapJumpP(quint16 field, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID >= _grpScripts.size()) {
+	if (groupID >= _grpScripts.size()) {
 		groupID = _grpScripts.size()-1;
 		scriptID = opcodeID = 2147483647;
 	}
-	if(groupID < 0)
+	if (groupID < 0)
 		return false;
-	if(_grpScripts.at(groupID)->searchMapJumpP(field, scriptID, opcodeID))
+	if (_grpScripts.at(groupID)->searchMapJumpP(field, scriptID, opcodeID))
 		return true;
 
 	return searchMapJumpP(field, --groupID, scriptID = 2147483647, opcodeID = 2147483647);
@@ -706,13 +785,13 @@
 
 bool Section1File::searchTextInScriptsP(const QRegExp &text, int &groupID, int &scriptID, int &opcodeID) const
 {
-	if(groupID >= _grpScripts.size()) {
+	if (groupID >= _grpScripts.size()) {
 		groupID = _grpScripts.size()-1;
 		scriptID = opcodeID = 2147483647;
 	}
-	if(groupID < 0)
+	if (groupID < 0)
 		return false;
-	if(_grpScripts.at(groupID)->searchTextInScriptsP(text, scriptID, opcodeID, this))
+	if (_grpScripts.at(groupID)->searchTextInScriptsP(text, scriptID, opcodeID, this))
 		return true;
 
 	return searchTextInScriptsP(text, --groupID, scriptID = 2147483647, opcodeID = 2147483647);
@@ -720,13 +799,13 @@
 
 bool Section1File::searchTextP(const QRegExp &text, int &textID, int &from, int &index, int &size) const
 {
-	if(textID >= textCount()) {
+	if (textID >= textCount()) {
 		textID = textCount()-1;
 		from = -1;
 	}
-	if(textID < 0)
+	if (textID < 0)
 		return false;
-	if((index = this->text(textID).lastIndexOf(text, from, size)) != -1)
+	if ((index = this->text(textID).lastIndexOf(text, from, size)) != -1)
 		return true;
 
 	return searchTextP(text, --textID, from = -1, index, size);
@@ -738,7 +817,7 @@
 	FF7Text beforeT = text(textID);
 	QString before = beforeT.text(jp);
 
-	if(search.indexIn(before, from) == from) {
+	if (search.indexIn(before, from) == from) {
 		before.replace(from, search.matchedLength(), after);
 		setText(textID, FF7Text(before, jp));
 		return true;
@@ -748,7 +827,7 @@
 
 void Section1File::setWindow(const FF7Window &win)
 {
-	if(win.groupID < _grpScripts.size()) {
+	if (win.groupID < _grpScripts.size()) {
 		_grpScripts.at(win.groupID)->setWindow(win);
 		setModified(true);
 	}
@@ -757,19 +836,28 @@
 void Section1File::listWindows(QMultiMap<quint64, FF7Window> &windows, QMultiMap<quint8, quint64> &text2win) const
 {
 	int groupID=0;
-	foreach(GrpScript *group, _grpScripts)
+	for (GrpScript *group : _grpScripts) {
 		group->listWindows(groupID++, windows, text2win);
+	}
+}
+
+void Section1File::listWindows(int textID, QList<FF7Window> &windows) const
+{
+	int groupID=0;
+	for (GrpScript *group : _grpScripts) {
+		group->listWindows(groupID++, textID, windows);
+	}
 }
 
 void Section1File::listModelPositions(QMultiMap<int, FF7Position> &positions) const
 {
 	int modelId=0;
-	foreach(GrpScript *group, _grpScripts) {
-		if(group->typeID() == GrpScript::Model) {
+	for (GrpScript *group : _grpScripts) {
+		if (group->typeID() == GrpScript::Model) {
 			QList<FF7Position> pos;
 			group->listModelPositions(pos);
-			if(!pos.isEmpty()) {
-				foreach(const FF7Position &position, pos) {
+			if (!pos.isEmpty()) {
+				for (const FF7Position &position : qAsConst(pos)) {
 					positions.insert(modelId, position);
 				}
 			}
@@ -781,8 +869,8 @@
 int Section1File::modelCount() const
 {
 	int modelId = 0;
-	foreach(GrpScript *group, grpScripts()) {
-		if(group->typeID() == GrpScript::Model) {
+	for (GrpScript *group : grpScripts()) {
+		if (group->typeID() == GrpScript::Model) {
 			modelId++;
 		}
 	}
@@ -793,10 +881,10 @@
 void Section1File::linePosition(QMap<int, FF7Position *> &positions) const
 {
 	int groupID=0;
-	foreach(GrpScript *group, _grpScripts) {
-		if(group->typeID() == GrpScript::Location) {
+	for (GrpScript *group : _grpScripts) {
+		if (group->typeID() == GrpScript::Location) {
 			FF7Position *position = new FF7Position[2];
-			if(group->linePosition(position)) {
+			if (group->linePosition(position)) {
 				positions.insert(groupID, position);
 			}
 		}
@@ -807,8 +895,8 @@
 bool Section1File::compileScripts(int &groupID, int &scriptID, int &opcodeID, QString &errorStr)
 {
 	groupID=0;
-	foreach(GrpScript *group, _grpScripts) {
-		if(!group->compile(scriptID, opcodeID, errorStr)) {
+	for (GrpScript *group : qAsConst(_grpScripts)) {
+		if (!group->compile(scriptID, opcodeID, errorStr)) {
 			return false;
 		}
 		++groupID;
@@ -819,8 +907,8 @@
 
 void Section1File::removeTexts()
 {
-	foreach(GrpScript *group, _grpScripts) {
-		if(group->removeTexts()) {
+	for (GrpScript *group : qAsConst(_grpScripts)) {
+		if (group->removeTexts()) {
 			setModified(true);
 		}
 	}
@@ -830,48 +918,75 @@
 {
 	QSet<quint8> usedTexts = listUsedTexts();
 
-	for(int textID=0 ; textID<_texts.size() ; ++textID) {
-		if(!usedTexts.contains(textID)) {
+	for (int textID=0; textID<_texts.size(); ++textID) {
+		if (!usedTexts.contains(textID)) {
 			_texts[textID] = FF7Text();
 			setModified(true);
 		}
 	}
 }
 
+void Section1File::autosizeTextWindows()
+{
+	for (quint8 textID : listUsedTexts()) {
+		if (textID < 0 || textID >= _texts.size()) {
+			continue;
+		}
+		QList<FF7Window> windows;
+		listWindows(textID, windows);
+		QSize size = TextPreview::calcSize(text(textID).data());
+		for (int i = 0; i < windows.size(); ++i) {
+			bool isModified;
+			FF7Window &win = windows[i];
+			isModified = win.w != size.width() || win.h != size.height();
+			win.w = size.width();
+			win.h = size.height();
+			QPoint pos = TextPreview::realPos(win);
+			isModified = isModified || win.x != pos.x() || win.y != pos.y();
+			win.x = pos.x();
+			win.y = pos.y();
+
+			if (isModified) {
+				setModified(true);
+			}
+		}
+	}
+}
+
 //void Section1File::searchWindows() const
 //{
 //	int groupID=0;
-//	foreach(GrpScript *group, _grpScripts) {
+//	for (GrpScript *group : _grpScripts) {
 //		const QList<Script *> &scripts = group->scripts();
-//		if(!scripts.isEmpty()) {
+//		if (!scripts.isEmpty()) {
 //			scripts.at(0)->searchWindows();
-//			if(scripts.size() > 0) {
+//			if (scripts.size() > 0) {
 //				scripts.at(1)->searchWindows();
 
-//				if(group->typeID() == GrpScript::Model) {
-//					if(scripts.size() > 1) {
+//				if (group->typeID() == GrpScript::Model) {
+//					if (scripts.size() > 1) {
 //						scripts.at(2)->searchWindows(); // talk
 //					}
-//					if(scripts.size() > 2) {
+//					if (scripts.size() > 2) {
 //						scripts.at(3)->searchWindows(); // touch
 //					}
-//				} else if(group->typeID() == GrpScript::Location) {
-//					if(scripts.size() > 1) {
+//				} else if (group->typeID() == GrpScript::Location) {
+//					if (scripts.size() > 1) {
 //						scripts.at(2)->searchWindows(); // talk
 //					}
-//					if(scripts.size() > 2) {
+//					if (scripts.size() > 2) {
 //						scripts.at(3)->searchWindows(); // touch
 //					}
-//					if(scripts.size() > 3) {
+//					if (scripts.size() > 3) {
 //						scripts.at(4)->searchWindows(); // move
 //					}
-//					if(scripts.size() > 4) {
+//					if (scripts.size() > 4) {
 //						scripts.at(5)->searchWindows(); // go
 //					}
-//					if(scripts.size() > 5) {
+//					if (scripts.size() > 5) {
 //						scripts.at(6)->searchWindows(); // go1
 //					}
-//					if(scripts.size() > 6) {
+//					if (scripts.size() > 6) {
 //						scripts.at(7)->searchWindows(); // leave
 //					}
 //				}
@@ -899,7 +1014,7 @@
 
 void Section1File::setText(int textID, const FF7Text &text)
 {
-	if(textID >=0 && textID < _texts.size()) {
+	if (textID >=0 && textID < _texts.size()) {
 		_texts.replace(textID, text);
 		setModified(true);
 	}
@@ -907,9 +1022,9 @@
 
 bool Section1File::insertText(int textID, const FF7Text &text)
 {
-	if(textCount() < maxTextCount()) {
+	if (textCount() < maxTextCount()) {
 		_texts.insert(textID, text);
-		foreach(GrpScript *grpScript, _grpScripts)
+		for (GrpScript *grpScript : qAsConst(_grpScripts))
 			grpScript->shiftTextIds(textID-1, +1);
 		setModified(true);
 		return true;
@@ -919,9 +1034,9 @@
 
 void Section1File::deleteText(int textID)
 {
-	if(textID >=0 && textID < _texts.size()) {
+	if (textID >=0 && textID < _texts.size()) {
 		_texts.removeAt(textID);
-		foreach(GrpScript *grpScript, _grpScripts)
+		for (GrpScript *grpScript : qAsConst(_grpScripts))
 			grpScript->shiftTextIds(textID, -1);
 		setModified(true);
 	}
@@ -929,7 +1044,7 @@
 
 void Section1File::clearTexts()
 {
-	if(!_texts.isEmpty()) {
+	if (!_texts.isEmpty()) {
 		_texts.clear();
 		setModified(true);
 	}
@@ -938,14 +1053,14 @@
 QSet<quint8> Section1File::listUsedTexts() const
 {
 	QSet<quint8> usedTexts;
-	foreach(GrpScript *grpScript, _grpScripts)
+	for (GrpScript *grpScript : _grpScripts)
 		grpScript->listUsedTexts(usedTexts);
 	return usedTexts;
 }
 
 void Section1File::shiftTutIds(int row, int shift)
 {
-	foreach(GrpScript *grpScript, _grpScripts)
+	for (GrpScript *grpScript : qAsConst(_grpScripts))
 		grpScript->shiftTutIds(row, shift);
 	setModified(true);
 }
@@ -953,7 +1068,7 @@
 QSet<quint8> Section1File::listUsedTuts() const
 {
 	QSet<quint8> usedTuts;
-	foreach(GrpScript *grpScript, _grpScripts)
+	for (GrpScript *grpScript : _grpScripts)
 		grpScript->listUsedTuts(usedTuts);
 	return usedTuts;
 }
@@ -980,18 +1095,9 @@
 	setModified(true);
 }
 
-TutFileStandard *Section1File::tut() const
-{
-	return _tut;
-}
-
-void Section1File::setTut(TutFileStandard *tut)
-{
-	_tut = tut;
-}
-
 int Section1File::availableBytesForScripts() const
 {
-	int AKAOCount = _tut && _tut->isOpen() ? _tut->size() : 0; // TODO: opens tut
+	TutFileStandard *tut = field()->tutosAndSounds();
+	int AKAOCount = tut && tut->isOpen() ? tut->size() : 0; // TODO: opens tut
 	return 65535 - (32 + grpScriptCount() * 72 + AKAOCount * 4);
 }
diff -Nru makoureactor-1.7.2/core/field/Section1File.h makoureactor-1.8.0/core/field/Section1File.h
--- makoureactor-1.7.2/core/field/Section1File.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/Section1File.h	2020-08-08 18:46:56.000000000 +0000
@@ -36,13 +36,13 @@
 	GrpScript * const &previous();
 
 	/* There is no hasNextScript() function
-	 * nextScript() can return NULL
+	 * nextScript() can return nullptr
 	 */
 	Script *nextScript();
 	Script *previousScript();
 
 	/* There is no hasNextOpcode() function
-	 * nextOpcode() can return NULL
+	 * nextOpcode() can return nullptr
 	 */
 	Opcode *nextOpcode();
 	Opcode *previousOpcode();
@@ -61,6 +61,7 @@
 	Section1File(const Section1File &other);
 	virtual ~Section1File();
 	void clear();
+	void initEmpty();
 	bool open();
 	bool open(const QByteArray &data);
 	QByteArray save() const;
@@ -74,7 +75,7 @@
 	const QList<GrpScript *> &grpScripts() const;
 	GrpScript *grpScript(int groupID) const;
 	int grpScriptCount() const;
-	inline static int maxGrpScriptCount() { return 255; }
+	inline static int maxGrpScriptCount() { return 256; }
 	bool insertGrpScript(int row);
 	bool insertGrpScript(int row, GrpScript *grpScript);
 	void deleteGrpScript(int row);
@@ -96,6 +97,7 @@
 	bool searchTextP(const QRegExp &text, int &textID, int &from, int &index, int &size) const;
 	void setWindow(const FF7Window &win);
 	void listWindows(QMultiMap<quint64, FF7Window> &windows, QMultiMap<quint8, quint64> &text2win) const;
+	void listWindows(int textID, QList<FF7Window> &windows) const;
 	void listModelPositions(QMultiMap<int, FF7Position> &positions) const;
 	int modelCount() const;
 	void linePosition(QMap<int, FF7Position *> &positions) const;
@@ -104,6 +106,7 @@
 	bool compileScripts(int &groupID, int &scriptID, int &opcodeID, QString &errorStr);
 	void removeTexts();
 	void cleanTexts();
+	void autosizeTextWindows();
 
 	const QList<FF7Text> &texts() const;
 	int textCount() const;
@@ -123,18 +126,16 @@
 	quint16 scale() const;
 	void setScale(quint16 scale);
 
-	TutFileStandard *tut() const;
-	void setTut(TutFileStandard *tut);
-
 	int availableBytesForScripts() const;
 private:
 	QString _author;
 	quint16 _scale;
 	// quint8 nbObjets3D;
+	quint16 _version;
+	QByteArray _empty;
 
 	QList<GrpScript *> _grpScripts;
 	QList<FF7Text> _texts;
-	TutFileStandard *_tut;
 };
 
 #endif // SECTION1FILE_H
diff -Nru makoureactor-1.7.2/core/field/TdbFile.cpp makoureactor-1.8.0/core/field/TdbFile.cpp
--- makoureactor-1.7.2/core/field/TdbFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/TdbFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -25,7 +25,7 @@
 
 bool TdbFile::open(const QByteArray &data)
 {
-	if(data.size() < int(sizeof(TdbHeader))) {
+	if (data.size() < int(sizeof(TdbHeader))) {
 		qWarning() << "invalid tdb size" << data.size() << sizeof(TdbHeader);
 		return false;
 	}
@@ -34,7 +34,7 @@
 
 	memcpy(&header, constData, sizeof(TdbHeader));
 
-	if(header.size != (quint32)data.size()) {
+	if (header.size != (quint32)data.size()) {
 		qWarning() << "invalid tdb size" << header.size << data.size();
 		return false;
 	}
@@ -45,11 +45,11 @@
 
 //	quint8 faceID = 0;
 
-//	for(int pal=0 ; pal<header.paletteCount ; ++pal) {
+//	for (int pal=0; pal<header.paletteCount; ++pal) {
 //		quint32 offsetPalette = header.paletteOffset + pal * 32;
 //		QImage palette(64, 4, QImage::Format_RGB32);
 
-//		for(int i=0 ; i<16 ; ++i) {
+//		for (int i=0; i<16; ++i) {
 //			quint16 color;
 //			memcpy(&color, &constData[offsetPalette + i*2], 2);
 //			palette.setPixel(i*4+0, 0, PsColor::fromPsColor(color));
@@ -77,7 +77,7 @@
 //		palette.save(QString("TdbPal%1.png").arg(pal));
 //	}
 
-//	for(quint8 faceID=0 ; faceID < 0x21 ; ++faceID) {
+//	for (quint8 faceID=0; faceID < 0x21; ++faceID) {
 //		texture(faceID, Eye).save(QString("TdbTexEye%1.png").arg(faceID));
 ////		texture(faceID, MouthClosed).save(QString("TdbTexMouthClosed%1.png").arg(faceID));
 //	}
@@ -87,7 +87,7 @@
 
 QImage TdbFile::texture(quint8 faceID, TextureType type)
 {
-	if(data.isEmpty())	return QImage();
+	if (data.isEmpty())	return QImage();
 
 	const char *constData = data.constData();
 	int imgID = faceIdToImageId(faceID, type);
@@ -100,7 +100,7 @@
 
 	quint32 offsetPalette = header.paletteOffset + pal * 32;
 
-	if(quint32(data.size()) < offsetImage + 512
+	if (quint32(data.size()) < offsetImage + 512
 			|| quint32(data.size()) < offsetPalette + 32) {
 		return QImage();
 	}
@@ -108,7 +108,7 @@
 	QImage img(32, 32, QImage::Format_ARGB32);
 	QRgb *px = (QRgb *)img.bits();
 
-	for(int i=0 ; i<512 ; ++i) {
+	for (int i=0; i<512; ++i) {
 		quint8 index = constData[offsetImage + i];
 		quint16 color;
 		memcpy(&color, constData + offsetPalette + (index & 0x0F)*2, 2);
@@ -123,11 +123,11 @@
 
 int TdbFile::faceIdToImageId(quint8 faceID, TextureType type)
 {
-	if(faceID <= 9) {
-		if(type == Empty)	return 126;
+	if (faceID <= 9) {
+		if (type == Empty)	return 126;
 		return faceID * 8 + (quint8)type;
 	} else {
-		switch(type) {
+		switch (type) {
 		case Eye:
 		case EyeOpened1:case EyeOpened2:
 			return 10 * 8 + (faceID - 10) * 2;
diff -Nru makoureactor-1.7.2/core/field/TutFile.cpp makoureactor-1.8.0/core/field/TutFile.cpp
--- makoureactor-1.7.2/core/field/TutFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/TutFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -36,13 +36,13 @@
 	quint32 dataSize = data.size();
 
 	positions = openPositions(data);
-	if(positions.isEmpty()) {
+	if (positions.isEmpty()) {
 		return false;
 	}
 
 	tutos.clear();
-	for(int i=0 ; i<positions.size()-1 ; ++i) {
-		if(positions.at(i) < dataSize && positions.at(i) < positions.at(i+1)) {
+	for (int i=0; i<positions.size()-1; ++i) {
+		if (positions.at(i) < dataSize && positions.at(i) < positions.at(i+1)) {
 			tutos.append(data.mid(positions.at(i),
 			                      positions.at(i+1) - positions.at(i)));
 		}
@@ -66,7 +66,7 @@
 
 void TutFile::setData(int tutID, const QByteArray &data)
 {
-	if(tutos.at(tutID) != data) {
+	if (tutos.at(tutID) != data) {
 		tutos.replace(tutID, data);
 		setModified(true);
 	}
@@ -74,7 +74,7 @@
 
 bool TutFile::insertData(int tutID, const QByteArray &data)
 {
-	if(size() < maxTutCount()) {
+	if (size() < maxTutCount()) {
 		tutos.insert(tutID, data);
 		setModified(true);
 		return true;
@@ -85,7 +85,7 @@
 bool TutFile::insertData(int tutID, const QString &path)
 {
 	QFile f(path);
-	if(f.open(QIODevice::ReadOnly)) {
+	if (f.open(QIODevice::ReadOnly)) {
 		insertData(tutID, f.readAll());
 		f.close();
 		return true;
@@ -103,22 +103,22 @@
 	bool jp = Config::value("jp_txt", false).toBool();
 	int i=0, size = tuto.size(), endOfText;
 
-	if(warnings) {
+	if (warnings) {
 		*warnings = false;
 	}
 
-	while(i < size) {
+	while (i < size) {
 		quint8 key = tuto.at(i++);
-		switch(key) {
+		switch (key) {
 		case 0x00:
-			if(i + 2 > size) {
+			if (i + 2 > size) {
 				ret.append(parseScriptsUnknownString(key));
 				ret.append("\n");
-				if(i < size) {
+				if (i < size) {
 					ret.append(parseScriptsUnknownString(tuto.at(i)));
 					ret.append("\n");
 				}
-				if(warnings) {
+				if (warnings) {
 					*warnings = true;
 				}
 				return ret;
@@ -145,7 +145,7 @@
 		case 0x10:
 			endOfText = tuto.indexOf('\xff', i);
 
-			if(endOfText != -1) {
+			if (endOfText != -1) {
 				textData = tuto.mid(i, endOfText-i);
 			} else {
 				textData = tuto.mid(i); // FIXME: this can break the bijection
@@ -154,8 +154,8 @@
 			ret.append(QString("TEXT(\"%1\")")
 					   .arg(FF7Text(textData).text(jp).replace('"', "\\\"")));
 
-			if(endOfText != -1) {
-				if(endOfText + 1 > i) {
+			if (endOfText != -1) {
+				if (endOfText + 1 > i) {
 					i = endOfText + 1;
 				}
 			} else {
@@ -165,22 +165,22 @@
 			break;
 		case 0x11:	ret.append("{FINISH}");		break;
 		case 0x12:
-			if(i + 4 > size) {
+			if (i + 4 > size) {
 				ret.append(parseScriptsUnknownString(key));
 				ret.append("\n");
-				if(i < size) {
+				if (i < size) {
 					ret.append(parseScriptsUnknownString(tuto.at(i++)));
 					ret.append("\n");
-					if(i < size) {
+					if (i < size) {
 						ret.append(parseScriptsUnknownString(tuto.at(i++)));
 						ret.append("\n");
-						if(i < size) {
+						if (i < size) {
 							ret.append(parseScriptsUnknownString(tuto.at(i)));
 							ret.append("\n");
 						}
 					}
 				}
-				if(warnings) {
+				if (warnings) {
 					*warnings = true;
 				}
 				return ret;
@@ -195,7 +195,7 @@
 			ret.append("{NOP}");
 			break;
 		default:
-			if(warnings) {
+			if (warnings) {
 				*warnings = true;
 			}
 			ret.append(parseScriptsUnknownString(key));
@@ -209,7 +209,7 @@
 
 bool TutFile::parseText(int tutID, const QString &tuto)
 {
-	if(!isTut(tutID))	return false;
+	if (!isTut(tutID))	return false;
 
 	QStringList lines = tuto.split('\n', QString::SkipEmptyParts), params;
 	QByteArray ret;
@@ -217,30 +217,30 @@
 	ushort value;
 	bool jp = Config::value("jp_txt", false).toBool();
 
-	foreach(QString line, lines) {
+	for (QString line : qAsConst(lines)) {
 		QString rawLine = line;
 		line = line.trimmed();
-		if(multilineText) {
-			if(rawLine.endsWith("\")") && !rawLine.endsWith("\\\")")) {
+		if (multilineText) {
+			if (rawLine.endsWith("\")") && !rawLine.endsWith("\\\")")) {
 				rawLine.chop(2);// remove '")'
 				multilineText = false;
 			} else {
 				rawLine.append("\n");
 			}
 			ret.append(FF7Text(rawLine, jp).data());
-			if(!multilineText) {
+			if (!multilineText) {
 				ret.append('\xff');
 			}
-		} else if(line.startsWith("MOVE(") && line.endsWith(")")) {
+		} else if (line.startsWith("MOVE(") && line.endsWith(")")) {
 			ret.append('\x12');
 			line.chop(1);// remove ")"
 			params = line.mid(5).split(',');
 
-			if(!params.isEmpty()) {
+			if (!params.isEmpty()) {
 				value = params.first().trimmed().toUShort();
 				ret.append((char *)&value, 2);
 
-				if(params.size() >= 2) {
+				if (params.size() >= 2) {
 					value = params.at(1).trimmed().toUShort();
 					ret.append((char *)&value, 2);
 				} else {
@@ -250,14 +250,14 @@
 			} else {
 				ret.append("\x00\x00\x00\x00", 4);
 			}
-		} else if(line.startsWith("PAUSE(") && line.endsWith(")")) {
+		} else if (line.startsWith("PAUSE(") && line.endsWith(")")) {
 			ret.append('\x00');
 			line.chop(1);// remove ")"
 
 			value = line.mid(6).trimmed().toUShort();
 			ret.append((char *)&value, 2);
-		} else if(line.startsWith("TEXT(\"")) {
-			if(line.endsWith("\")") && !line.endsWith("\\\")")) {
+		} else if (line.startsWith("TEXT(\"")) {
+			if (line.endsWith("\")") && !line.endsWith("\\\")")) {
 				line.chop(2);// remove '")'
 				multilineText = false;
 			} else {
@@ -268,30 +268,30 @@
 			ret.append('\x10');
 			ret.append(FF7Text(line.mid(6).replace("\\\"", "\""), jp).data());
 
-			if(!multilineText) {
+			if (!multilineText) {
 				ret.append('\xff');
 			}
 		}
-		else if(line=="{FINISH}") {		ret.append('\x11'); }
-		else if(line=="{NOP}") {		ret.append('\xff'); }
-		else if(line=="[UP]") {			ret.append('\x02'); }
-		else if(line=="[DOWN]") {		ret.append('\x03'); }
-		else if(line=="[LEFT]") {		ret.append('\x04'); }
-		else if(line=="[RIGHT]") {		ret.append('\x05'); }
-		else if(line=="[MENU]") {		ret.append('\x06'); }
-		else if(line=="[CANCEL]") {		ret.append('\x07'); }
-		else if(line=="[CHANGE]") {		ret.append('\x08'); }
-		else if(line=="[OK]") {			ret.append('\x09'); }
-		else if(line=="[R1]") {			ret.append('\x0a'); }
-		else if(line=="[R2]") {			ret.append('\x0b'); }
-		else if(line=="[L1]") {			ret.append('\x0c'); }
-		else if(line=="[L2]") {			ret.append('\x0d'); }
-		else if(line=="[START]") {		ret.append('\x0e'); }
-		else if(line=="[SELECT]") {		ret.append('\x0f'); }
-		else if(line.startsWith("[") && line.endsWith("]")) {
+		else if (line=="{FINISH}") {		ret.append('\x11'); }
+		else if (line=="{NOP}") {		ret.append('\xff'); }
+		else if (line=="[UP]") {			ret.append('\x02'); }
+		else if (line=="[DOWN]") {		ret.append('\x03'); }
+		else if (line=="[LEFT]") {		ret.append('\x04'); }
+		else if (line=="[RIGHT]") {		ret.append('\x05'); }
+		else if (line=="[MENU]") {		ret.append('\x06'); }
+		else if (line=="[CANCEL]") {		ret.append('\x07'); }
+		else if (line=="[CHANGE]") {		ret.append('\x08'); }
+		else if (line=="[OK]") {			ret.append('\x09'); }
+		else if (line=="[R1]") {			ret.append('\x0a'); }
+		else if (line=="[R2]") {			ret.append('\x0b'); }
+		else if (line=="[L1]") {			ret.append('\x0c'); }
+		else if (line=="[L2]") {			ret.append('\x0d'); }
+		else if (line=="[START]") {		ret.append('\x0e'); }
+		else if (line=="[SELECT]") {		ret.append('\x0f'); }
+		else if (line.startsWith("[") && line.endsWith("]")) {
 			value = line.mid(1, line.size() - 2).trimmed().toUShort(&ok, 16);
-			if(ok) {
-				if(value > 255) {
+			if (ok) {
+				if (value > 255) {
 					value = 255;
 				}
 				ret.append((char)value);
@@ -357,16 +357,16 @@
 
 	TutFileStandard tut(tutos);
 	qWarning() << "TutFile::testParsing Data to text tests";
-	for(int i=0 ; i<tut.size() ; ++i) {
-		if(strings.at(i) != tut.parseScripts(i)) {
+	for (int i=0; i<tut.size(); ++i) {
+		if (strings.at(i) != tut.parseScripts(i)) {
 			qWarning() << i << tut.parseScripts(i) << "<>" << strings.at(i) << tutos.at(i).toHex();
 		} else {
 			qWarning() << i << "OK";
 		}
 	}
 	qWarning() << "TutFile::testParsing Text to data tests";
-	for(int i=0 ; i<tut.size() ; ++i) {
-		if(tut.parseText(i, strings.at(i)) && tutos.at(i) != tut.data(i)) {
+	for (int i=0; i<tut.size(); ++i) {
+		if (tut.parseText(i, strings.at(i)) && tutos.at(i) != tut.data(i)) {
 			qWarning() << i << tutos.at(i).toHex() << "<>" << tut.data(i).toHex() << strings.at(i);
 		} else {
 			qWarning() << i << "OK";
diff -Nru makoureactor-1.7.2/core/field/TutFile.h makoureactor-1.8.0/core/field/TutFile.h
--- makoureactor-1.7.2/core/field/TutFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/TutFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -60,7 +60,7 @@
 	virtual inline bool repair(int tutID) {
 		return !isBroken(tutID);
 	}
-	virtual QString parseScripts(int tutID, bool *warnings = NULL) const;
+	virtual QString parseScripts(int tutID, bool *warnings = nullptr) const;
 	virtual bool parseText(int tutID, const QString &tuto);
 	static void testParsing();
 protected:
diff -Nru makoureactor-1.7.2/core/field/TutFilePC.cpp makoureactor-1.8.0/core/field/TutFilePC.cpp
--- makoureactor-1.7.2/core/field/TutFilePC.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/TutFilePC.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -34,9 +34,9 @@
 	quint32 dataSize = data.size();
 
 	quint16 posTut;
-	for(int i=0 ; i<9 ; ++i) {
+	for (int i=0; i<9; ++i) {
 		memcpy(&posTut, constData + i*2, 2);
-		if(posTut < 18)		posTut = 18;
+		if (posTut < 18)		posTut = 18;
 		positions.append(posTut);
 	}
 
@@ -50,8 +50,8 @@
 	quint32 pos;
 	QByteArray toc, ret;
 
-	for(int i=0 ; i<9 ; ++i) {
-		if(i < size()) {
+	for (int i=0; i<9; ++i) {
+		if (i < size()) {
 			pos = 18 + ret.size();
 			ret.append(data(i));
 		} else {
diff -Nru makoureactor-1.7.2/core/field/TutFileStandard.cpp makoureactor-1.8.0/core/field/TutFileStandard.cpp
--- makoureactor-1.7.2/core/field/TutFileStandard.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/TutFileStandard.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -42,7 +42,7 @@
 	quint8 nbEntity;
 	bool isDemo;
 
-	if(dataSize <= 8) {
+	if (dataSize <= 8) {
 		return positions;
 	}
 
@@ -55,11 +55,11 @@
 
 	posAKAOList = (isDemo ? 24 : 32) + nbEntity*8;
 
-	if(dataSize <= posAKAOList+nbAKAO*4) {
+	if (dataSize <= posAKAOList+nbAKAO*4) {
 		return positions;
 	}
 
-	for(int i=0 ; i<nbAKAO ; ++i) {
+	for (int i=0; i<nbAKAO; ++i) {
 		memcpy(&posAKAO, constData + posAKAOList + i*4, 4);
 		positions.append(posAKAO);
 	}
@@ -76,7 +76,7 @@
 
 	toc.clear();
 
-	foreach(const QByteArray &tuto, dataList()) {
+	for (const QByteArray &tuto : dataList()) {
 		pos = firstPos + ret.size();
 		toc.append((char *)&pos, 4);
 		ret.append(tuto);
@@ -98,8 +98,8 @@
 bool TutFileStandard::hasTut() const
 {
 	int size = this->size();
-	for(int i=0 ; i<size ; ++i) {
-		if(isTut(i))	return true;
+	for (int i=0; i<size; ++i) {
+		if (isTut(i))	return true;
 	}
 	return false;
 }
@@ -116,11 +116,11 @@
 
 bool TutFileStandard::isBroken(int tutID) const
 {
-	if(isAkao(tutID)) {
+	if (isAkao(tutID)) {
 		return false;
 	}
 	const QByteArray &d = data(tutID);
-	if(!d.isEmpty()) {
+	if (!d.isEmpty()) {
 		quint8 firstChar = d.at(0);
 		return firstChar > 0x12 && firstChar < 0xFF;
 	}
@@ -151,13 +151,13 @@
 {
 	QString ret;
 
-	if(!isTut(tutID)) {
+	if (!isTut(tutID)) {
 		const QByteArray &tuto = data(tutID);
 		const char *constTuto = tuto.constData();
 
 		quint16 id, length, firstPos;
-		if(tuto.size() < 6) {
-			if(warnings) {
+		if (tuto.size() < 6) {
+			if (warnings) {
 				*warnings = true;
 			}
 			return QObject::tr("Error");
@@ -166,14 +166,14 @@
 
 		ret.append(QObject::tr("totalLength=%1\nid=%2\n").arg(tuto.size()).arg(id));
 
-		if(tuto.size() < 8) {
+		if (tuto.size() < 8) {
 			return ret;
 		}
 		memcpy(&length, constTuto + 6, 2);
 
 		ret.append(QObject::tr("length=%1\n").arg(length));
 
-		if(tuto.size() < 22) {
+		if (tuto.size() < 22) {
 			return ret;
 		}
 		memcpy(&firstPos, constTuto + 20, 2);
@@ -192,10 +192,10 @@
 
 int TutFileStandard::akaoID(int tutID) const
 {
-	if(isTut(tutID))	return -1;
+	if (isTut(tutID))	return -1;
 
 	const QByteArray &data = this->data(tutID);
-	if(data.size() < 6)		return -1;
+	if (data.size() < 6)		return -1;
 	quint16 id;
 	memcpy(&id, data.constData() + 4, 2);
 
@@ -204,7 +204,7 @@
 
 void TutFileStandard::setAkaoID(int tutID, quint16 akaoID)
 {
-	if(isTut(tutID))	return;
+	if (isTut(tutID))	return;
 
 	dataRef(tutID).replace(4, 2, (char *)&akaoID, 2);
 	setModified(true);
diff -Nru makoureactor-1.7.2/core/field/TutFileStandard.h makoureactor-1.8.0/core/field/TutFileStandard.h
--- makoureactor-1.7.2/core/field/TutFileStandard.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/field/TutFileStandard.h	2020-08-08 18:46:56.000000000 +0000
@@ -41,7 +41,7 @@
 	bool repair(int tutID);
 	int akaoID(int tutID) const;
 	void setAkaoID(int tutID, quint16 akaoID);
-	QString parseScripts(int tutID, bool *warnings = NULL) const;
+	QString parseScripts(int tutID, bool *warnings = nullptr) const;
 protected:
 	QList<quint32> openPositions(const QByteArray &data) const;
 	QByteArray save2(QByteArray &toc, quint32 firstPos) const;
diff -Nru makoureactor-1.7.2/core/GZIP.cpp makoureactor-1.8.0/core/GZIP.cpp
--- makoureactor-1.7.2/core/GZIP.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/GZIP.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -32,7 +32,7 @@
 QByteArray GZIP::decompress(const char *data, int size, int decSize, Strategy strategy)
 {
 	QTemporaryFile temp;
-	if(!temp.open()) {
+	if (!temp.open()) {
 		return QByteArray();
 	}
 	temp.write(data, size);
@@ -46,13 +46,13 @@
 	QString tempPath = QDir::tempPath() + "/qt_temp.gz";
 
 	gzFile file2 = gzopen(tempPath.toLatin1(), gzMode("w", level, strategy).toLatin1());
-	if(!file2) {
+	if (!file2) {
 		return QByteArray();
 	}
 	gzwrite(file2, ungzip, size);
 	gzclose(file2);
 	QFile finalFile(tempPath);
-	if(!finalFile.open(QIODevice::ReadOnly)) {
+	if (!finalFile.open(QIODevice::ReadOnly)) {
 		return QByteArray();
 	}
 
@@ -68,12 +68,12 @@
 	QByteArray ungzip;
 
 	gzFile file = gzopen(path.toLatin1(), gzMode("r", -1, strategy).toLatin1());
-	if(!file) {
+	if (!file) {
 		return QByteArray();
 	}
 	char buffer[10000];
 	int r;
-	while((r = gzread(file, buffer, 10000)) > 0) {
+	while ((r = gzread(file, buffer, 10000)) > 0) {
 		ungzip.append(buffer, r);
 	}
 	gzclose(file);
@@ -81,6 +81,69 @@
 	return ungzip;
 }
 
+QByteArray GZIP::decompressNoHeader(const char *data, int size)
+{
+	int uncompressedSize = size * 2;
+	QByteArray ret;
+	ret.resize(uncompressedSize);
+
+	int err;
+
+	forever {
+		Bytef *buffer = (Bytef *)ret.data();
+		uLongf destLen = ret.size();
+#if (ZLIB_VERNUM < 0x1280)
+		err = z_uncompress(buffer, &destLen, (const Bytef *)data, size);
+#else
+		err = uncompress(buffer, &destLen, (const Bytef *)data, size);
+#endif
+		if (Z_MEM_ERROR != err && Z_BUF_ERROR != err) {
+			break;
+		}
+
+		// Retry with bigger buffer
+		uncompressedSize += size;
+		ret.resize(uncompressedSize);
+	}
+
+	if (Z_OK != err) {
+		ret.clear();
+	}
+
+	return ret;
+}
+
+QByteArray GZIP::compressNoHeader(const char *data, int size, int level)
+{
+	QByteArray ret;
+	ret.resize(size * 2);
+	Bytef *buffer = (Bytef *)ret.data();
+	uLongf destLen = ret.size();
+#if (ZLIB_VERNUM < 0x1280)
+	if (Z_OK != z_compress2(buffer, &destLen, (const Bytef *)data, size, level)) {
+		ret.clear();
+	} else {
+		ret.resize(destLen);
+	}
+#else
+	if (Z_OK != compress2(buffer, &destLen, (const Bytef *)data, size, level)) {
+		ret.clear();
+	} else {
+		ret.resize(destLen);
+	}
+#endif
+	return ret;
+}
+
+ulong GZIP::crc(const char *data, int size)
+{
+#if (ZLIB_VERNUM < 0x1280)
+	return z_crc32(z_crc32(0L, nullptr, 0), (const Bytef *)data, size);
+#else
+	return crc32(crc32(0L, nullptr, 0), (const Bytef *)data, size);
+#endif
+}
+
 char GZIP::strategyToChar(Strategy strategy)
 {
 	switch (strategy) {
diff -Nru makoureactor-1.7.2/core/GZIP.h makoureactor-1.8.0/core/GZIP.h
--- makoureactor-1.7.2/core/GZIP.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/GZIP.h	2020-08-08 18:46:56.000000000 +0000
@@ -36,6 +36,9 @@
 	static QByteArray decompress(const char *data, int size, int decSize, Strategy strategy = StrategyDefault);
 	static QByteArray compress(const char *ungzip, int size, int level = -1, Strategy strategy = StrategyDefault);
 	static QByteArray decompress(const QString &path, int decSize, Strategy strategy = StrategyDefault);
+	static QByteArray decompressNoHeader(const char *data, int size);
+	static QByteArray compressNoHeader(const char *data, int size, int level = -1);
+	static ulong crc(const char *data, int size);
 private:
 	static char strategyToChar(Strategy strategy);
 	static QString gzMode(const char *mode, int level = -1, Strategy strategy = StrategyDefault);
diff -Nru makoureactor-1.7.2/core/IO.cpp makoureactor-1.8.0/core/IO.cpp
--- makoureactor-1.7.2/core/IO.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/IO.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -11,8 +11,8 @@
 
 bool IO::canRead() const
 {
-	if(_device) {
-		if(!_device->isOpen()) {
+	if (_device) {
+		if (!_device->isOpen()) {
 			return _device->open(QIODevice::ReadOnly);
 		}
 		return _device->isReadable();
@@ -22,8 +22,8 @@
 
 bool IO::canWrite() const
 {
-	if(_device) {
-		if(!_device->isOpen()) {
+	if (_device) {
+		if (!_device->isOpen()) {
 			return _device->open(QIODevice::WriteOnly);
 		}
 		return _device->isWritable();
diff -Nru makoureactor-1.7.2/core/IsoArchive.cpp makoureactor-1.8.0/core/IsoArchive.cpp
--- makoureactor-1.7.2/core/IsoArchive.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/IsoArchive.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -132,8 +132,8 @@
 {
 	QList<IsoFile *> fs;
 
-	foreach(IsoFileOrDirectory *fOrD, _filesAndDirectories) {
-		if(fOrD->isFile()) {
+	for (IsoFileOrDirectory *fOrD : _filesAndDirectories) {
+		if (fOrD->isFile()) {
 			fs.append(static_cast<IsoFile *>(fOrD));
 		}
 	}
@@ -145,8 +145,8 @@
 {
 	QList<IsoDirectory *> ds;
 
-	foreach(IsoFileOrDirectory *fOrD, _filesAndDirectories) {
-		if(fOrD->isDirectory()) {
+	for (IsoFileOrDirectory *fOrD : _filesAndDirectories) {
+		if (fOrD->isDirectory()) {
 			ds.append(static_cast<IsoDirectory *>(fOrD));
 		}
 	}
@@ -158,18 +158,18 @@
 {
 	int index;
 
-	if((index = path.indexOf("/")) != -1) {
-		IsoFileOrDirectory *fOrD = _filesAndDirectories.value(path.left(index).toUpper(), NULL);
+	if ((index = path.indexOf("/")) != -1) {
+		IsoFileOrDirectory *fOrD = _filesAndDirectories.value(path.left(index).toUpper(), nullptr);
 
-		if(fOrD == NULL)	return NULL;
+		if (fOrD == nullptr)	return nullptr;
 
-		if(fOrD->isDirectory()) {
+		if (fOrD->isDirectory()) {
 			return static_cast<IsoDirectory *>(fOrD)->fileOrDirectory(path.mid(index+1));
 		} else {
-			return NULL;
+			return nullptr;
 		}
 	} else {
-		return _filesAndDirectories.value(path.toUpper(), NULL);
+		return _filesAndDirectories.value(path.toUpper(), nullptr);
 	}
 
 }
@@ -178,10 +178,10 @@
 {
 	IsoFileOrDirectory *fOrD = fileOrDirectory(path);
 
-	if(fOrD == NULL)	return NULL;
+	if (fOrD == nullptr)	return nullptr;
 
-	if(fOrD->isDirectory()) {
-		return NULL;
+	if (fOrD->isDirectory()) {
+		return nullptr;
 	}
 
 	return static_cast<IsoFile *>(fOrD);
@@ -191,10 +191,10 @@
 {
 	IsoFileOrDirectory *fOrD = fileOrDirectory(path);
 
-	if(fOrD == NULL)	return NULL;
+	if (fOrD == nullptr)	return nullptr;
 
-	if(fOrD->isFile()) {
-		return NULL;
+	if (fOrD->isFile()) {
+		return nullptr;
 	}
 
 	return static_cast<IsoDirectory *>(fOrD);
@@ -226,7 +226,7 @@
 
 QByteArray IsoFile::data(quint32 maxSize) const
 {
-	if(_io->isOpen() || _io->open(QIODevice::ReadOnly)) {
+	if (_io->isOpen() || _io->open(QIODevice::ReadOnly)) {
 		_io->reset();
 		return maxSize == 0 ? _io->readAll() : _io->read(maxSize);
 	}
@@ -235,7 +235,7 @@
 
 QByteArray IsoFile::modifiedData(quint32 maxSize) const
 {
-	if(_newIO && (_newIO->isOpen() || _newIO->open(QIODevice::ReadOnly))) {
+	if (_newIO && (_newIO->isOpen() || _newIO->open(QIODevice::ReadOnly))) {
 		_newIO->reset();
 		return maxSize == 0 ? _newIO->readAll() : _newIO->read(maxSize);
 	}
@@ -250,14 +250,14 @@
 	char data[MAX_ISO_READ];
 	qint64 r, totalR=0;
 	QFile ret(destination);
-	if(!ret.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+	if (!ret.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 		return false;
 	}
-	if(!_io->isOpen() && !_io->open(QIODevice::ReadOnly)) {
+	if (!_io->isOpen() && !_io->open(QIODevice::ReadOnly)) {
 		return false;
 	}
 
-	while(maxSize-totalR > 0 && (r = _io->read(data, qMin((qint64)MAX_ISO_READ, maxSize-totalR))) > 0) {
+	while (maxSize-totalR > 0 && (r = _io->read(data, qMin((qint64)MAX_ISO_READ, maxSize-totalR))) > 0) {
 		ret.write(data, r);
 		totalR += r;
 	}
@@ -287,7 +287,7 @@
 
 bool IsoFile::setModifiedFile(QIODevice *io)
 {
-	if(!io->isOpen() && !io->open(QIODevice::ReadOnly)) {
+	if (!io->isOpen() && !io->open(QIODevice::ReadOnly)) {
 		return false;
 	}
 
@@ -345,9 +345,9 @@
 bool IsoArchiveIO::open(QIODevice::OpenMode mode)
 {
 	bool open = QFile::open(mode);
-	if(!open)	return false;
+	if (!open)	return false;
 
-	if(mode.testFlag(QIODevice::Truncate)) {
+	if (mode.testFlag(QIODevice::Truncate)) {
 		return true;
 	}
 
@@ -374,9 +374,9 @@
 qint64 IsoArchiveIO::isoPos(qint64 pos)
 {
 	qint64 start = (pos % SECTOR_SIZE) - SECTOR_SIZE_HEADER;
-	if(start < 0) {
+	if (start < 0) {
 		start = 0;
-	} else if(start > SECTOR_SIZE_DATA) {
+	} else if (start > SECTOR_SIZE_DATA) {
 		start = SECTOR_SIZE_DATA;
 	}
 
@@ -393,12 +393,12 @@
 	qint64 read, readTotal = 0, seqLen;
 
 //	qDebug() << pos() << "seek >> " << seqLen;
-	if(!seekIso(isoPos(pos())))	return 0;
+	if (!seekIso(isoPos(pos())))	return 0;
 
 	seqLen = qMin(SECTOR_SIZE_HEADER + SECTOR_SIZE_DATA - (pos() % SECTOR_SIZE), maxSize);
-	if(seqLen < 0)	return 0;
+	if (seqLen < 0)	return 0;
 
-	while((read = this->read(data, seqLen)) > 0) {
+	while ((read = this->read(data, seqLen)) > 0) {
 //		qDebug() << "read" << seqLen << read;
 		data += read;
 		maxSize -= read;
@@ -406,8 +406,8 @@
 		seqLen = qMin((qint64)SECTOR_SIZE_DATA, maxSize);
 //		qDebug() << "seqLen" << seqLen << maxSize << pos();
 		// Si on est à la fin du secteur
-		if(pos() % SECTOR_SIZE >= SECTOR_SIZE_HEADER + SECTOR_SIZE_DATA) {
-			if(!seek(pos() + SECTOR_SIZE_HEADER + SECTOR_SIZE_FOOTER))	break;
+		if (pos() % SECTOR_SIZE >= SECTOR_SIZE_HEADER + SECTOR_SIZE_DATA) {
+			if (!seek(pos() + SECTOR_SIZE_HEADER + SECTOR_SIZE_FOOTER))	break;
 //			qDebug() << "seek >> 304" << pos();
 		}
 	}
@@ -431,11 +431,11 @@
 	qint64 write, writeTotal = 0, seqLen;
 
 //	qDebug() << pos() << "seek >> " << seqLen;
-	if(!seekIso(isoPos(pos())))	return 0;
+	if (!seekIso(isoPos(pos())))	return 0;
 
 	seqLen = qMin(SECTOR_SIZE_HEADER + SECTOR_SIZE_DATA - (pos() % SECTOR_SIZE), maxSize);
 
-	while((write = this->write(data, seqLen)) > 0) {
+	while ((write = this->write(data, seqLen)) > 0) {
 //		qDebug() << "write" << seqLen << write;
 		data += write;
 		maxSize -= write;
@@ -443,8 +443,8 @@
 		seqLen = qMin((qint64)2048, maxSize);
 //		qDebug() << "seqLen" << seqLen << maxSize << pos();
 		// Si on est à la fin du secteur
-		if(pos() % SECTOR_SIZE >= SECTOR_SIZE_HEADER + SECTOR_SIZE_DATA) {
-			if(!seek(pos() + SECTOR_SIZE_HEADER + SECTOR_SIZE_FOOTER))	break;
+		if (pos() % SECTOR_SIZE >= SECTOR_SIZE_HEADER + SECTOR_SIZE_DATA) {
+			if (!seek(pos() + SECTOR_SIZE_HEADER + SECTOR_SIZE_FOOTER))	break;
 //			qDebug() << "seek >> 304" << pos();
 		}
 	}
@@ -508,7 +508,7 @@
 	sectorData = buildHeader(sectorCur, type, mode);
 	// data
 	sectorData.append(data);
-	if(dataSize != SECTOR_SIZE_DATA) {
+	if (dataSize != SECTOR_SIZE_DATA) {
 		sectorData.append(QByteArray(SECTOR_SIZE_DATA - dataSize, '\x00'));
 	}
 	// sector footer
@@ -523,7 +523,7 @@
 }
 
 bool IsoFileIO::open(OpenMode mode) {
-	if(mode.testFlag(QIODevice::Append)
+	if (mode.testFlag(QIODevice::Append)
 			|| mode.testFlag(QIODevice::Truncate)
 			|| mode.testFlag(QIODevice::WriteOnly)) {
 		return false;
@@ -538,9 +538,9 @@
 
 qint64 IsoFileIO::readData(char *data, qint64 maxSize)
 {
-	if(_io->seekToSector(_infos->location()) && _io->seekIso(_io->posIso() + pos())) {
+	if (_io->seekToSector(_infos->location()) && _io->seekIso(_io->posIso() + pos())) {
 		qint64 size = this->size();
-		if(size < 0) {
+		if (size < 0) {
 			return -1;
 		}
 		return _io->readIso(data, qMin(maxSize, size - pos()));
@@ -561,23 +561,23 @@
 }
 
 IsoArchive::IsoArchive() :
-	_rootDirectory(NULL), _error(Archive::NoError)
+	_rootDirectory(nullptr), _error(Archive::NoError)
 {
 }
 
 IsoArchive::IsoArchive(const QString &name) :
-	_io(name), _rootDirectory(NULL), _error(Archive::NoError)
+	_io(name), _rootDirectory(nullptr), _error(Archive::NoError)
 {
 }
 
 IsoArchive::~IsoArchive()
 {
-	if(_rootDirectory != NULL)		delete _rootDirectory;
+	if (_rootDirectory != nullptr)		delete _rootDirectory;
 }
 
 bool IsoArchive::open(QIODevice::OpenMode mode)
 {
-	if(!_io.open(mode)) {
+	if (!_io.open(mode)) {
 		return false;
 	}
 
@@ -585,14 +585,14 @@
 		return true;
 	}
 
-	if(!openVolumeDescriptor()) {
+	if (!openVolumeDescriptor()) {
 		qWarning() << "IsoArchive::open" << "cannot open volume descriptor";
 		_io.setErrorString("Cannot open volume descriptor");
 		return false;
 	}
 //	qDebug() << volumeDescriptorToString(volume);
 	qint64 size = _io.size();
-	if(size%SECTOR_SIZE != 0 || volume.vd1.volume_space_size != _io.sectorCount() || volume.vd1.id[0] != 'C' || volume.vd1.id[1] != 'D' || volume.vd1.id[2] != '0' || volume.vd1.id[3] != '0' || volume.vd1.id[4] != '1') {
+	if (size%SECTOR_SIZE != 0 || volume.vd1.volume_space_size != _io.sectorCount() || volume.vd1.id[0] != 'C' || volume.vd1.id[1] != 'D' || volume.vd1.id[2] != '0' || volume.vd1.id[3] != '0' || volume.vd1.id[4] != '1') {
 		qWarning() << "IsoArchive::open error archive size" << (size%SECTOR_SIZE) << volume.vd1.volume_space_size << _io.sectorCount();
 		_io.setErrorString("Archive size error");
 		return false;
@@ -609,16 +609,16 @@
 //	pathTables2b = pathTable(qFromBigEndian(volume.vd1.opt_type_path_table2), volume.vd1.path_table_size);
 
 	/*qDebug() << "PATHTABLE1";
-	foreach(PathTable pt, pathTables1a)
+	for (PathTable pt : pathTables1a)
 		qDebug() << pathTableToString(pt);
 	qDebug() << "PATHTABLE2";
-	foreach(PathTable pt, pathTables1b)
+	for (PathTable pt : pathTables1b)
 		qDebug() << pathTableToString(pt);
 	qDebug() << "PATHTABLE3";
-	foreach(PathTable pt, pathTables2a)
+	for (PathTable pt : pathTables2a)
 		qDebug() << pathTableToString(pt, true);
 	qDebug() << "PATHTABLE4";
-	foreach(PathTable pt, pathTables2b)
+	for (PathTable pt : pathTables2b)
 		qDebug() << pathTableToString(pt, true);
 	*/
 
@@ -628,17 +628,17 @@
 void IsoArchive::close()
 {
 	_io.close();
-	if(_rootDirectory != NULL) {
+	if (_rootDirectory != nullptr) {
 		delete _rootDirectory;
-		_rootDirectory = NULL;
+		_rootDirectory = nullptr;
 	}
 }
 
 int IsoArchive::findPadding(const QList<IsoFileOrDirectory *> &filesWithPadding, quint32 minSectorCount)
 {
 	int i=0;
-	foreach(IsoFileOrDirectory *fileOrDir, filesWithPadding) {
-		if(fileOrDir->paddingAfter() >= minSectorCount) {
+	for (IsoFileOrDirectory *fileOrDir : filesWithPadding) {
+		if (fileOrDir->paddingAfter() >= minSectorCount) {
 			return i;
 		}
 		++i;
@@ -665,7 +665,7 @@
 	QMap<quint32, const IsoFile *> writeToTheMain;
 	QList<const IsoFile *> writeToTheEnd;
 	QList<IsoFileOrDirectory *> filesWithPadding = getIntegrity();
-	IsoFileOrDirectory *lastFileWithPadding = filesWithPadding.isEmpty() ? NULL : filesWithPadding.last();
+	IsoFileOrDirectory *lastFileWithPadding = filesWithPadding.isEmpty() ? nullptr : filesWithPadding.last();
 	quint32 endOfIso = _io.sectorCount(),
 	        sectorCountAtTheEnd = lastFileWithPadding ? (endOfIso - lastFileWithPadding->locationAfter()) : 0,
 	        lastPadding = lastFileWithPadding ? lastFileWithPadding->paddingAfter() : 0,
@@ -679,23 +679,23 @@
 	}
 	endOfFilledIsoAfter = endOfFilledIso;
 	
-	if(directory == NULL) {
+	if (directory == nullptr) {
 		directory = _rootDirectory;
-		if(directory == NULL) {
+		if (directory == nullptr) {
 			setError(Archive::OpenError, "Not opened to pack");
 			return false;
 		}
 	}
 
-	foreach(IsoFile *isoFile, getModifiedFiles(directory)) {
+	for (IsoFile *isoFile : getModifiedFiles(directory)) {
 		// Est-ce que les nouvelles données sont plus grandes que les anciennes ? Est-ce qu'on est pas à la fin de l'archive ?
-		if(isoFile->newSectorCount() > isoFile->sectorCount() + isoFile->paddingAfter()
+		if (isoFile->newSectorCount() > isoFile->sectorCount() + isoFile->paddingAfter()
 				&& isoFile->location() + isoFile->sectorCount() < _io.sectorCount()) {
 //#ifdef ISOARCHIVE_DEBUG
 			qWarning() << "File too big" << isoFile->newSectorCount() << isoFile->sectorCount() << (isoFile->newSectorCount() - isoFile->sectorCount()) << isoFile->name();
 //#endif
 			int index = findPadding(filesWithPadding, isoFile->newSectorCount());
-			if(index >= 0) {
+			if (index >= 0) {
 				IsoFileOrDirectory *fileWithPaddingAfter = filesWithPadding.at(index);
 				isoFile->setLocation(fileWithPaddingAfter->newLocation() + fileWithPaddingAfter->newSectorCount());
 				isoFile->setPaddingAfter(fileWithPaddingAfter->paddingAfter() - isoFile->newSectorCount());
@@ -718,25 +718,25 @@
 				endOfFilledIsoAfter += isoFile->newSectorCount();
 			}
 		} else {
-			if(isoFile->paddingAfter() > isoFile->newSectorCount() - isoFile->sectorCount())
+			if (isoFile->paddingAfter() > isoFile->newSectorCount() - isoFile->sectorCount())
 				isoFile->setPaddingAfter(isoFile->paddingAfter() - (isoFile->newSectorCount() - isoFile->sectorCount()));
 			writeToTheMain.insert(isoFile->newLocation(), isoFile);
 		}
 	}
 
-	if(!reorganizeModifiedFilesAfter(writeToTheMain, writeToTheEnd)) {
+	if (!reorganizeModifiedFilesAfter(writeToTheMain, writeToTheEnd)) {
 		return false;
 	}
 
-	if(control) {
+	if (control) {
 		control->setObserverMaximum(endOfIso);
 	}
 
 	destinationIO->reset();
 	_io.reset();
 
-	foreach(const IsoFile *isoFile, writeToTheMain) {
-		if(control && control->observerWasCanceled()) {
+	for (const IsoFile *isoFile : qAsConst(writeToTheMain)) {
+		if (control && control->observerWasCanceled()) {
 			setError(Archive::AbortError);
 			return false;
 		}
@@ -744,46 +744,46 @@
 		quint32 fileLocation = isoFile->newLocation();
 
 		// Données avant le fichier
-		if(!copySectors(destinationIO, qint64(fileLocation) - qint64(_io.currentSector()), control)) {
+		if (!copySectors(destinationIO, qint64(fileLocation) - qint64(_io.currentSector()), control)) {
 			return false;
 		}
 
 #ifdef ISOARCHIVE_DEBUG
-		if(destinationIO->pos() % SECTOR_SIZE != 0)           qWarning() << "destination error 1a" << (destinationIO->pos() % SECTOR_SIZE) << isoFile->name();
-		if(destinationIO->currentSector() != fileLocation)    qWarning() << "destination error 1b" << destinationIO->currentSector() << fileLocation << isoFile->name();
-		if(destinationIO->pos() != _io.pos())                 qWarning() << "destination error 1c" << destinationIO->pos() << _io.pos() << isoFile->name();
+		if (destinationIO->pos() % SECTOR_SIZE != 0)           qWarning() << "destination error 1a" << (destinationIO->pos() % SECTOR_SIZE) << isoFile->name();
+		if (destinationIO->currentSector() != fileLocation)    qWarning() << "destination error 1b" << destinationIO->currentSector() << fileLocation << isoFile->name();
+		if (destinationIO->pos() != _io.pos())                 qWarning() << "destination error 1c" << destinationIO->pos() << _io.pos() << isoFile->name();
 #endif
 
 		// On écrit le même nombre de secteurs que le fichier d'origine
-		if(!destination->writeFile(isoFile->modifiedFile(), isoFile->sectorCount() + isoFile->paddingAfter(), control)) {
+		if (!destination->writeFile(isoFile->modifiedFile(), isoFile->sectorCount() + isoFile->paddingAfter(), control)) {
 			return false;
 		}
 		_io.seek(destinationIO->pos());
 
 #ifdef ISOARCHIVE_DEBUG
-		if(destinationIO->pos() % SECTOR_SIZE != 0)                  qWarning() << "destination error 2a" << (destinationIO->pos() % SECTOR_SIZE) << isoFile->name();
-		if(destinationIO->currentSector() != _io.currentSector())    qWarning() << "destination error 2b" << destinationIO->currentSector() << _io.currentSector() << isoFile->name();
-		if(destinationIO->pos() != _io.pos())                        qWarning() << "destination error 2c" << destinationIO->pos() << _io.pos() << isoFile->name();
+		if (destinationIO->pos() % SECTOR_SIZE != 0)                  qWarning() << "destination error 2a" << (destinationIO->pos() % SECTOR_SIZE) << isoFile->name();
+		if (destinationIO->currentSector() != _io.currentSector())    qWarning() << "destination error 2b" << destinationIO->currentSector() << _io.currentSector() << isoFile->name();
+		if (destinationIO->pos() != _io.pos())                        qWarning() << "destination error 2c" << destinationIO->pos() << _io.pos() << isoFile->name();
 #endif
 
 		// Envoi de la position courante à l'output
-		if(control) control->setObserverValue(destinationIO->currentSector());
+		if (control) control->setObserverValue(destinationIO->currentSector());
 	}
 
 	// Données après les fichiers patchés
-	if(!copySectors(destinationIO, endOfFilledIso - _io.currentSector(), control)) {
+	if (!copySectors(destinationIO, endOfFilledIso - _io.currentSector(), control)) {
 		return false;
 	}
 
 #ifdef ISOARCHIVE_DEBUG
-	if(destinationIO->pos() % SECTOR_SIZE != 0)                qWarning() << "destination error 3a" << (destinationIO->pos() % SECTOR_SIZE);
-	if(destinationIO->currentSector() != endOfFilledIso)       qWarning() << "destination error 3b" << destinationIO->currentSector() << _io.sectorCount();
-	if(destinationIO->pos() != _io.pos())                      qWarning() << "destination error 3c" << destinationIO->pos() << _io.pos();
+	if (destinationIO->pos() % SECTOR_SIZE != 0)                qWarning() << "destination error 3a" << (destinationIO->pos() % SECTOR_SIZE);
+	if (destinationIO->currentSector() != endOfFilledIso)       qWarning() << "destination error 3b" << destinationIO->currentSector() << _io.sectorCount();
+	if (destinationIO->pos() != _io.pos())                      qWarning() << "destination error 3c" << destinationIO->pos() << _io.pos();
 #endif
 
 	// Fichiers trop gros mis à la fin de l'ISO
-	foreach(const IsoFile *isoFile, writeToTheEnd) {
-		if(control && control->observerWasCanceled()) {
+	for (const IsoFile *isoFile : qAsConst(writeToTheEnd)) {
+		if (control && control->observerWasCanceled()) {
 			setError(Archive::AbortError);
 			return false;
 		}
@@ -791,25 +791,25 @@
 		qWarning() << "Write file at the end" << isoFile->name() << destinationIO->currentSector();
 #endif
 
-		if(!destination->writeFile(isoFile->modifiedFile(), 0, control)) {
+		if (!destination->writeFile(isoFile->modifiedFile(), 0, control)) {
 			return false;
 		}
 
 #ifdef ISOARCHIVE_DEBUG
-		if(destinationIO->pos() % SECTOR_SIZE != 0)      qWarning() << "destination error 3a" << (destinationIO->pos() % SECTOR_SIZE) << isoFile->name();
+		if (destinationIO->pos() % SECTOR_SIZE != 0)      qWarning() << "destination error 3a" << (destinationIO->pos() % SECTOR_SIZE) << isoFile->name();
 #endif
 
 		// Envoi de la position courante à l'output
-		if(control) control->setObserverValue(destinationIO->currentSector());
+		if (control) control->setObserverValue(destinationIO->currentSector());
 	}
 
-	if(!copySectors(destinationIO, endOfIso - endOfFilledIso, control, true)) {
+	if (!copySectors(destinationIO, endOfIso - endOfFilledIso, control, true)) {
 		return false;
 	}
 
 	// Modifications données
 
-	if(destinationIO->size() != _io.size()) {
+	if (destinationIO->size() != _io.size()) {
 #ifdef ISOARCHIVE_DEBUG
 		qDebug() << "size iso !=" << destinationIO->sectorCount() << _io.sectorCount();
 #endif
@@ -826,10 +826,10 @@
 	//Debug
 
 	/* qDebug() << "check headers";
-	for(quint32 i = 0 ; i < destinationIO->sectorCount() ; ++i) {
-		if(control && control->observerWasCanceled())	return false;
+	for (quint32 i = 0; i < destinationIO->sectorCount(); ++i) {
+		if (control && control->observerWasCanceled())	return false;
 		destinationIO->seek(12 + i*SECTOR_SIZE);
-		if(destinationIO->peek(3) != IsoArchiveIO::int2Header(i)) {
+		if (destinationIO->peek(3) != IsoArchiveIO::int2Header(i)) {
 			qDebug() << "Error header" << i << destinationIO->peek(3).toHex();
 			break;
 		}
@@ -837,7 +837,7 @@
 	qDebug() << "check done"; */
 
 #ifdef ISOARCHIVE_DEBUG
-	if(destinationIO->size() % SECTOR_SIZE != 0)    qWarning() << "Invalid size" << destinationIO->size();
+	if (destinationIO->size() % SECTOR_SIZE != 0)    qWarning() << "Invalid size" << destinationIO->size();
 #endif
 
 	return true;
@@ -854,21 +854,21 @@
 	Q_ASSERT(out->pos() % SECTOR_SIZE == 0);
 	Q_ASSERT(_io.pos() % SECTOR_SIZE == 0);
 
-	for(int i = 0 ; i < sectorCount ; ++i) {
-		if(control && control->observerWasCanceled()) {
+	for (int i = 0; i < sectorCount; ++i) {
+		if (control && control->observerWasCanceled()) {
 			setError(Archive::AbortError);
 			return false;
 		}
 
 		QByteArray data = _io.read(SECTOR_SIZE);
-		if(data.size() != SECTOR_SIZE) {
+		if (data.size() != SECTOR_SIZE) {
 			qWarning() << "IsoArchive::copySectors read error" << data.size() << SECTOR_SIZE;
 			setError(Archive::ReadError, _io.errorString());
 			return false;
 		}
 
 		if (!repair) {
-			if(out->write(data) != SECTOR_SIZE) {
+			if (out->write(data) != SECTOR_SIZE) {
 				qWarning() << "IsoArchive::copySectors write error" << data.size() << SECTOR_SIZE;
 				setError(Archive::WriteError, out->errorString());
 				return false;
@@ -876,7 +876,7 @@
 		} else {
 			quint8 type, mode;
 			IsoArchiveIO::headerInfos(data, &type, &mode);
-			if(!out->writeSector(data.mid(SECTOR_SIZE_HEADER, SECTOR_SIZE_DATA), type, mode)) {
+			if (!out->writeSector(data.mid(SECTOR_SIZE_HEADER, SECTOR_SIZE_DATA), type, mode)) {
 				qWarning() << "IsoArchive::copySectors writeSector error";
 				setError(Archive::WriteError, out->errorString());
 				return false;
@@ -884,7 +884,7 @@
 		}
 
 		// Envoi de la position courante à l'output
-		if(control) control->setObserverValue(out->currentSector());
+		if (control) control->setObserverValue(out->currentSector());
 	}
 
 	return true;
@@ -892,7 +892,7 @@
 
 bool IsoArchive::writeFile(QIODevice *in, quint32 sectorCount, ArchiveObserver *control)
 {
-	if(!in->isOpen() || !in->reset()) {
+	if (!in->isOpen() || !in->reset()) {
 		setError(Archive::OpenError, in->errorString());
 		return false;
 	}
@@ -900,8 +900,8 @@
 	qint64 remainingSize = in->size();
 	const quint32 sectorStart = _io.currentSector();
 
-	while(remainingSize > 0) {
-		if(control && control->observerWasCanceled()) {
+	while (remainingSize > 0) {
+		if (control && control->observerWasCanceled()) {
 			setError(Archive::AbortError);
 			return false;
 		}
@@ -909,7 +909,7 @@
 		QByteArray sectorData;
 		qint64 toRead;
 		quint8 type;
-		if(remainingSize <= SECTOR_SIZE_DATA) { // Last sector of file
+		if (remainingSize <= SECTOR_SIZE_DATA) { // Last sector of file
 			toRead = remainingSize;
 			type = 0x89;
 		} else {
@@ -918,12 +918,12 @@
 		}
 
 		sectorData = in->read(toRead);
-		if(sectorData.size() != toRead) {
+		if (sectorData.size() != toRead) {
 			setError(Archive::ReadError, in->errorString());
 			return false;
 		}
 
-		if(!_io.writeSector(sectorData, type)) {
+		if (!_io.writeSector(sectorData, type)) {
 			setError(Archive::WriteError, _io.errorString());
 			return false;
 		}
@@ -931,15 +931,15 @@
 		remainingSize = in->size() - in->pos();
 	}
 
-	if(sectorCount != 0) {
+	if (sectorCount != 0) {
 		// Write empty sectors
-		while(_io.currentSector() - sectorStart < sectorCount) {
-			if(control && control->observerWasCanceled()) {
+		while (_io.currentSector() - sectorStart < sectorCount) {
+			if (control && control->observerWasCanceled()) {
 				setError(Archive::AbortError);
 				return false;
 			}
 
-			if(!_io.writeSector(QByteArray(), 0x20)) {
+			if (!_io.writeSector(QByteArray(), 0x20)) {
 				setError(Archive::WriteError, _io.errorString());
 				return false;
 			}
@@ -954,8 +954,8 @@
 	quint32 pos, oldSectorStart, newSectorStart, newSectorStart2, oldSize, newSize, newSize2;
 	QList<IsoDirectory *> dirs;
 
-	foreach(IsoFileOrDirectory *fileOrDir, directory->filesAndDirectories()) {
-		if(fileOrDir->isModified()) {
+	for (IsoFileOrDirectory *fileOrDir : directory->filesAndDirectories()) {
+		if (fileOrDir->isModified()) {
 			pos = fileOrDir->structPosition + 2;
 			oldSectorStart = fileOrDir->location();
 			oldSize = fileOrDir->size();
@@ -963,7 +963,7 @@
 			newSize = fileOrDir->newSize();
 
 			// location_extent
-			if(newSectorStart != oldSectorStart) {
+			if (newSectorStart != oldSectorStart) {
 				newSectorStart2 = qToBigEndian(newSectorStart);
 				newIso->_io.seekIso(pos);
 				newIso->_io.writeIso((char *)&newSectorStart, 4);
@@ -972,7 +972,7 @@
 			}
 
 			// data_length
-			if(newSize != oldSize) {
+			if (newSize != oldSize) {
 				newSize2 = qToBigEndian(newSize);
 				newIso->_io.seekIso(pos + 8);
 				newIso->_io.writeIso((char *)&newSize, 4);
@@ -981,12 +981,12 @@
 			}
 		}
 
-		if(fileOrDir->isDirectory()) {
+		if (fileOrDir->isDirectory()) {
 			dirs.append(static_cast<IsoDirectory *>(fileOrDir));
 		}
 	}
 
-	foreach(IsoDirectory *d, dirs) {
+	for (IsoDirectory *d : dirs) {
 		repairLocationSectors(d, newIso);
 	}
 }
@@ -1020,41 +1020,41 @@
 {
 //	qDebug() << "sizeof(VolumeDescriptor)" << sizeof(VolumeDescriptor1) << sizeof(VolumeDescriptor2) << sizeof(IsoTime) << sizeof(DirectoryRecord);
 
-	if(!_io.seek(SECTOR_SIZE * (16 + num) + SECTOR_SIZE_HEADER)) {
+	if (!_io.seek(SECTOR_SIZE * (16 + num) + SECTOR_SIZE_HEADER)) {
 		qWarning() << "1";
 		return false;
 	}
 //	qint64 pos = this->pos();
-	if(_io.read((char *)&volume.vd1, sizeof(VolumeDescriptor1)) != sizeof(VolumeDescriptor1)) {
+	if (_io.read((char *)&volume.vd1, sizeof(VolumeDescriptor1)) != sizeof(VolumeDescriptor1)) {
 		qWarning() << "2" << _io.pos();
 		return false;
 	}
 //	qint64 pos2 = this->pos();
-	if(_io.read((char *)&volume.dr.length_dr, 1) != 1) {
+	if (_io.read((char *)&volume.dr.length_dr, 1) != 1) {
 		qWarning() << "3";
 		return false;
 	}
-	if(_io.read((char *)&volume.dr.extended_attr_record_length, 1) != 1) {
+	if (_io.read((char *)&volume.dr.extended_attr_record_length, 1) != 1) {
 		qWarning() << "4";
 		return false;
 	}
-	if(_io.peek((char *)&volume.dr.drh, sizeof(DirectoryRecordHead)) != sizeof(DirectoryRecordHead)) {
+	if (_io.peek((char *)&volume.dr.drh, sizeof(DirectoryRecordHead)) != sizeof(DirectoryRecordHead)) {
 		qWarning() << "5";
 		return false;
 	}
-	if(!_io.seek(_io.pos() + 31)) {
+	if (!_io.seek(_io.pos() + 31)) {
 		qWarning() << "6";
 		return false;
 	}
 	volume.dr.name = _io.read(qMin((int)volume.dr.drh.length_fi, MAX_FILENAME_LENGTH));
-	if(_io.pos() & 1) {
-		if(!_io.seek(_io.pos() + 1)) {// padding
+	if (_io.pos() & 1) {
+		if (!_io.seek(_io.pos() + 1)) {// padding
 			qWarning() << "7";
 			return false;
 		}
 	}
 //	qDebug() << "sizeDirectoryRecord : " << (this->pos() - pos2);
-	if(_io.read((char *)&volume.vd2, sizeof(VolumeDescriptor2)) != sizeof(VolumeDescriptor2)) {
+	if (_io.read((char *)&volume.vd2, sizeof(VolumeDescriptor2)) != sizeof(VolumeDescriptor2)) {
 		qWarning() << "8";
 		return false;
 	}
@@ -1067,54 +1067,54 @@
 {
 	QList<quint32> dirVisisted;
 	_rootDirectory = _openDirectoryRecord(new IsoDirectory(QString(), sector, dataSize, 0), dirVisisted);
-	return _rootDirectory != NULL;
+	return _rootDirectory != nullptr;
 }
 
 IsoDirectory *IsoArchive::_openDirectoryRecord(IsoDirectory *directories, QList<quint32> &dirVisisted)
 {
 	const quint32 sector = directories->location(), dataSize = directories->size();
 	// anti-loop forever
-	if(dirVisisted.contains(sector))	return directories;
-	for(quint32 i=0 ; i<_io.sectorCountData(dataSize) ; ++i)
+	if (dirVisisted.contains(sector))	return directories;
+	for (quint32 i=0; i<_io.sectorCountData(dataSize); ++i)
 		dirVisisted.append(sector + i);
 
-	if(!_io.seekToSector(sector)) {
+	if (!_io.seekToSector(sector)) {
 		goto _openDirectoryRecordError;
 	}
 
 	{
 	const quint32 maxPos = _io.posIso() + dataSize;
 
-	while(_io.posIso() < maxPos) {
+	while (_io.posIso() < maxPos) {
 		DirectoryRecord dr;
 		const qint64 beginPos = _io.posIso();
 
-		if(_io.readIso((char *)&dr.length_dr, 1) != 1) {
+		if (_io.readIso((char *)&dr.length_dr, 1) != 1) {
 			qWarning() << "IsoArchive::_openDirectoryRecord cannot read length_dr at" << beginPos;
 			goto _openDirectoryRecordError;
 		}
 
-		if(dr.length_dr == 0) {
+		if (dr.length_dr == 0) {
 			// Next sector
 			_io.seekToSector(_io.currentSector() + 1);
 			continue;
 		}
 
-		if(_io.readIso((char *)&dr.extended_attr_record_length, 1) != 1) {
+		if (_io.readIso((char *)&dr.extended_attr_record_length, 1) != 1) {
 			qWarning() << "IsoArchive::_openDirectoryRecord cannot read extended_attr_record_length at" << beginPos;
 			goto _openDirectoryRecordError;
 		}
-		if(_io.readIso((char *)&dr.drh, sizeof(DirectoryRecordHead)) != sizeof(DirectoryRecordHead)) {
+		if (_io.readIso((char *)&dr.drh, sizeof(DirectoryRecordHead)) != sizeof(DirectoryRecordHead)) {
 			qWarning() << "IsoArchive::_openDirectoryRecord cannot read drh at" << beginPos;
 			goto _openDirectoryRecordError;
 		}
 
-		if(dr.drh.length_fi > MAX_FILENAME_LENGTH) {
+		if (dr.drh.length_fi > MAX_FILENAME_LENGTH) {
 			qWarning() << "IsoArchive::_openDirectoryRecord length filename >" << MAX_FILENAME_LENGTH << dr.drh.length_fi;
 			goto _openDirectoryRecordError;
 		}
 
-		if(!_io.seekIso(beginPos + 33)) {
+		if (!_io.seekIso(beginPos + 33)) {
 			qWarning() << "IsoArchive::_openDirectoryRecord cannot seek to" << beginPos + 33;
 			goto _openDirectoryRecordError;
 		}
@@ -1123,24 +1123,24 @@
 		int index = dr.name.lastIndexOf(SEPARATOR_2);
 		//dr.version = dr.name.mid(index+1);
 		dr.name = dr.name.left(index);
-		if(!_io.seekIso(beginPos + dr.length_dr)) {
+		if (!_io.seekIso(beginPos + dr.length_dr)) {
 			qWarning() << "IsoArchive::_openDirectoryRecord cannot seek to" << beginPos +  + dr.length_dr;
 			goto _openDirectoryRecordError;
 		}
 
 //		qDebug() << directoryRecordToString(dr) << beginPos;
 
-		if((dr.drh.file_flags >> 1) & 1) { // Directory
+		if ((dr.drh.file_flags >> 1) & 1) { // Directory
 			directories->add(new IsoDirectory(dr.name, dr.drh.location_extent, dr.drh.data_length, beginPos));
 		} else {
 			directories->add(new IsoFile(dr.name, dr.drh.location_extent, dr.drh.data_length, beginPos, &_io));
 		}
 	}
 
-	foreach(IsoDirectory *dir, directories->directories()) {
-		if(!dir->isSpecial()) {
+	for (IsoDirectory *dir : directories->directories()) {
+		if (!dir->isSpecial()) {
 //			qDebug() << "IN DIR" << dir->name() << dir->location();
-			if(!_openDirectoryRecord(dir, dirVisisted)) {
+			if (!_openDirectoryRecord(dir, dirVisisted)) {
 				qWarning() << "IsoArchive::_openDirectoryRecord cannot open directory" << dir->name() << dir->location();
 				goto _openDirectoryRecordError;
 			}
@@ -1152,31 +1152,31 @@
 	}
 _openDirectoryRecordError:
 	delete directories;
-	return NULL;
+	return nullptr;
 }
 
 /*QList<PathTable> IsoArchive::pathTable(quint32 sector, quint32 dataSize)
 {
 	QList<PathTable> pathTables;
 
-	if(!_io.seekToSector(sector)) {
+	if (!_io.seekToSector(sector)) {
 		return pathTables;
 	}
 	const quint32 maxPos = _io.posIso() + dataSize;
 
-	while(_io.posIso() < maxPos) {
+	while (_io.posIso() < maxPos) {
 		PathTable pt;
 		pt.position = _io.posIso();
 
-		if(_io.readIso((char *)&pt.length_di, 1) != 1
+		if (_io.readIso((char *)&pt.length_di, 1) != 1
 				|| _io.readIso((char *)&pt.extended_attr_record_length, 1) != 1
 				|| _io.readIso((char *)&pt.location_extent, 4) != 4
 				|| _io.readIso((char *)&pt.parent_directory_number, 2) != 2) {
 			break;
 		}
 		pt.name = _io.readIso(pt.length_di);
-		if(pt.length_di & 1) {
-			if(!_io.seekIso(_io.posIso() + 1)) {
+		if (pt.length_di & 1) {
+			if (!_io.seekIso(_io.posIso() + 1)) {
 				break;
 			}
 		}
@@ -1189,11 +1189,11 @@
 
 QByteArray IsoArchive::file(const QString &path, quint32 maxSize) const
 {
-	if (_rootDirectory == NULL) {
+	if (_rootDirectory == nullptr) {
 		return QByteArray();
 	}
 	IsoFile *file = _rootDirectory->file(path);
-	if (file == NULL) {
+	if (file == nullptr) {
 		return QByteArray();
 	}
 	return file->data(maxSize);
@@ -1201,23 +1201,23 @@
 
 QIODevice *IsoArchive::fileDevice(const QString &path) const
 {
-	if (_rootDirectory == NULL) {
-		return NULL;
+	if (_rootDirectory == nullptr) {
+		return nullptr;
 	}
 	IsoFile *file = _rootDirectory->file(path);
-	if (file == NULL) {
-		return NULL;
+	if (file == nullptr) {
+		return nullptr;
 	}
 	return file->file();
 }
 
 QByteArray IsoArchive::modifiedFile(const QString &path, quint32 maxSize) const
 {
-	if (_rootDirectory == NULL) {
+	if (_rootDirectory == nullptr) {
 		return QByteArray();
 	}
 	IsoFile *file = _rootDirectory->file(path);
-	if (file == NULL) {
+	if (file == nullptr) {
 		return QByteArray();
 	}
 	return file->modifiedData(maxSize);
@@ -1225,23 +1225,23 @@
 
 QIODevice *IsoArchive::modifiedFileDevice(const QString &path) const
 {
-	if (_rootDirectory == NULL) {
-		return NULL;
+	if (_rootDirectory == nullptr) {
+		return nullptr;
 	}
 	IsoFile *file = _rootDirectory->file(path);
-	if (file == NULL) {
-		return NULL;
+	if (file == nullptr) {
+		return nullptr;
 	}
 	return file->modifiedFile();
 }
 
 bool IsoArchive::extract(const QString &path, const QString &destination, quint32 maxSize) const
 {
-	if (_rootDirectory == NULL) {
+	if (_rootDirectory == nullptr) {
 		return false;
 	}
 	IsoFile *file = _rootDirectory->file(path);
-	if (file == NULL) {
+	if (file == nullptr) {
 		return false;
 	}
 	return file->extract(destination, maxSize);
@@ -1249,17 +1249,17 @@
 
 bool IsoArchive::extractDir(const QString &path, const QString &destination) const
 {
-	if (_rootDirectory == NULL) {
+	if (_rootDirectory == nullptr) {
 		return false;
 	}
 	IsoDirectory *dir = _rootDirectory->directory(path);
-	if (dir == NULL) {
+	if (dir == nullptr) {
 		return false;
 	}
 	QDir destDir(destination);
 	bool error = false;
 
-	foreach (IsoFile *file, dir->files()) {
+	for (IsoFile *file : dir->files()) {
 		if (!file->extract(destDir.filePath(file->name()))) {
 			error = true;
 		}
@@ -1270,7 +1270,7 @@
 
 void IsoArchive::extractAll(const QString &destination) const
 {
-	if (_rootDirectory == NULL) {
+	if (_rootDirectory == nullptr) {
 		return;
 	}
 	_extractAll(destination, _rootDirectory);
@@ -1283,12 +1283,12 @@
 	QDir dir(destination);
 	QString currentPath = dir.absolutePath().append('/');
 //	qDebug() << currentPath;
-	foreach(IsoFileOrDirectory *fileOrDir, directories->filesAndDirectories()) {
+	for (IsoFileOrDirectory *fileOrDir : directories->filesAndDirectories()) {
 		QCoreApplication::processEvents();
 
-		if(fileOrDir->isDirectory())// Directory
+		if (fileOrDir->isDirectory())// Directory
 		{
-			if(!fileOrDir->isSpecial()) {
+			if (!fileOrDir->isSpecial()) {
 				dir.mkdir(fileOrDir->name());
 				_extractAll(currentPath + fileOrDir->name(), static_cast<IsoDirectory *>(fileOrDir), currentInternalDir.isEmpty() ? fileOrDir->name() : currentInternalDir + '/' + fileOrDir->name());
 			}
@@ -1305,11 +1305,11 @@
 
 qint32 IsoArchive::diffCountSectors(const QString &path, quint32 newSize) const
 {
-	if(_rootDirectory == NULL) {
+	if (_rootDirectory == nullptr) {
 		return false;
 	}
 	IsoFileOrDirectory *isoFile = _rootDirectory->fileOrDirectory(path);
-	if(isoFile == NULL) {
+	if (isoFile == nullptr) {
 		return false;
 	}
 
@@ -1321,7 +1321,7 @@
 //	QTime t;t.start();
 
 //	IsoFile *isoFile = _rootDirectory->file(path);
-//	if(isoFile == NULL) {
+//	if (isoFile == nullptr) {
 //		return false;
 //	}
 
@@ -1334,15 +1334,15 @@
 
 bool IsoArchive::getIntegritySetPaddingAfter(IsoFileOrDirectory *prevFile, quint32 fileLocation)
 {
-	if(prevFile != NULL) {
+	if (prevFile != nullptr) {
 		prevFile->setPaddingAfter(fileLocation - prevFile->locationAfter());
 
-		if(prevFile->paddingAfter() > 0) {
+		if (prevFile->paddingAfter() > 0) {
 			QByteArray sectorHeaderEmpty("\x00\x00\x20\x00\x00\x00\x20\x00", 8),
 					sectorHeaderVoid(8, '\0');
 			int sector;
 
-			for (sector = 0 ; sector < prevFile->paddingAfter() ; ++sector) {
+			for (sector = 0; sector < prevFile->paddingAfter(); ++sector) {
 				QByteArray sectorHeaderPart = _io.sectorHeader(prevFile->locationAfter() + sector).mid(0x10, 8);
 				if (sectorHeaderPart != sectorHeaderEmpty
 						&& sectorHeaderPart != sectorHeaderVoid) {
@@ -1351,7 +1351,7 @@
 			}
 
 #ifdef ISOARCHIVE_DEBUG
-			if(sector > 0) {
+			if (sector > 0) {
 				qDebug() << QString("%1 -> %2 (%3 sectors, %4 empty) : padding after %5 (%6 sectors)")
 							.arg(prevFile->locationAfter())
 							.arg(fileLocation)
@@ -1378,7 +1378,7 @@
 
 	_getIntegrity(files, _rootDirectory);
 
-	IsoFileOrDirectory *prevFile = NULL;
+	IsoFileOrDirectory *prevFile = nullptr;
 
 	QMapIterator<quint32, IsoFileOrDirectory *> i(files);
 	while (i.hasNext()) {
@@ -1401,11 +1401,11 @@
 
 void IsoArchive::_getIntegrity(QMap<quint32, IsoFileOrDirectory *> &files, IsoDirectory *directory) const
 {
-	foreach(IsoFileOrDirectory *fileOrDir, directory->filesAndDirectories()) {
-		if(!fileOrDir->isSpecial()) {
+	for (IsoFileOrDirectory *fileOrDir : directory->filesAndDirectories()) {
+		if (!fileOrDir->isSpecial()) {
 			files.insert(fileOrDir->location(), fileOrDir);
 
-			if(fileOrDir->isDirectory()) {
+			if (fileOrDir->isDirectory()) {
 				_getIntegrity(files, static_cast<IsoDirectory *>(fileOrDir));
 			}
 		}
@@ -1421,10 +1421,10 @@
 
 void IsoArchive::getModifiedFiles(QMap<quint32, IsoFile *> &files, IsoDirectory *directory) const
 {
-	foreach(IsoFileOrDirectory *fileOrDir, directory->filesAndDirectories()) {
-		if(fileOrDir->isDirectory()) {
+	for (IsoFileOrDirectory *fileOrDir : directory->filesAndDirectories()) {
+		if (fileOrDir->isDirectory()) {
 			getModifiedFiles(files, static_cast<IsoDirectory *>(fileOrDir));
-		} else if(static_cast<IsoFile *>(fileOrDir)->isModified()) {
+		} else if (static_cast<IsoFile *>(fileOrDir)->isModified()) {
 			files.insert(fileOrDir->newLocation(), static_cast<IsoFile *>(fileOrDir));
 		}
 	}
@@ -1432,11 +1432,11 @@
 
 void IsoArchive::applyModifications(IsoDirectory *directory)
 {
-	foreach(IsoFileOrDirectory *fileOrDir, directory->filesAndDirectories()) {
-		if(fileOrDir->isDirectory()) {
+	for (IsoFileOrDirectory *fileOrDir : directory->filesAndDirectories()) {
+		if (fileOrDir->isDirectory()) {
 			applyModifications(static_cast<IsoDirectory *>(fileOrDir));
 		}
-		if(fileOrDir->isModified()) {
+		if (fileOrDir->isModified()) {
 			fileOrDir->applyModifications();
 		}
 	}
@@ -1483,7 +1483,7 @@
 	out.append(QString("\t type = %1\n").arg(vd.vd1.type, 2, 16, QChar('0')));
 	out.append(QString("\t id = %1\n").arg(QString(QByteArray((char *)vd.vd1.id, sizeof(vd.vd1.id)))));
 	out.append(QString("\t version = %1\n").arg(vd.vd1.version));
-	if(vd.vd1.type != 0xff) {
+	if (vd.vd1.type != 0xff) {
 		out.append(QString("\t system_id = %1\n").arg(QString(QByteArray((char *)vd.vd1.system_id, sizeof(vd.vd1.system_id)))));
 		out.append(QString("\t volume_id = %1\n").arg(QString(QByteArray((char *)vd.vd1.volume_id, sizeof(vd.vd1.volume_id)))));
 		out.append(QString("\t volume_space_size = %1\n").arg(vd.vd1.volume_space_size));
diff -Nru makoureactor-1.7.2/core/IsoArchiveFF7.cpp makoureactor-1.8.0/core/IsoArchiveFF7.cpp
--- makoureactor-1.7.2/core/IsoArchiveFF7.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/IsoArchiveFF7.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -20,7 +20,7 @@
 #include "core/GZIPPS.h"
 
 IsoArchiveFF7::IsoArchiveFF7(const QString &name) :
-	IsoArchive(name), _exe(NULL), _country(NoCountry)
+	IsoArchive(name), _exe(nullptr), _country(NoCountry)
 {
 }
 
@@ -37,7 +37,7 @@
 		_exe = searchExe();
 		_country = searchCountry();
 	} else {
-		_exe = NULL;
+		_exe = nullptr;
 		_country = NoCountry;
 	}
 
@@ -56,14 +56,18 @@
 
 IsoFile *IsoArchiveFF7::searchExe() const
 {
+	if (!rootDirectory()) {
+		return nullptr;
+	}
+
 	QRegExp exeName("[A-Z]{4}_\\d{3}\\.\\d{2}");
-	foreach(IsoFile *isoFile, rootDirectory()->files()) {
-		if(exeName.exactMatch(isoFile->name())) {
+	for (IsoFile *isoFile : rootDirectory()->files()) {
+		if (exeName.exactMatch(isoFile->name())) {
 			return isoFile;
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 IsoFile *IsoArchiveFF7::exe() const
@@ -164,9 +168,9 @@
 		} else if (isoFile->name().endsWith("9.00")) {
 			return Es;
 		}
-	} else if(isoFile->name().startsWith("SCUS")) {
+	} else if (isoFile->name().startsWith("SCUS")) {
 		return Us;
-	} else if(isoFile->name().startsWith("SLPS")
+	} else if (isoFile->name().startsWith("SLPS")
 			  || isoFile->name().startsWith("SCPS")
 			  || isoFile->name().startsWith("SLPM")) {
 		return Jp;
@@ -181,8 +185,11 @@
 
 IsoDirectory *IsoArchiveFF7::fieldDirectory() const
 {
+	if (!rootDirectory()) {
+		return nullptr;
+	}
 	IsoDirectory *dir = rootDirectory()->directory("FIELD");
-	if(!dir) {
+	if (!dir) {
 		dir = rootDirectory()->directory("NARITA"); // Demo
 	}
 	return dir;
@@ -190,8 +197,11 @@
 
 IsoDirectory *IsoArchiveFF7::initDirectory() const
 {
+	if (!rootDirectory()) {
+		return nullptr;
+	}
 	IsoDirectory *dir = rootDirectory()->directory("INIT");
-	if(!dir) {
+	if (!dir) {
 		dir = rootDirectory()->directory("BATTLE"); // Demo
 	}
 	return dir;
@@ -203,6 +213,67 @@
 	return dir && dir->name() == "NARITA";
 }
 
+QMap<int, QString> IsoArchiveFF7::maplist()
+{
+	if (!rootDirectory()) {
+		return QMap<int, QString>();
+	}
+	IsoDirectory *fieldDirectory = this->fieldDirectory();
+	if (!fieldDirectory) {
+		qWarning() << "IsoArchiveFF7::fieldBin field directory not found";
+		return QMap<int, QString>();
+	}
+
+	IsoFile *isoFieldBin = fieldDirectory->file("FIELD.BIN");
+	if (isoFieldBin == nullptr) {
+		qWarning() << "IsoArchiveFF7::fieldBin field.bin not found";
+		return QMap<int, QString>();
+	}
+
+	QByteArray data = isoFieldBin->modifiedData();
+	// Gzip uncompress
+	QByteArray ungzip = GZIPPS::decompress(data);
+	if (ungzip.isEmpty()) {
+		qWarning() << "IsoArchiveFF7::maplist unable to decompress" << isoFieldBin->name();
+		return QMap<int, QString>();
+	}
+
+	QMap<int, QString> orderedFields, ret;
+	int min = -1;
+
+	for (IsoFile *field : fieldDirectory->files()) {
+		if (!field->name().endsWith(".DAT")) {
+			continue;
+		}
+
+		quint32 location = field->location(), size = field->size();
+		QByteArray toSearch = QByteArray((char *)&location, 4).append((char *)&size, 4);
+
+		int index = ungzip.indexOf(toSearch);
+		if (index >= 0) {
+			orderedFields.insert(index, field->name().left(field->name().indexOf('.')).toLower());
+
+			if (min < 0 || index < min) {
+				min = index;
+			}
+		}
+	}
+
+	if (min < 0) {
+		return QMap<int, QString>();
+	}
+
+	QMapIterator<int, QString> it(orderedFields);
+
+	while (it.hasNext()) {
+		it.next();
+
+		ret.insert((it.key() - min) / 8, it.value());
+	}
+
+	return ret;
+}
+
 bool IsoArchiveFF7::updateBin(IsoFile *isoBin, const QList<IsoFile *> &filesRefByBin, int startOffset)
 {
 	QByteArray data = isoBin->modifiedData(),
@@ -213,19 +284,19 @@
 	QMap<QByteArray, QString> filesDebug; // debug
 #endif
 
-	foreach(IsoFile *file, filesRefByBin) {
-		if(file->isModified()) {
+	for (IsoFile *file : filesRefByBin) {
+		if (file->isModified()) {
 			oldSectorStart = file->location();
 			oldSize = file->size();
 			newSectorStart = file->newLocation();
 			newSize = file->newSize();
 
-			if(oldSectorStart != newSectorStart || oldSize != newSize) {
+			if (oldSectorStart != newSectorStart || oldSize != newSize) {
 				QByteArray tempBA = QByteArray((char *)&oldSectorStart, 4).append((char *)&oldSize, 4);
 				changesFieldBin.insert(tempBA, QByteArray((char *)&newSectorStart, 4).append((char *)&newSize, 4));
 #ifdef ISOARCHIVE_DEBUG
 				filesDebug.insert(tempBA, file->name());
-				if(oldSectorStart != newSectorStart) {
+				if (oldSectorStart != newSectorStart) {
 					qDebug() << "IsoArchiveFF7::updateBin File to update in" << isoBin->name() << file->name() << "position changed:" << oldSectorStart << newSectorStart << oldSize << newSize;
 				} else {
 					qDebug() << "IsoArchiveFF7::updateBin File to update in" << isoBin->name() << file->name() << "size changed:" << oldSize << newSize;
@@ -242,7 +313,7 @@
 	 */
 	// Gzip uncompress
 	ungzip = GZIPPS::decompress(data);
-	if(ungzip.isEmpty()) {
+	if (ungzip.isEmpty()) {
 		qWarning() << "IsoArchiveFF7::updateBin" << isoBin->name() << "unable to decompress";
 		return false;
 	}
@@ -251,16 +322,16 @@
 
 	QByteArray copy = ungzip;
 	QMapIterator<QByteArray, QByteArray> i(changesFieldBin);
-	while(i.hasNext()) {
+	while (i.hasNext()) {
 		i.next();
 		int count = copy.count(i.key());
-		if(count == 0) {
+		if (count == 0) {
 			qWarning() << "IsoArchiveFF7::updateBin" << isoBin->name() << "Error not found!" << i.key().toHex();
 #ifdef ISOARCHIVE_DEBUG
 			qWarning() << "IsoArchiveFF7::updateBin" << filesDebug.value(i.key());
 #endif
 			return false;
-		} else if(count == 1) {
+		} else if (count == 1) {
 			startOffset = copy.indexOf(i.key());
 			ungzip.replace(startOffset, i.key().size(), i.value());
 		} else {
@@ -268,7 +339,7 @@
 #ifdef ISOARCHIVE_DEBUG
 			qWarning() << "IsoArchiveFF7::updateBin" << filesDebug.value(i.key());
 #endif
-			if(copy.mid(startOffset).count(i.key()) == 1) {
+			if (copy.mid(startOffset).count(i.key()) == 1) {
 				ungzip.replace(copy.indexOf(i.key(), startOffset), 8, i.value());
 			} else {
 				qWarning() << "IsoArchiveFF7::updateBin" << isoBin->name() << "Error multiple occurrences 2" << i.key().toHex();
@@ -287,7 +358,7 @@
 
 	copy = GZIPPS::compress(ungzip, data.mid(4, 4), 9);
 
-	if(copy.isEmpty()) {
+	if (copy.isEmpty()) {
 		qWarning() << "IsoArchiveFF7::updateBin" << isoBin->name() << "unable to compress";
 		return false;
 	}
@@ -296,7 +367,7 @@
 	buffer->setData(copy);
 	_devicesToDelete << buffer;
 	isoBin->setModifiedFile(buffer);
-	if(isoBin->sectorCount() + isoBin->paddingAfter() < isoBin->newSectorCount()) {
+	if (isoBin->sectorCount() + isoBin->paddingAfter() < isoBin->newSectorCount()) {
 		qWarning() << "IsoArchiveFF7::updateBin" << isoBin->name() << "sector count error" << isoBin->sectorCount() << isoBin->paddingAfter() << isoBin->newSectorCount();
 		return false;
 	}
@@ -306,73 +377,76 @@
 
 IsoFile *IsoArchiveFF7::updateFieldBin()
 {
-	IsoDirectory *fieldDirectory = rootDirectory()->directory("FIELD");
-	if(!fieldDirectory) {
+	IsoDirectory *fieldDirectory = this->fieldDirectory();
+	if (!fieldDirectory) {
 		qWarning() << "IsoArchiveFF7::updateFieldBin field directory not found";
-		return NULL;
+		return nullptr;
 	}
 	IsoFile *isoFieldBin = fieldDirectory->file("FIELD.BIN");
-	if(isoFieldBin == NULL) {
+	if (isoFieldBin == nullptr) {
 		qWarning() << "IsoArchiveFF7::updateFieldBin field.bin not found";
-		return NULL;
+		return nullptr;
 	}
 
 	QList<IsoFile *> files;
-	foreach(IsoFile *file, fieldDirectory->files()) {
-		if(!file->name().endsWith(".X")
+	for (IsoFile *file : fieldDirectory->files()) {
+		if (!file->name().endsWith(".X")
 				&& file->name() != "FIELD.BIN") {
 			files.append(file);
 		}
 	}
 
-	if(updateBin(isoFieldBin, files, 0x30000)) {
+	if (updateBin(isoFieldBin, files, 0x30000)) {
 		return isoFieldBin;
 	}
-	return NULL;
+	return nullptr;
 }
 
 IsoFile *IsoArchiveFF7::updateWorldBin()
 {
+	if (!rootDirectory()) {
+		return nullptr;
+	}
 	IsoDirectory *worldDirectory = rootDirectory()->directory("WORLD");
-	if(!worldDirectory) {
+	if (!worldDirectory) {
 		qWarning() << "IsoArchiveFF7::updateWorldBin world directory not found";
-		return NULL;
+		return nullptr;
 	}
 	IsoFile *isoWorldBin = worldDirectory->file("WORLD.BIN");
-	if(isoWorldBin == NULL) {
+	if (isoWorldBin == nullptr) {
 		qWarning() << "IsoArchiveFF7::updateFieldBin world.bin not found";
-		return NULL;
+		return nullptr;
 	}
 
 	QList<IsoFile *> files;
-	foreach(IsoFile *file, worldDirectory->files()) {
-		if(file->name() != "WORLD.BIN") {
+	for (IsoFile *file : worldDirectory->files()) {
+		if (file->name() != "WORLD.BIN") {
 			files.append(file);
 		}
 	}
 
-	if(updateBin(isoWorldBin, files, 0x27000)) {
+	if (updateBin(isoWorldBin, files, 0x27000)) {
 		return isoWorldBin;
 	}
-	return NULL;
+	return nullptr;
 }
 
 IsoFile *IsoArchiveFF7::updateYamadaBin()
 {
 	IsoDirectory *initDirectory = this->initDirectory();
-	if(!initDirectory) {
+	if (!initDirectory) {
 		qWarning() << "IsoArchiveFF7::updateYamadaBin INIT directory not found";
-		return NULL;
+		return nullptr;
 	}
 	IsoFile *isoYamadaBin = initDirectory->file("YAMADA.BIN");
-	if(!isoYamadaBin) {
+	if (!isoYamadaBin) {
 		qWarning() << "IsoArchiveFF7::updateYamadaBin YAMADA.BIN file not found";
-		return NULL;
+		return nullptr;
 	}
 
-	if(isoYamadaBin->size() != 80) {
+	if (isoYamadaBin->size() != 80) {
 		qWarning() << "IsoArchiveFF7::updateYamadaBin YAMADA.BIN file wrong size" << isoYamadaBin->size();
-		return NULL;
+		return nullptr;
 	}
 
 	QByteArray yamadaData = isoYamadaBin->modifiedData();
@@ -386,33 +460,37 @@
 			  << "BATTLE/BATINI.X" << "BATTLE/SCENE.BIN"
 			  << "BATTLE/BATRES.X" << "BATTLE/CO.BIN";
 
+	if (!rootDirectory()) {
+		return nullptr;
+	}
+
 	int i = 1;
-	foreach(const QString &filename, filenames) {
+	for (const QString &filename : qAsConst(filenames)) {
 		IsoFile *isoFile = rootDirectory()->file(filename);
-		if(!isoFile) {
+		if (!isoFile) {
 			qWarning() << "IsoArchiveFF7::updateYamadaBin" << filename << "file not found";
-			return NULL;
+			return nullptr;
 		}
 
 		quint32 pos = data[i * 2],
 				size = data[i * 2 + 1];
 
-		if(isoFile->location() != pos
+		if (isoFile->location() != pos
 				|| isoFile->size() != size) {
 			qWarning() << "IsoArchiveFF7::updateYamadaBin" << filename << "wrong pos or size" << isoFile->location() << pos << "/" << isoFile->size() << size;
-			if(isoFile->location() != pos) {
-				return NULL;
+			if (isoFile->location() != pos) {
+				return nullptr;
 			}
 		}
 
-		if(isoFile->newLocation() != pos) {
+		if (isoFile->newLocation() != pos) {
 			data[i * 2] = isoFile->newLocation();
 #ifdef ISOARCHIVE_DEBUG
 			qDebug() << "IsoArchiveFF7::updateYamadaBin" << filename << "location updated" << pos << isoFile->newLocation();
 #endif
 		}
 
-		if(isoFile->newSize() != size) {
+		if (isoFile->newSize() != size) {
 			data[i * 2 + 1] = isoFile->newSize();
 #ifdef ISOARCHIVE_DEBUG
 			qDebug() << "IsoArchiveFF7::updateYamadaBin" << filename << "size updated" << size << isoFile->newSize();
@@ -438,7 +516,7 @@
 	IsoFile *isoFieldBin = updateFieldBin(),
 	        *isoWorldBin = updateWorldBin(),
 	        *isoYamadaBin = updateYamadaBin();
-	if(isoFieldBin && isoWorldBin && isoYamadaBin) {
+	if (isoFieldBin && isoWorldBin && isoYamadaBin) {
 		writeToTheMain.insert(isoFieldBin->newLocation(), isoFieldBin);
 		writeToTheMain.insert(isoWorldBin->newLocation(), isoWorldBin);
 		writeToTheMain.insert(isoYamadaBin->newLocation(), isoYamadaBin);
diff -Nru makoureactor-1.7.2/core/IsoArchiveFF7.h makoureactor-1.8.0/core/IsoArchiveFF7.h
--- makoureactor-1.7.2/core/IsoArchiveFF7.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/IsoArchiveFF7.h	2020-08-08 18:46:56.000000000 +0000
@@ -44,6 +44,7 @@
 	IsoDirectory *fieldDirectory() const;
 	IsoDirectory *initDirectory() const;
 	bool isDemo() const;
+	QMap<int, QString> maplist();
 private:
 	Q_DISABLE_COPY(IsoArchiveFF7)
 	bool updateBin(IsoFile *isoBin, const QList<IsoFile *> &filesRefByBin, int startOffset = 0);
diff -Nru makoureactor-1.7.2/core/IsoArchive.h makoureactor-1.8.0/core/IsoArchive.h
--- makoureactor-1.7.2/core/IsoArchive.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/IsoArchive.h	2020-08-08 18:46:56.000000000 +0000
@@ -230,7 +230,7 @@
 	static inline QByteArray int2Header(quint32 id) {
 		quint8 h1, h2, h3;
 
-		if(id < 4350) {
+		if (id < 4350) {
 			h1 = 0;
 			h2 = dec2Hex(id/75 + 2);
 			h3 = dec2Hex(id - 75*(hex2Dec(h2) - 2));
@@ -253,7 +253,7 @@
 		//TODO (if possible): Checksum EDC/ECC (Error Detection Code & Error Correction Code)
 		return QByteArray(SECTOR_SIZE_FOOTER, '\x00');
 	}
-	static inline void headerInfos(const QByteArray &header, quint8 *type, quint8 *mode = NULL) {
+	static inline void headerInfos(const QByteArray &header, quint8 *type, quint8 *mode = nullptr) {
 		Q_ASSERT(header.size() != SECTOR_SIZE_HEADER);
 		if (type) {
 			*type = header.at(18);
@@ -325,7 +325,7 @@
 		return _io;
 	}
 
-	bool pack(IsoArchive *destination, ArchiveObserver *control = NULL, IsoDirectory *directory = NULL);
+	bool pack(IsoArchive *destination, ArchiveObserver *control = nullptr, IsoDirectory *directory = nullptr);
 	void applyModifications(IsoDirectory *directory);
 
 	QByteArray file(const QString &path, quint32 maxSize=0) const;
@@ -365,8 +365,8 @@
 	void getModifiedFiles(QMap<quint32, IsoFile *> &files, IsoDirectory *directory) const;
 	static void repairLocationSectors(IsoDirectory *directory, IsoArchive *newIso);
 
-	bool writeFile(QIODevice *in, quint32 sectorCount = 0, ArchiveObserver *control = NULL);
-	bool copySectors(IsoArchiveIO *out, qint64 size, ArchiveObserver *control = NULL, bool repair = false);
+	bool writeFile(QIODevice *in, quint32 sectorCount = 0, ArchiveObserver *control = nullptr);
+	bool copySectors(IsoArchiveIO *out, qint64 size, ArchiveObserver *control = nullptr, bool repair = false);
 
 	IsoArchiveIO _io;
 	VolumeDescriptor volume;
diff -Nru makoureactor-1.7.2/core/Lgp.cpp makoureactor-1.8.0/core/Lgp.cpp
--- makoureactor-1.7.2/core/Lgp.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/Lgp.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -191,11 +191,11 @@
 {
 	QStringList ret;
 
-	if(_files->isEmpty()) {
+	if (_files->isEmpty()) {
 		return ret;
 	}
 
-	foreach(const LgpHeaderEntry *entry, _files->filesSortedByPosition()) {
+	for (const LgpHeaderEntry *entry : _files->filesSortedByPosition()) {
 		ret.append(entry->filePath());
 	}
 
@@ -225,7 +225,7 @@
  */
 bool Lgp::fileExists(const QString &filePath) const
 {
-	return headerEntry(filePath) != NULL;// need to open the header
+	return headerEntry(filePath) != nullptr;// need to open the header
 }
 
 /*!
@@ -235,7 +235,7 @@
 QIODevice *Lgp::file(const QString &filePath)
 {
 	LgpHeaderEntry *entry = headerEntry(filePath);// need to open the header
-	if(entry == NULL) return NULL;
+	if (entry == nullptr) return nullptr;
 
 	return entry->file(archiveIO());
 }
@@ -247,7 +247,7 @@
 QIODevice *Lgp::modifiedFile(const QString &filePath)
 {
 	LgpHeaderEntry *entry = headerEntry(filePath);// need to open the header
-	if(entry == NULL) return NULL;
+	if (entry == nullptr) return nullptr;
 
 	return entry->modifiedFile(archiveIO());
 }
@@ -261,7 +261,7 @@
 bool Lgp::setFile(const QString &filePath, QIODevice *data)
 {
 	LgpHeaderEntry *entry = headerEntry(filePath);// need to open the header
-	if(entry == NULL) return false;
+	if (entry == nullptr) return false;
 
 	entry->setModifiedFile(data);
 
@@ -277,14 +277,14 @@
 bool Lgp::addFile(const QString &filePath, QIODevice *data)
 {
 	LgpHeaderEntry *entry = headerEntry(filePath);// need to open the header
-	if(entry != NULL) return false;
+	if (entry != nullptr) return false;
 
 	entry = new LgpHeaderEntry(filePath, archiveIO()->size());
 	entry->setModifiedFile(data);
 
 	bool ret = _files->addEntry(entry);
 
-	if(!ret) {
+	if (!ret) {
 		delete entry;
 	}
 
@@ -320,21 +320,21 @@
 
 bool Lgp::openCompanyName()
 {
-	if(!isOpen()) {
+	if (!isOpen()) {
 		qWarning() << "Lgp::companyName: The device is not open for reading";
 		return false;
 	}
 
-	if(!archiveIO()->reset()) {
+	if (!archiveIO()->reset()) {
 		return false;
 	}
 	QByteArray companyData = archiveIO()->read(LGP_COMPANY_NAME_SIZE);
-	if(companyData.size() != LGP_COMPANY_NAME_SIZE) {
+	if (companyData.size() != LGP_COMPANY_NAME_SIZE) {
 		return false;
 	}
 	const char *data = companyData.constData();
 	const char *last = data + LGP_COMPANY_NAME_SIZE;
-	while(*data == '\0' && data < last) {
+	while (*data == '\0' && data < last) {
 		data++;
 	}
 	_companyName = QByteArray(data, (int)(last - data));
@@ -349,7 +349,7 @@
  */
 const QString &Lgp::companyName()
 {
-	if(_companyName.isNull()) {
+	if (_companyName.isNull()) {
 		openCompanyName();
 	}
 	return _companyName;
@@ -366,12 +366,12 @@
 
 bool Lgp::openProductName()
 {
-	if(!isOpen()) {
+	if (!isOpen()) {
 		qWarning() << "Lgp::companyName: The device is not open for reading";
 		return false;
 	}
 
-	if(!archiveIO()->seek(archiveIO()->size() - LGP_PRODUCT_NAME_SIZE)) {
+	if (!archiveIO()->seek(archiveIO()->size() - LGP_PRODUCT_NAME_SIZE)) {
 		return false;
 	}
 	_productName = archiveIO()->read(LGP_PRODUCT_NAME_SIZE);
@@ -386,7 +386,7 @@
  */
 const QString &Lgp::productName()
 {
-	if(_productName.isNull()) {
+	if (_productName.isNull()) {
 		openProductName();
 	}
 	return _productName;
@@ -408,41 +408,41 @@
 
 bool Lgp::openHeader()
 {
-	if(!archiveIO()->exists()) {
+	if (!archiveIO()->exists()) {
 		return true; // Create the file
 	}
 
-	if(!isOpen()) {
+	if (!isOpen()) {
 		qWarning() << "Lgp::openHeader: The device is not open for reading";
 		setError(OpenError);
 		return false;
 	}
 
-	if(!archiveIO()->seek(LGP_COMPANY_NAME_SIZE)) {
+	if (!archiveIO()->seek(LGP_COMPANY_NAME_SIZE)) {
 		setError(PositionError);
 		return false;
 	}
 
 	qint32 fileCount;
 
-	if(archiveIO()->read((char *)&fileCount, 4) != 4) {
+	if (archiveIO()->read((char *)&fileCount, 4) != 4) {
 		setError(ReadError);
 		return false;
 	}
 
-	if(fileCount < 0) {
+	if (fileCount < 0) {
 		setError(InvalidError);
 		return false;
 	}
 
-	if(fileCount == 0) {
+	if (fileCount == 0) {
 		return true;
 	}
 
 	const qint32 sizeToc = fileCount * 27;
 	QByteArray headerData = archiveIO()->read(sizeToc);
 
-	if(headerData.size() != sizeToc) {
+	if (headerData.size() != sizeToc) {
 		setError(ReadError);
 		return false;
 	}
@@ -452,7 +452,7 @@
 	QList<quint16> headerConflict;
 	bool hasConflict = false;
 
-	for(qint32 cur=0; cur<sizeToc; cur += 27) {
+	for (qint32 cur=0; cur<sizeToc; cur += 27) {
 		quint32 filePos;
 		quint16 conflict;
 		memcpy(&filePos, headerConstData + cur + 20, 4);
@@ -461,7 +461,7 @@
 							  headerData.mid(cur, 20),
 							  filePos));
 		headerConflict.append(conflict);
-		if(conflict != 0 && !hasConflict) {
+		if (conflict != 0 && !hasConflict) {
 			hasConflict = true;
 		}
 	}
@@ -470,10 +470,10 @@
 
 	QList< QList<LgpConflictEntry> > conflicts;
 
-	if(hasConflict) {
+	if (hasConflict) {
 
 		// Lookup table ignored
-		if(!archiveIO()->seek(archiveIO()->pos() + LOOKUP_TABLE_ENTRIES * 4)) {
+		if (!archiveIO()->seek(archiveIO()->pos() + LOOKUP_TABLE_ENTRIES * 4)) {
 			setError(PositionError);
 			return false;
 		}
@@ -481,16 +481,16 @@
 		// Open conflicts
 		quint16 conflictCount;
 
-		if(archiveIO()->read((char *)&conflictCount, 2) != 2) {
+		if (archiveIO()->read((char *)&conflictCount, 2) != 2) {
 			setError(ReadError);
 			return false;
 		}
 
-		for(qint32 i=0; i<conflictCount; ++i) {
+		for (qint32 i=0; i<conflictCount; ++i) {
 			quint16 conflictEntryCount;
 
 			// Open conflict entries
-			if(archiveIO()->read((char *)&conflictEntryCount, 2) != 2) {
+			if (archiveIO()->read((char *)&conflictEntryCount, 2) != 2) {
 				setError(ReadError);
 				return false;
 			}
@@ -498,12 +498,12 @@
 			const qint32 sizeConflicData = conflictEntryCount * 130;
 			QByteArray conflictData = archiveIO()->read(sizeConflicData);
 
-			if(conflictData.size() != sizeConflicData) {
+			if (conflictData.size() != sizeConflicData) {
 				setError(ReadError);
 				return false;
 			}
 
-			if(sizeConflicData < 0) {
+			if (sizeConflicData < 0) {
 				setError(InvalidError);
 				return false;
 			}
@@ -511,7 +511,7 @@
 			const char *conflictConstData = conflictData.constData();
 			QList<LgpConflictEntry> conflictEntries;
 
-			for(qint32 cur=0; cur<sizeConflicData; cur += 130) {
+			for (qint32 cur=0; cur<sizeConflicData; cur += 130) {
 				LgpConflictEntry conflictEntry(conflictData.mid(cur, 128));
 
 				memcpy(&conflictEntry.tocIndex, conflictConstData + cur + 128, 2);
@@ -530,26 +530,26 @@
 
 	_files->clear(); // This will delete entries
 
-	foreach(LgpHeaderEntry *entry, tocEntries) {
-		if(!_files->addEntry(entry)) {
+	for (LgpHeaderEntry *entry : tocEntries) {
+		if (!_files->addEntry(entry)) {
 			qWarning() << "Invalid toc name" << entry->fileName();
 			delete entry;
 			continue;
 		}
 
 		// Set fileDir
-		if(hasConflict) {
+		if (hasConflict) {
 			const quint16 &conflict = headerConflict.at(headerEntryID);
 
-			if(conflict != 0) {
+			if (conflict != 0) {
 				const quint16 conflictID = conflict - 1;
 				bool resolved = false;
 
-				if(conflictID < conflicts.size()) {
+				if (conflictID < conflicts.size()) {
 					const QList<LgpConflictEntry> &conflictEntries = conflicts.at(conflictID);
 
-					foreach(const LgpConflictEntry &conflictEntry, conflictEntries) {
-						if(conflictEntry.tocIndex == headerEntryID) {
+					for (const LgpConflictEntry &conflictEntry : conflictEntries) {
+						if (conflictEntry.tocIndex == headerEntryID) {
 							entry->setFileDir(conflictEntry.fileDir);
 							resolved = true;
 							break;
@@ -557,7 +557,7 @@
 					}
 				}
 
-				if(!resolved) {
+				if (!resolved) {
 					qWarning() << "Unresolved conflict for" << entry->fileName();
 				}
 			}
@@ -568,12 +568,40 @@
 	return true;
 }
 
+QByteArray Lgp::readAll(QIODevice *d, bool *ok)
+{
+	QByteArray result;
+	qint64 readBytes = d->size();
+	if (readBytes < 0) {
+		*ok = false;
+		return result;
+	}
+	// Read it all in one go.
+	// If resize fails, don't read anything.
+	readBytes -= d->pos();
+	result.resize(readBytes);
+	readBytes = d->read(result.data(), readBytes);
+
+	if (readBytes < 0) {
+		if (ok) *ok = false;
+		result.clear();
+	} else {
+		if (ok) *ok = true;
+		if (readBytes == 0) {
+			result.clear();
+		} else {
+			result.resize(int(readBytes));
+		}
+	}
+	return result;
+}
+
 /*!
  * Save the lgp into \a destination (or overwrite the
  * current archive if \a destination is empty).
  * The archive is closed after this operation.
  * \a observer is used to notify the progression of the save.
- * It can be NULL.
+ * It can be nullptr.
  */
 bool Lgp::pack(const QString &destination, ArchiveObserver *observer)
 {
@@ -581,34 +609,34 @@
 	int fileId;
 
 	// Range (0 to max) for the progression indicator
-	if(observer) {
+	if (observer) {
 		observer->setObserverMaximum(nbFiles);
 		fileId = 0;
 	}
 
 	QString destPath = destination;
 
-	if(destination.isEmpty()) {
+	if (destination.isEmpty()) {
 		QFileInfo fileInfo(*archiveIO());
 		destPath = fileInfo.absoluteFilePath();
 	}
 
 	// Temporary file (same dir as destination)
 	QFile temp(destPath + ".temp");
-	if(!temp.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
-		setError(OpenError, temp.errorString());
+	if (!temp.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+		setError(OpenTempError, temp.errorString());
 		return false;
 	}
 
 	// Writes the company name (  SQUARESOFT)
-	if(temp.write(companyName().toLatin1().rightJustified(LGP_COMPANY_NAME_SIZE, '\0', true)) != LGP_COMPANY_NAME_SIZE) {
+	if (temp.write(companyName().toLatin1().rightJustified(LGP_COMPANY_NAME_SIZE, '\0', true)) != LGP_COMPANY_NAME_SIZE) {
 		temp.remove();
 		setError(WriteError, temp.errorString());
 		return false;
 	}
 
 	// Writes the file count
-	if(temp.write((char *)&nbFiles, 4) != 4) {
+	if (temp.write((char *)&nbFiles, 4) != 4) {
 		temp.remove();
 		setError(WriteError, temp.errorString());
 		return false;
@@ -617,12 +645,12 @@
 	const quint32 posLookupTable = 16 + nbFiles * 27;
 
 	// We write data first, and toc in second
-	if(!temp.resize(posLookupTable)) {
+	if (!temp.resize(posLookupTable)) {
 		temp.remove();
 		setError(ResizeError, temp.errorString());
 		return false;
 	}
-	if(!temp.seek(posLookupTable)) {
+	if (!temp.seek(posLookupTable)) {
 		temp.remove();
 		setError(PositionError, temp.errorString());
 		return false;
@@ -633,30 +661,30 @@
 	QHash<const LgpHeaderEntry *, LgpTocEntry> tocEntries;
 	int tocIndex = 0;
 
-	for(int i=0; i<LOOKUP_TABLE_ENTRIES; ++i) {
+	for (int i=0; i<LOOKUP_TABLE_ENTRIES; ++i) {
 		// toc index initialization
-		foreach(const LgpHeaderEntry *headerEntry, _files->entries(i)) {
+		for (const LgpHeaderEntry *headerEntry : _files->entries(i)) {
 			tocEntries.insert(headerEntry, LgpTocEntry(tocIndex++));
 		}
 	}
 
 	QList< QList<LgpConflictEntry> > conflicts;
 
-	for(int i=0; i<LOOKUP_TABLE_ENTRIES; ++i) {
+	for (int i=0; i<LOOKUP_TABLE_ENTRIES; ++i) {
 		QList<LgpHeaderEntry *> headerEntries = _files->entries(i);
 
 		// Build list conflicts
-		foreach(const LgpHeaderEntry *headerEntry, headerEntries) {
+		for (const LgpHeaderEntry *headerEntry : qAsConst(headerEntries)) {
 			LgpTocEntry &tocEntry = tocEntries[headerEntry];
 
-			if(tocEntry.conflict == 0) {
+			if (tocEntry.conflict == 0) {
 				QList<LgpConflictEntry> conflictEntries;
 
-				foreach(const LgpHeaderEntry *headerEntry2, headerEntries) {
-					if(headerEntry != headerEntry2 &&
+				for (const LgpHeaderEntry *headerEntry2 : qAsConst(headerEntries)) {
+					if (headerEntry != headerEntry2 &&
 							headerEntry->fileName().compare(headerEntry2->fileName(),
 															Qt::CaseInsensitive) == 0) {
-						if(conflictEntries.isEmpty()) {
+						if (conflictEntries.isEmpty()) {
 							tocEntry.conflict = conflicts.size() + 1;
 
 							conflictEntries.append(LgpConflictEntry(headerEntry->fileDir(),
@@ -672,7 +700,7 @@
 					}
 				}
 
-				if(!conflictEntries.isEmpty()) {
+				if (!conflictEntries.isEmpty()) {
 					conflicts.append(conflictEntries);
 				}
 			}
@@ -685,7 +713,7 @@
 	}
 
 	// Write Lookup Table
-	if(temp.write((char *)lookupTable, sizeof(lookupTable)) != sizeof(lookupTable)) {
+	if (temp.write((char *)lookupTable, sizeof(lookupTable)) != sizeof(lookupTable)) {
 		temp.remove();
 		setError(WriteError, temp.errorString());
 		return false;
@@ -696,17 +724,17 @@
 	const quint16 conflictCount = conflicts.size();
 	conflictsData.append((char *)&conflictCount, 2);
 
-	foreach(const QList<LgpConflictEntry> &conflict, conflicts) {
+	for (const QList<LgpConflictEntry> &conflict : conflicts) {
 		quint16 conflictEntryCount = conflict.size();
 		conflictsData.append((char *)&conflictEntryCount, 2);
 
-		foreach(const LgpConflictEntry &conflictEntry, conflict) {
+		for (const LgpConflictEntry &conflictEntry : conflict) {
 			conflictsData.append(conflictEntry.fileDir.toLatin1().leftJustified(128, '\0', true));
 			conflictsData.append((char *)&conflictEntry.tocIndex, 2);
 		}
 	}
 
-	if(temp.write(conflictsData) != conflictsData.size()) {
+	if (temp.write(conflictsData) != conflictsData.size()) {
 		temp.remove();
 		setError(WriteError, temp.errorString());
 		return false;
@@ -715,9 +743,9 @@
 	LgpToc newToc;
 
 	// Write files
-	foreach(const LgpHeaderEntry *lgpEntry, _files->filesSortedByPosition()) {
+	for (const LgpHeaderEntry *lgpEntry : _files->filesSortedByPosition()) {
 		// Cancels if requested
-		if(observer && observer->observerWasCanceled()) {
+		if (observer && observer->observerWasCanceled()) {
 			temp.remove();
 			setError(AbortError);
 			return false;
@@ -727,7 +755,7 @@
 		const QString &path = lgpEntry->filePath();
 
 		// Notify the progression
-		if(observer)	observer->setObserverValue(fileId++);
+		if (observer)	observer->setObserverValue(fileId++);
 
 		// Changes the header info
 		LgpHeaderEntry *newEntry = new LgpHeaderEntry(*lgpEntry);
@@ -738,34 +766,39 @@
 
 		// Writes the file
 		QIODevice *io = modifiedFile(path);
-		if(io == NULL) {
+		if (io == nullptr) {
 			temp.remove();
 			setError(FileNotFoundError, QT_TRANSLATE_NOOP(Lgp, QString("File '%1' not found")
 														  .arg(path).toLatin1().data()));
 			return false;
 		}
-		if(!io->open(QIODevice::ReadOnly)) {
+		if (!io->open(QIODevice::ReadOnly)) {
 			temp.remove();
-			setError(OpenError, temp.errorString());
+			setError(OpenError, io->errorString());
 			return false;
 		}
 		// File: writes the name
-		if(temp.write(lgpEntry->fileName().toLatin1().leftJustified(20, '\0', true)) != 20) {
+		if (temp.write(lgpEntry->fileName().toLatin1().leftJustified(20, '\0', true)) != 20) {
 			temp.remove();
 			setError(WriteError, temp.errorString());
 			return false;
 		}
 		// File: writes the size
-		const QByteArray data = io->readAll();
+		bool ok;
+		const QByteArray data = readAll(io, &ok);
+		if (!ok) {
+			setError(ReadError, io->errorString());
+			return false;
+		}
 		io->close();
 		const qint64 size = data.size();
-		if(temp.write((char *)&size, 4) != 4) {
+		if (temp.write((char *)&size, 4) != 4) {
 			temp.remove();
 			setError(WriteError, temp.errorString());
 			return false;
 		}
 		// File: writes data
-		if(temp.write(data) != size) {
+		if (temp.write(data) != size) {
 			temp.remove();
 			setError(WriteError, temp.errorString());
 			return false;
@@ -773,16 +806,16 @@
 	}
 
 	// Writes the product name (FINAL FANTASY7)
-	if(temp.write(productName().toLatin1().leftJustified(LGP_PRODUCT_NAME_SIZE, '\0', true)) != LGP_PRODUCT_NAME_SIZE) {
+	if (temp.write(productName().toLatin1().leftJustified(LGP_PRODUCT_NAME_SIZE, '\0', true)) != LGP_PRODUCT_NAME_SIZE) {
 		temp.remove();
 		setError(WriteError, temp.errorString());
 		return false;
 	}
 
-	if(observer)	observer->setObserverValue(fileId);
+	if (observer)	observer->setObserverValue(fileId);
 
 	// Go back to the header
-	if(!temp.seek(16)) {
+	if (!temp.seek(16)) {
 		temp.remove();
 		setError(PositionError, temp.errorString());
 		return false;
@@ -790,8 +823,8 @@
 
 	// Header: TOC
 	QByteArray tocData;
-	for(int i=0; i<LOOKUP_TABLE_ENTRIES; ++i) {
-		foreach(const LgpHeaderEntry *headerEntry, newToc.entries(i)) {
+	for (int i=0; i<LOOKUP_TABLE_ENTRIES; ++i) {
+		for (const LgpHeaderEntry *headerEntry : newToc.entries(i)) {
 			tocData.append(headerEntry->fileName().toLower().toLatin1().leftJustified(20, '\0', true));
 			quint32 filePos = headerEntry->filePosition();
 			tocData.append((char *)&filePos, 4);
@@ -801,17 +834,17 @@
 		}
 	}
 
-	if(temp.write(tocData) != tocData.size()) {
+	if (temp.write(tocData) != tocData.size()) {
 		temp.remove();
 		setError(WriteError, temp.errorString());
 		return false;
 	}
 
-	if(observer) {
+	if (observer) {
 		// Infinite...
 		observer->setObserverValue(-1);
 		// Cancel if requested (last chance)
-		if(observer->observerWasCanceled()) {
+		if (observer->observerWasCanceled()) {
 			temp.remove();
 			setError(AbortError);
 			return false;
@@ -821,19 +854,41 @@
 	archiveIO()->close();
 
 	// Remove destination file
-	if(QFile::exists(destPath)) {
+	if (QFile::exists(destPath)) {
 		QFile destFile(destPath);
-		if(!destFile.remove()) {
-			temp.remove();
-			setError(RemoveError, destFile.errorString());
-			return false;
+		if (!destFile.remove()) {
+			bool removed = false;
+
+			while (observer->observerRetry(QObject::tr("Cannot remove destination archive"))) {
+				if (destFile.remove()) {
+					removed = true;
+					break;
+				}
+			}
+
+			if (!removed) {
+				temp.remove();
+				setError(RemoveError, destFile.errorString());
+				return false;
+			}
 		}
 	}
 	// Move temp file to destination
-	if(!temp.rename(destPath)) {
-		temp.remove();
-		setError(RenameError, temp.errorString());
-		return false;
+	if (!temp.rename(destPath)) {
+		bool renamed = false;
+
+		while (observer->observerRetry(QObject::tr("Cannot rename temporary file to destination path"))) {
+			if (temp.rename(destPath)) {
+				renamed = true;
+				break;
+			}
+		}
+
+		if (!renamed) {
+			temp.remove();
+			setError(RenameError, temp.errorString());
+			return false;
+		}
 	}
 
 	// Now the archive is located in "destination"
diff -Nru makoureactor-1.7.2/core/Lgp.h makoureactor-1.8.0/core/Lgp.h
--- makoureactor-1.7.2/core/Lgp.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/Lgp.h	2020-08-08 18:46:56.000000000 +0000
@@ -61,6 +61,7 @@
 		ReadError,
 		WriteError,
 		OpenError,
+		OpenTempError,
 		AbortError,
 		RemoveError,
 		RenameError,
@@ -92,7 +93,7 @@
 	void setCompanyName(const QString &companyName);
 	const QString &productName();
 	void setProductName(const QString &productName);
-	bool pack(const QString &destination=QString(), ArchiveObserver *observer=NULL);
+	bool pack(const QString &destination=QString(), ArchiveObserver *observer=nullptr);
 	LgpError error() const;
 	void unsetError();
 private:
@@ -102,6 +103,7 @@
 	bool openProductName();
 	LgpHeaderEntry *headerEntry(const QString &filePath) const;
 	void setError(LgpError error, const QString &errorString=QString());
+	static QByteArray readAll(QIODevice *d, bool *ok);
 
 	QString _companyName;
 	LgpToc *_files;
diff -Nru makoureactor-1.7.2/core/Lgp_p.cpp makoureactor-1.8.0/core/Lgp_p.cpp
--- makoureactor-1.7.2/core/Lgp_p.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/Lgp_p.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -24,16 +24,16 @@
 
 LgpHeaderEntry::LgpHeaderEntry(const QString &fileName, quint32 filePosition) :
 	_fileName(fileName), _filePosition(filePosition),
-	_hasFileSize(false), _io(NULL), _newIO(NULL)
+	_hasFileSize(false), _io(nullptr), _newIO(nullptr)
 {
 }
 
 LgpHeaderEntry::~LgpHeaderEntry()
 {
-	if(_io != NULL) {
+	if (_io != nullptr) {
 		_io->deleteLater();
 	}
-	if(_newIO != NULL) {
+	if (_newIO != nullptr) {
 		_newIO->deleteLater();
 	}
 }
@@ -62,7 +62,7 @@
 
 qint64 LgpHeaderEntry::fileSize() const
 {
-	if(_hasFileSize) {
+	if (_hasFileSize) {
 		return _fileSize;
 	}
 	return -1;
@@ -70,7 +70,7 @@
 
 void LgpHeaderEntry::setFileName(const QString &fileName)
 {
-	if(fileName.size() > 20) {
+	if (fileName.size() > 20) {
 		_fileName = fileName.left(20);
 	} else {
 		_fileName = fileName;
@@ -79,7 +79,7 @@
 
 void LgpHeaderEntry::setFileDir(const QString &fileDir)
 {
-	if(fileDir.size() > 128) {
+	if (fileDir.size() > 128) {
 		_fileDir = fileDir.left(128);
 	} else {
 		_fileDir = fileDir;
@@ -90,7 +90,7 @@
 {
 	int index = filePath.lastIndexOf('/');
 
-	if(index < 0) {
+	if (index < 0) {
 		setFileName(filePath);
 	} else {
 		setFileDir(filePath.left(index));
@@ -111,7 +111,7 @@
 
 QIODevice *LgpHeaderEntry::file(QIODevice *lgp)
 {
-	if(_io) {
+	if (_io) {
 		_io->close();
 		return _io;
 	} else {
@@ -121,7 +121,7 @@
 
 QIODevice *LgpHeaderEntry::modifiedFile(QIODevice *lgp)
 {
-	if(_newIO) {
+	if (_newIO) {
 		_newIO->close();
 		return _newIO;
 	} else {
@@ -141,21 +141,21 @@
 
 QIODevice *LgpHeaderEntry::createFile(QIODevice *lgp)
 {
-	if(!lgp->seek(filePosition())) {
-		return NULL;
+	if (!lgp->seek(filePosition())) {
+		return nullptr;
 	}
 	QByteArray name = lgp->read(20);
-	if(name.size() != 20) {
-		return NULL;
+	if (name.size() != 20) {
+		return nullptr;
 	}
-	if(QString(name).compare(fileName(), Qt::CaseInsensitive) != 0) {
+	if (QString(name).compare(fileName(), Qt::CaseInsensitive) != 0) {
 		qWarning() << "different name";
-		return NULL;
+		return nullptr;
 	}
 
 	quint32 size;
-	if(lgp->read((char *)&size, 4) != 4) {
-		return NULL;
+	if (lgp->read((char *)&size, 4) != 4) {
+		return nullptr;
 	}
 
 	setFileSize(size);
@@ -171,7 +171,7 @@
 }
 
 bool LgpIO::open(OpenMode mode) {
-	if(mode.testFlag(QIODevice::Append)
+	if (mode.testFlag(QIODevice::Append)
 			|| mode.testFlag(QIODevice::Truncate)) {
 		return false;
 	}
@@ -185,9 +185,9 @@
 
 qint64 LgpIO::readData(char *data, qint64 maxSize)
 {
-	if(_lgp->seek(_header->filePosition() + 24 + pos())) {
+	if (_lgp->seek(_header->filePosition() + 24 + pos())) {
 		qint64 size = this->size();
-		if(size < 0) {
+		if (size < 0) {
 			return -1;
 		}
 		return _lgp->read(data, qMin(maxSize, size - pos()));
@@ -200,9 +200,9 @@
  */
 qint64 LgpIO::writeData(const char *data, qint64 maxSize)
 {
-	if(_lgp->seek(_header->filePosition() + 24 + pos())) {
+	if (_lgp->seek(_header->filePosition() + 24 + pos())) {
 		qint64 size = this->size();
-		if(size < 0) {
+		if (size < 0) {
 			return -1;
 		}
 		return _lgp->write(data, qMin(maxSize, size - pos()));
@@ -221,7 +221,7 @@
 
 LgpToc::LgpToc(const LgpToc &other)
 {
-	foreach(LgpHeaderEntry *headerEntry, other.table()) {
+	for (LgpHeaderEntry *headerEntry : other.table()) {
 		addEntry(new LgpHeaderEntry(*headerEntry));
 	}
 }
@@ -234,11 +234,11 @@
 bool LgpToc::addEntry(LgpHeaderEntry *entry)
 {
 	qint32 v = lookupValue(entry->fileName());
-	if(v < 0) {
+	if (v < 0) {
 		return false;
 	}
 
-	if(contains(entry->fileName())) {
+	if (contains(entry->fileName())) {
 		return false;
 	}
 
@@ -250,8 +250,9 @@
 LgpHeaderEntry *LgpToc::entry(const QString &filePath) const
 {
 	qint32 v = lookupValue(filePath);
-	if(v < 0) {
-		return NULL; // invalid file name
+	if (v < 0) {
+		qDebug() << "LgpToc::entry invalid lookup" << filePath;
+		return nullptr; // invalid file name
 	}
 
 	return entry(filePath, v);
@@ -274,24 +275,24 @@
 
 LgpHeaderEntry *LgpToc::entry(const QString &filePath, quint16 id) const
 {
-	foreach(LgpHeaderEntry *entry, entries(id)) {
-		if(filePath.compare(entry->filePath(), Qt::CaseInsensitive) == 0) {
+	for (LgpHeaderEntry *entry : entries(id)) {
+		if (filePath.compare(entry->filePath(), Qt::CaseInsensitive) == 0) {
 			return entry;
 		}
 	}
 
-	return NULL; // file not found
+	return nullptr; // file not found
 }
 
 bool LgpToc::removeEntry(const QString &filePath)
 {
 	qint32 v = lookupValue(filePath);
-	if(v < 0) {
+	if (v < 0) {
 		return false; // invalid file name
 	}
 
 	LgpHeaderEntry *e = entry(filePath);
-	if(e == NULL) {
+	if (e == nullptr) {
 		return false; // file not found
 	}
 
@@ -312,13 +313,13 @@
 	// Get file
 
 	qint32 v = lookupValue(filePath);
-	if(v < 0) {
+	if (v < 0) {
 		qWarning() << "LgpToc::renameEntry invalid filename" << filePath;
 		return false; // invalid file name
 	}
 
 	LgpHeaderEntry *e = entry(filePath, v);
-	if(e == NULL) {
+	if (e == nullptr) {
 		qWarning() << "LgpToc::renameEntry file not found" << filePath;
 		return false; // file not found
 	}
@@ -326,19 +327,19 @@
 	// Get new file
 
 	qint32 newV = lookupValue(newFilePath);
-	if(newV < 0) {
+	if (newV < 0) {
 		qWarning() << "LgpToc::renameEntry invalid new filename" << newFilePath;
 		return false; // invalid file name
 	}
 
-	if(entry(newFilePath, newV) != NULL) {
+	if (entry(newFilePath, newV) != nullptr) {
 		qWarning() << "LgpToc::renameEntry new file exists" << newFilePath;
 		return false; // file found
 	}
 
 	// Move file
 
-	if(_header.remove(v, e) <= 0) {
+	if (_header.remove(v, e) <= 0) {
 		qWarning() << "LgpToc::renameEntry cannot remove entry";
 		return false;
 	}
@@ -351,7 +352,7 @@
 
 bool LgpToc::contains(const QString &filePath) const
 {
-	return entry(filePath) != NULL;
+	return entry(filePath) != nullptr;
 }
 
 void LgpToc::clear()
@@ -375,7 +376,7 @@
 {
 	QMultiMap<quint32, const LgpHeaderEntry *> ret;
 
-	foreach(const LgpHeaderEntry *entry, _header) {
+	for (const LgpHeaderEntry *entry : _header) {
 		ret.insert(entry->filePosition(), entry);
 	}
 
@@ -384,9 +385,9 @@
 
 LgpToc &LgpToc::operator=(const LgpToc &other)
 {
-	if(this != &other) {
+	if (this != &other) {
 		clear();
-		foreach(LgpHeaderEntry *headerEntry, other.table()) {
+		for (LgpHeaderEntry *headerEntry : other.table()) {
 			addEntry(new LgpHeaderEntry(*headerEntry));
 		}
 	}
@@ -398,25 +399,25 @@
 {
 	int index = filePath.lastIndexOf('/');
 
-	if(index != -1) {
+	if (index != -1) {
 		index++;
 	} else {
 		index = 0;
 	}
 
-	if(filePath.size() < index + 2) {
+	if (filePath.size() < index + 2) {
 		return -1;
 	}
 
 	char c1 = lookupValue(filePath.at(index));
 
-	if(c1 > LOOKUP_VALUE_MAX) {
+	if (c1 > LOOKUP_VALUE_MAX) {
 		return -1;
 	}
 
 	char c2 = lookupValue(filePath.at(index + 1));
 
-	if(c2 > LOOKUP_VALUE_MAX) {
+	if (c2 > LOOKUP_VALUE_MAX) {
 		return -1;
 	}
 
@@ -427,16 +428,16 @@
 {
 	char c = qc.toLower().toLatin1();
 
-	if(c == '.') {
+	if (c == '.') {
 		return 255;
 	}
 
-	if(c >= '0' && c <= '9') {
+	if (c >= '0' && c <= '9') {
 		c += 'a' - '0';
 	}
 
-	if(c == '_') c = 'k';
-	if(c == '-') c = 'l';
+	if (c == '_') c = 'k';
+	if (c == '-') c = 'l';
 
 	return c - 'a';
 }
diff -Nru makoureactor-1.7.2/core/LZS.cpp makoureactor-1.8.0/core/LZS.cpp
--- makoureactor-1.7.2/core/LZS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/LZS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -40,21 +40,24 @@
 
 const QByteArray &LZS::decompress(const char *data, int fileSize, int max)
 {
-	int curResult=0, sizeAlloc=max+10;
+	int sizeAlloc=max+10;
 	quint16 curBuff=4078, adresse, premOctet=0, i, length;
 	const quint8 *fileData = (const quint8 *)data;
 	const quint8 *endFileData = fileData + fileSize;
 
 	// Impossible case
-	if(quint64(sizeAlloc) > 2000 * quint64(fileSize)) {
+	if (quint64(sizeAlloc) > 2000 * quint64(fileSize)) {
 		qWarning() << "LZS::decompress impossible ratio case" << sizeAlloc << 2000 * quint64(fileSize);
 		result.clear();
 		return result;
 	}
 
-	if(result.size() < sizeAlloc) {
+	// Internal buffer is still allocated using this method instead of clear
+	result.resize(0);
+
+	if (result.capacity() < sizeAlloc) {
 		try {
-			result.resize(sizeAlloc);
+			result.reserve(sizeAlloc);
 		} catch(std::bad_alloc) {
 			result.clear();
 			return result;
@@ -65,20 +68,18 @@
 
 	forever
 	{
-		if(((premOctet >>= 1) & 256) == 0) {
+		if (((premOctet >>= 1) & 256) == 0) {
 			premOctet = *fileData++ | 0xff00;//On récupère le premier octet puis on avance d'un octet
 		}
 
-		if(fileData >= endFileData || curResult >= max) {
-			result.truncate(curResult);
-			return result;//Fini !
+		if (fileData >= endFileData || result.size() >= max) {
+			return result; // Done
 		}
 
-		if(premOctet & 1)
+		if (premOctet & 1)
 		{
-			result[curResult] = text_buf[curBuff] = *fileData++;//On récupère l'octet (qui n'est pas compressé) et on le sauvegarde dans la chaine finale (result) et dans le buffer. Et bien sûr on fait avancer les curseurs d'un octet.
+			result.append(text_buf[curBuff] = *fileData++);//On récupère l'octet (qui n'est pas compressé) et on le sauvegarde dans la chaine finale (result) et dans le buffer. Et bien sûr on fait avancer les curseurs d'un octet.
 			curBuff = (curBuff + 1) & 4095;//Le curseur du buffer doit toujours être entre 0 et 4095
-			++curResult;
 		}
 		else
 		{
@@ -92,11 +93,10 @@
 			adresse |= (length & 0xF0) << 4;//on récupère l'adresse dans les deux octets (qui sont "compressés")
 			length = (length & 0xF) + 2 + adresse;
 
-			for(i=adresse ; i<=length ; ++i)
+			for (i=adresse; i<=length; ++i)
 			{
-				result[curResult] = text_buf[curBuff] = text_buf[i & 4095];//On va chercher l'octet (qui est décompressé) dans le buffer à l'adresse indiquée puis on le sauvegarde dans la chaine finale et le buffer.
+				result.append(text_buf[curBuff] = text_buf[i & 4095]);//On va chercher l'octet (qui est décompressé) dans le buffer à l'adresse indiquée puis on le sauvegarde dans la chaine finale et le buffer.
 				curBuff = (curBuff + 1) & 4095;
-				++curResult;
 			}
 		}
 	}
@@ -109,14 +109,17 @@
 
 const QByteArray &LZS::decompressAll(const char *data, int fileSize)
 {
-	int curResult=0, sizeAlloc=fileSize*5;
-	quint16 curBuff=4078, adresse, premOctet=0, i, length;
+	int sizeAlloc=fileSize*5;
+	quint16 curBuff=4078, offset, premOctet=0, i, length;
 	const quint8 *fileData = (const quint8 *)data;
 	const quint8 *endFileData = fileData + fileSize;
 
-	if(result.size() < sizeAlloc) {
+	// Internal buffer is still allocated using this method instead of clear
+	result.resize(0);
+
+	if (result.capacity() < sizeAlloc) {
 		try {
-			result.resize(sizeAlloc);
+			result.reserve(sizeAlloc);
 		} catch(std::bad_alloc) {
 			result.clear();
 			return result;
@@ -127,38 +130,35 @@
 
 	forever
 	{
-		if(((premOctet >>= 1) & 256) == 0) {
+		if (((premOctet >>= 1) & 256) == 0) {
 			premOctet = *fileData++ | 0xff00;//On récupère le premier octet puis on avance d'un octet
 		}
 
-		if(fileData >= endFileData) {
-			result.truncate(curResult);
-			return result;//Fini !
+		if (fileData >= endFileData) {
+			return result; // Done
 		}
 
-		if(premOctet & 1)
+		if (premOctet & 1)
 		{
-			result[curResult] = text_buf[curBuff] = *fileData++;//On récupère l'octet (qui n'est pas compressé) et on le sauvegarde dans la chaine finale (result) et dans le buffer. Et bien sûr on fait avancer les curseurs d'un octet.
+			result.append(text_buf[curBuff] = *fileData++);//On récupère l'octet (qui n'est pas compressé) et on le sauvegarde dans la chaine finale (result) et dans le buffer. Et bien sûr on fait avancer les curseurs d'un octet.
 			curBuff = (curBuff + 1) & 4095;//Le curseur du buffer doit toujours être entre 0 et 4095
-			++curResult;
 		}
 		else
 		{
 //			quint16 twoBytes = *((const quint16 *)fileData);
-//			adresse = (twoBytes & 0x00FF) | ((twoBytes & 0xF000) >> 4);
-//			length = ((twoBytes & 0x0F00) >> 8) + 2 + adresse;
+//			offset = (twoBytes & 0x00FF) | ((twoBytes & 0xF000) >> 4);
+//			length = ((twoBytes & 0x0F00) >> 8) + 2 + offset;
 //			fileData += 2;
 
-			adresse = *fileData++;
+			offset = *fileData++;
 			length = *fileData++;
-			adresse |= (length & 0xF0) << 4;//on récupère l'adresse dans les deux octets (qui sont "compressés")
-			length = (length & 0xF) + 2 + adresse;
+			offset |= (length & 0xF0) << 4;//on récupère l'offset dans les deux octets (qui sont "compressés")
+			length = (length & 0xF) + 2 + offset;
 
-			for(i=adresse ; i<=length ; ++i)
+			for (i=offset; i<=length; ++i)
 			{
-				result[curResult] = text_buf[curBuff] = text_buf[i & 4095];//On va chercher l'octet (qui est décompressé) dans le buffer à l'adresse indiquée puis on le sauvegarde dans la chaine finale et le buffer.
+				result.append(text_buf[curBuff] = text_buf[i & 4095]);//On va chercher l'octet (qui est décompressé) dans le buffer à l'adresse indiquée puis on le sauvegarde dans la chaine finale et le buffer.
 				curBuff = (curBuff + 1) & 4095;
-				++curResult;
 			}
 		}
 	}
@@ -207,7 +207,7 @@
 	{
 		if (cmp >= 0)
 		{
-			if(rson[p] != 4096)
+			if (rson[p] != 4096)
 			{
 				p = rson[p];
 			}
@@ -220,7 +220,7 @@
 		}
 		else
 		{
-			if(lson[p] != 4096)
+			if (lson[p] != 4096)
 			{
 				p = lson[p];
 			}
@@ -232,15 +232,15 @@
 			}
 		}
 		
-		for(i=1 ; i<18 ; i++)
+		for (i=1; i<18; i++)
 		{
-			if((cmp = key[i] - text_buf[p + i]) != 0)	break;
+			if ((cmp = key[i] - text_buf[p + i]) != 0)	break;
 		}
 
-		if(i > match_length)
+		if (i > match_length)
 		{
 			match_position = p;
-			if((match_length = i) >= 18)	break;
+			if ((match_length = i) >= 18)	break;
 		}
 	}
 
@@ -251,7 +251,7 @@
 	dad[lson[p]] = r;
 	dad[rson[p]] = r;
 
-	if(rson[dad[p]] == p)
+	if (rson[dad[p]] == p)
 	{
 		rson[dad[p]] = r;
 	}
@@ -265,26 +265,26 @@
 void LZS::DeleteNode(qint32 p)//deletes node p from tree
 {
 	qint32 q;
-	if(dad[p] == 4096)	return;//not in tree
+	if (dad[p] == 4096)	return;//not in tree
 
-	if(rson[p] == 4096)
+	if (rson[p] == 4096)
 	{
 		q = lson[p];
 	}
-	else if(lson[p] == 4096)
+	else if (lson[p] == 4096)
 	{
 		q = rson[p];
 	}
 	else
 	{
 		q = lson[p];
-		if(rson[q] != 4096)
+		if (rson[q] != 4096)
 		{
 			do
 			{
 				q = rson[q];
 			}
-			while(rson[q] != 4096);
+			while (rson[q] != 4096);
 			
 			rson[dad[q]] = lson[q];
 			dad[lson[q]] = dad[q];
@@ -296,7 +296,7 @@
 	}
 	dad[q] = dad[p];
 	
-	if(rson[dad[p]] == p)
+	if (rson[dad[p]] == p)
 	{
 		rson[dad[p]] = q;
 	}
@@ -332,7 +332,7 @@
 	unsigned char code_buf[17], mask;
 	const char *dataEnd = data + sizeData;
 
-	if(result.size() < sizeAlloc) {
+	if (result.size() < sizeAlloc) {
 		result.resize(sizeAlloc);
 	}
 	
@@ -345,8 +345,8 @@
 	Also, dad[i] is the parent of node i. These are initialized to 4096 which stands for 'not used.'
 	For i = 0 to 255, rson[4097 + i] is the root of the tree for strings that begin with character i. These are initialized to 4096. Note there are 256 trees. */
 
-	for(i=4097 ; i<=4352 ; ++i)	rson[i] = 4096;
-	for(i=0 ; i<4096 ; ++i)	dad[i] = 4096;
+	for (i=4097; i<=4352; ++i)	rson[i] = 4096;
+	for (i=0; i<4096; ++i)	dad[i] = 4096;
 
 	code_buf[0] = 0;//code_buf[1..16] saves eight units of code, and code_buf[0] works as eight flags, "1" representing that the unit is an unencoded letter (1 byte), "0" a position-and-length pair (2 bytes). Thus, eight units require at most 16 bytes of code.
 
@@ -355,28 +355,28 @@
 	s = 0;
 	r = 4078;
 
-//	for(i=s ; i<r ; ++i)
+//	for (i=s; i<r; ++i)
 //		text_buf[i] = '\x0';//Clear the buffer with  any character that will appear often.
 	memset(text_buf, 0, r);
 
-	for(len=0 ; len<18 && data<dataEnd ; ++len)
+	for (len=0; len<18 && data<dataEnd; ++len)
 		text_buf[r + len] = *data++;//Read 18 bytes into the last 18 bytes of the buffer
-	if(/* (textsize =  */len/* ) */ == 0) {
+	if (/* (textsize =  */len/* ) */ == 0) {
 		result.clear();
 		return result;//text of size zero
 	}
 
-	for(i=1 ; i<=18 ; ++i)
+	for (i=1; i<=18; ++i)
 		InsertNode(r - i);//Insert the 18 strings, each of which begins with one or more 'space' characters.  Note the order in which these strings are inserted.  This way, degenerate trees will be less likely to occur.
 	
 	InsertNode(r);//Finally, insert the whole string just read.  The global variables match_length and match_position are set.
 
 	do
 	{
-		if(match_length > len)
+		if (match_length > len)
 			match_length = len;//match_length may be spuriously long near the end of text.
 		
-		if(match_length <= 2)
+		if (match_length <= 2)
 		{
 			match_length = 1;//Not long enough match.  Send one byte.
 			code_buf[0] |= mask;//'send one byte' flag
@@ -388,9 +388,9 @@
 			code_buf[code_buf_ptr++] = (unsigned char) (((match_position >> 4) & 0xf0) | (match_length - (2 + 1)));//Send position and length pair. Note match_length > 2.
 		}
 		
-		if((mask <<= 1) == 0)//Shift mask left one bit.
+		if ((mask <<= 1) == 0)//Shift mask left one bit.
 		{
-//			for(i=0 ; i<code_buf_ptr ; ++i)//Send at most 8 units of
+//			for (i=0; i<code_buf_ptr; ++i)//Send at most 8 units of
 //				result.append(code_buf[i]);//code together
 			result.replace(curResult, code_buf_ptr, (char *)code_buf, code_buf_ptr);
 			curResult += code_buf_ptr;
@@ -399,13 +399,13 @@
 		}
 		
 		int last_match_length = match_length;
-		for(i=0 ; i < last_match_length && data<dataEnd ; ++i)
+		for (i=0; i < last_match_length && data<dataEnd; ++i)
 		{
 			c = *data++;
 			DeleteNode(s);//Delete old strings and
 			text_buf[s] = c;//read new bytes
 			
-			if(s < 17)
+			if (s < 17)
 				text_buf[s + 4096] = c;//If the position is near the end of buffer, extend the buffer to make string comparison easier.
 			
 			s = (s + 1) & (4095);
@@ -414,21 +414,21 @@
 			InsertNode(r);//Register the string in text_buf[r..r+18-1]
 		}
 
-		while(i++ < last_match_length)//After the end of text,
+		while (i++ < last_match_length)//After the end of text,
 		{
 			DeleteNode(s);//no need to read, but
 			s = (s + 1) & (4095);
 			r = (r + 1) & (4095);
-			if(--len)
+			if (--len)
 				InsertNode(r);//buffer may not be empty.
 		}
 
 	}
-	while(len > 0);//until length of string to be processed is zero
+	while (len > 0);//until length of string to be processed is zero
 
-	if(code_buf_ptr > 1)//Send remaining code.
+	if (code_buf_ptr > 1)//Send remaining code.
 	{
-//		for(i = 0; i < code_buf_ptr ; ++i)
+//		for (i = 0; i < code_buf_ptr; ++i)
 //			result.append(code_buf[i]);
 		result.replace(curResult, code_buf_ptr, (char *)code_buf, code_buf_ptr);
 		curResult += code_buf_ptr;
diff -Nru makoureactor-1.7.2/core/PsColor.cpp makoureactor-1.8.0/core/PsColor.cpp
--- makoureactor-1.7.2/core/PsColor.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/PsColor.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -16,13 +16,3 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 #include "PsColor.h"
-
-quint16 PsColor::toPsColor(const QRgb &color)
-{
-	return (qRound(qRed(color)/COEFF_COLOR) & 31) | ((qRound(qGreen(color)/COEFF_COLOR) & 31) << 5) | ((qRound(qBlue(color)/COEFF_COLOR) & 31) << 10) | ((qAlpha(color)==255) << 15);
-}
-
-QRgb PsColor::fromPsColor(quint16 color, bool useAlpha)
-{
-	return qRgba(qRound((color & 31)*COEFF_COLOR), qRound((color>>5 & 31)*COEFF_COLOR), qRound((color>>10 & 31)*COEFF_COLOR), color == 0 && useAlpha ? 0 : 255);
-}
diff -Nru makoureactor-1.7.2/core/PsColor.h makoureactor-1.8.0/core/PsColor.h
--- makoureactor-1.7.2/core/PsColor.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/PsColor.h	2020-08-08 18:46:56.000000000 +0000
@@ -25,8 +25,17 @@
 class PsColor
 {
 public:
-	static quint16 toPsColor(const QRgb &color);
-	static QRgb fromPsColor(quint16 color, bool useAlpha=false);
+	static inline quint16 toPsColor(const QRgb &color) {
+		return (qRound(qRed(color)/COEFF_COLOR) & 31) | ((qRound(qGreen(color)/COEFF_COLOR) & 31) << 5)
+		       | ((qRound(qBlue(color)/COEFF_COLOR) & 31) << 10) | ((qAlpha(color)==255) << 15);
+	}
+	static inline QRgb fromPsColor(quint16 color, bool useAlpha=false) {
+		quint8 r = color & 31,
+		       g = (color >> 5) & 31,
+		       b = (color >> 10) & 31;
+
+		return qRgba((r << 3) + (r >> 2), (g << 3) + (g >> 2), (b << 3) + (b >> 2), color == 0 && useAlpha ? 0 : 255);
+	}
 };
 
 #endif // DEF_PSCOLOR
diff -Nru makoureactor-1.7.2/core/PsfFile.cpp makoureactor-1.8.0/core/PsfFile.cpp
--- makoureactor-1.7.2/core/PsfFile.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/core/PsfFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,157 @@
+#include "PsfFile.h"
+
+#include "GZIP.h"
+
+PsfTags::PsfTags()
+{
+}
+
+PsfTags::PsfTags(const QString &lib)
+{
+	setLib(lib);
+}
+
+bool PsfTags::open(const QString &config)
+{
+	_tags.clear();
+
+	if (!config.startsWith("[TAG]")) {
+		return false;
+	}
+
+	QStringList entries = config.mid(5).split('\n', QString::SkipEmptyParts);
+	for (const QString &entry : qAsConst(entries)) {
+		int index = entry.indexOf('=');
+
+		if (index >= 0) {
+			QString name = entry.left(index),
+			        value = entry.mid(index + 1);
+
+			if (_tags.contains(name)) {
+				_tags[name].append("\n").append(value);
+			} else {
+				_tags.insert(name, value);
+			}
+		} else {
+			qWarning() << "PsfTags::open Unknown entry format";
+		}
+	}
+
+	return true;
+}
+
+QString PsfTags::save() const
+{
+	QString config;
+	config.append("[TAG]");
+
+	QMapIterator<QString, QString> it(_tags);
+
+	while (it.hasNext()) {
+		it.next();
+
+		QStringList values = it.value().split('\n');
+
+		for (const QString &value : qAsConst(values)) {
+			config.append(QString("%1=%2\n").arg(it.key(), value));
+		}
+	}
+
+	return config;
+}
+
+PsfTags &PsfTags::setLengthS(quint32 seconds)
+{
+	return setCustom("length", QString("%1:%2").arg(seconds / 60).arg(seconds % 60));
+}
+
+PsfTags &PsfTags::setReplayGain(const QString &type, float gain_db, float peak)
+{
+	return setCustom(QString("replaygain_%1_gain").arg(type), QString("%1%2")
+	                                                              .arg(gain_db < 0 ? "-" : "+")
+	                                                              .arg(gain_db))
+	    .setCustom(QString("replaygain_%1_peak").arg(type), peak);
+}
+
+PsfFile::PsfFile()
+{
+
+}
+
+PsfFile::PsfFile(const QByteArray &data, const PsfTags &tags) :
+      _data(data), _tags(tags)
+{
+}
+
+PsfFile PsfFile::fromAkao(const QByteArray &akaoData, const PsfTags &tags)
+{
+	QByteArray data;
+
+	data.append(QString("PS-X EXE"))
+	    .append(QByteArray(10, '\0'))
+	    .append("\x01\x80", 2)
+	    .append(QByteArray(6, '\0'))
+	    .append("\x1D\x80\x00\x80", 4)
+	    .append(QByteArray(18, '\0'))
+	    .append("\xF0\xFF\x1F\x80", 4)
+	    .append(QByteArray(0x7CC, '\0'))
+	    .append(akaoData);
+
+	return PsfFile(data, tags);
+}
+
+bool PsfFile::open(const QByteArray &data)
+{
+	if (data.size() < 16 || data.left(3) != QString("PSF")) {
+		qWarning() << "PsfFile::open" << "wrong header";
+		return false;
+	}
+
+	quint8 version = data.at(3);
+
+	if (version != 1) {
+		qWarning() << "PsfFile::open" << "unsupported version" << version;
+		return false;
+	}
+
+	quint32 sizes[3];
+
+	memcpy(sizes, data.constData() + 4, 3 * sizeof(quint32));
+
+	_special = data.mid(16, sizes[0]);
+	_data = GZIP::decompressNoHeader(data.constData() + 16 + sizes[0], sizes[1]);
+
+	return _tags.open(QString(data.mid(16 + sizes[0] + sizes[1])));
+}
+
+QByteArray PsfFile::save() const
+{
+	QByteArray data;
+	quint8 version = 1;
+	data.append("PSF").append(char(version));
+
+	QByteArray compressedData = GZIP::compressNoHeader(_data.constData(), _data.size());
+
+	quint32 specialSize = _special.size();
+	data.append((char *)&specialSize, 4);
+	quint32 dataSize = compressedData.size();
+	data.append((char *)&dataSize, 4);
+	quint32 crc = GZIP::crc(compressedData.constData(), compressedData.size());
+	data.append((char *)&crc, 4);
+
+	data.append(_special);
+	data.append(compressedData);
+	data.append(_tags.save());
+
+	return data;
+}
+
+QByteArray PsfFile::akao() const
+{
+	int index = _data.indexOf("AKAO");
+	if (index >= 0) {
+		return _data.mid(index);
+	}
+
+	return QByteArray();
+}
diff -Nru makoureactor-1.7.2/core/PsfFile.h makoureactor-1.8.0/core/PsfFile.h
--- makoureactor-1.7.2/core/PsfFile.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/core/PsfFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,88 @@
+#ifndef PSFFILE_H
+#define PSFFILE_H
+
+#include <QtCore>
+
+class PsfTags
+{
+public:
+	PsfTags();
+	explicit PsfTags(const QString &lib);
+	bool open(const QString &config);
+	QString save() const;
+	inline PsfTags &setLib(const QString &lib) {
+		return setCustom("_lib", lib);
+	}
+	inline PsfTags &setAuthor(const QString &author) {
+		return setCustom("psfby", author);
+	}
+	PsfTags &setLengthS(quint32 seconds);
+	inline PsfTags &setFade(quint32 fade) {
+		return setCustom("fade", fade);
+	}
+	inline PsfTags &setVolume(quint32 volume) {
+		return setCustom("volume", volume);
+	}
+	inline PsfTags &setTitle(const QString &title) {
+		return setCustom("title", title);
+	}
+	inline PsfTags &setArtist(const QString &artist) {
+		return setCustom("artist", artist);
+	}
+	inline PsfTags &setGame(const QString &game) {
+		return setCustom("game", game);
+	}
+	inline PsfTags &setGenre(const QString &genre) {
+		return setCustom("genre", genre);
+	}
+	inline PsfTags &setComment(const QString &comment) {
+		return setCustom("comment", comment);
+	}
+	inline PsfTags &setYear(quint32 year) {
+		return setCustom("year", year);
+	}
+	inline PsfTags &setCopyright(const QString &copyright) {
+		return setCustom("copyright", copyright);
+	}
+	inline PsfTags &setReplayGainTrack(float gain_db, float peak) {
+		return setReplayGain("track", gain_db, peak);
+	}
+	inline PsfTags &setReplayGainAlbum(float gain_db, float peak) {
+		return setReplayGain("album", gain_db, peak);
+	}
+	inline PsfTags &setCustom(const QString &name, const QString &value) {
+		_tags.insert(name, value);
+		return *this;
+	}
+	inline PsfTags &setCustom(const QString &name, int value) {
+		return setCustom(name, QString::number(value));
+	}
+private:
+	PsfTags &setReplayGain(const QString &type, float gain_db, float peak);
+	QMap<QString, QString> _tags;
+};
+
+class PsfFile
+{
+public:
+	PsfFile();
+	PsfFile(const QByteArray &data, const PsfTags &tags);
+	static PsfFile fromAkao(const QByteArray &akaoData, const PsfTags &tags);
+	bool open(const QByteArray &data);
+	QByteArray save() const;
+	inline const QByteArray &data() const {
+		return _data;
+	}
+	inline const QByteArray &special() const {
+		return _special;
+	}
+	inline const PsfTags &tags() const {
+		return _tags;
+	}
+	QByteArray akao() const;
+private:
+	QByteArray _special, _data;
+	PsfTags _tags;
+};
+
+#endif // PSFFILE_H
diff -Nru makoureactor-1.7.2/core/QLockedFile.cpp makoureactor-1.8.0/core/QLockedFile.cpp
--- makoureactor-1.7.2/core/QLockedFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/QLockedFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -38,7 +38,9 @@
 
 QLockedFile::~QLockedFile()
 {
-	close();
+	if (isOpen()) {
+		close();
+	}
 }
 
 void QLockedFile::close()
@@ -54,7 +56,7 @@
 
 bool QLockedFile::open(OpenMode mode)
 {
-	if(!mode.testFlag(QIODevice::ReadOnly)) {
+	if (!mode.testFlag(QIODevice::ReadOnly)) {
 		qWarning() << "QLockedFile::open must be opened in ReadOnly mode";
 		return false;
 	}
@@ -64,11 +66,11 @@
 	handle = CreateFileA(QDir::toNativeSeparators(fileName()).toLatin1().data(),
 						 GENERIC_READ,
 						 FILE_SHARE_READ,
-						 NULL,
+						 nullptr,
 						 OPEN_EXISTING,
 						 FILE_ATTRIBUTE_NORMAL,
-						 NULL);
-	if(handle == INVALID_HANDLE_VALUE) {
+						 nullptr);
+	if (handle == INVALID_HANDLE_VALUE) {
 		qWarning() << "QLockedFile::open error lock";
 		return false;
 	}
@@ -77,7 +79,7 @@
 #else
 	bool isOpen = QFile::open(mode);
 
-	if(isOpen && ::flock(handle(), LOCK_SH) < 0) {
+	if (isOpen && ::flock(handle(), LOCK_SH) < 0) {
 		qWarning() << "QLockedFile::open error flock";
 		return false;
 	}
diff -Nru makoureactor-1.7.2/core/TexFile.cpp makoureactor-1.8.0/core/TexFile.cpp
--- makoureactor-1.7.2/core/TexFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/TexFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,35 +19,35 @@
 #include "PsColor.h"
 
 TexFile::TexFile(const QByteArray &data) :
-    TextureFile()
+      TextureFile()
 {
-    open(data);
+	open(data);
 }
 
 TexFile::TexFile(const TextureFile &textureFile, const TexStruct &header,
-		const QVector<quint8> &colorKeyArray) :
-	TextureFile(textureFile), header(header), colorKeyArray(colorKeyArray)
+                 const QVector<quint8> &colorKeyArray) :
+      TextureFile(textureFile), header(header), colorKeyArray(colorKeyArray)
 {
 }
 
 bool TexFile::open(const QByteArray &data)
 {
-    const char *constData = data.constData();
+	const char *constData = data.constData();
 	quint32 w, h, headerSize, paletteSectionSize, imageSectionSize, colorKeySectionSize;
 
-	if((quint32)data.size() < sizeof(TexStruct)) {
-		qWarning() << "tex size too short!";
+	if (quint32(data.size()) < sizeof(TexStruct)) {
+		qWarning() << "tex size too short!" << data.size();
 		return false;
 	}
 
 	memcpy(&header, constData, sizeof(TexStruct));
 
-	if(header.version == 1) {
+	if (header.version == 1) {
 		headerSize = sizeof(TexStruct) - 4;
-	} else if(header.version == 2) {
+	} else if (header.version == 2) {
 		headerSize = sizeof(TexStruct);
 	} else {
-		qWarning() << "unknown tex version!";
+		qWarning() << "unknown tex version!" << header.version;
 		return false;
 	}
 
@@ -57,25 +57,24 @@
 	imageSectionSize = w * h * header.bytesPerPixel;
 	colorKeySectionSize = header.hasColorKeyArray ? header.nbPalettes : 0;
 
-	if((quint32)data.size() != headerSize + paletteSectionSize + imageSectionSize + colorKeySectionSize) {
-		qWarning() << "tex invalid size!";
+	if ((quint32)data.size() != headerSize + paletteSectionSize + imageSectionSize + colorKeySectionSize) {
+		qWarning() << "tex invalid size!" << data.size() << headerSize << paletteSectionSize << imageSectionSize
+		           << colorKeySectionSize;
 		return false;
 	}
 
 	quint32 i;
 
-	if(header.nbPalettes > 0)
-	{
+	if (header.nbPalettes > 0) {
 		quint32 index, imageStart = headerSize + paletteSectionSize;
 
-		for(quint32 palID=0 ; palID < header.nbPalettes ; ++palID) {
+		for (quint32 palID=0; palID < header.nbPalettes; ++palID) {
 			quint32 paletteStart = headerSize+header.nbColorsPerPalette1*4*palID;
 
 			_image = QImage(w, h, QImage::Format_Indexed8);
 			QVector<QRgb> colors;
 
-			for(i=0 ; i<header.nbColorsPerPalette1 ; ++i)
-			{
+			for (i=0; i<header.nbColorsPerPalette1; ++i) {
 				index = paletteStart + i*4;
 				colors.append(qRgba(data.at(index+2), data.at(index+1), data.at(index), data.at(index+3)));
 			}
@@ -85,70 +84,82 @@
 
 		_image.setColorTable(_colorTables.first());
 
-		for(i=0 ; i<imageSectionSize ; ++i)
-		{
+		for (i=0; i<imageSectionSize; ++i) {
 			_image.setPixel(i % w, i / w, (quint8)data.at(imageStart+i));
 		}
 
-		if(header.hasColorKeyArray) {
+		if (header.hasColorKeyArray) {
 			quint32 colorKeyStart = imageStart + imageSectionSize;
 
-			for(quint32 j=0 ; j<header.nbPalettes ; ++j) {
+			for (quint32 j=0; j<header.nbPalettes; ++j) {
 				colorKeyArray.append(data.at(colorKeyStart+j));
 			}
 		}
-    }
-    else
-    {
+	} else {
 		quint16 color;
 		_image = QImage(w, h, QImage::Format_ARGB32);
 		QRgb *pixels = (QRgb *)_image.bits();
 
-		for(i=0 ; i<imageSectionSize ; i+=header.bytesPerPixel) {
-			if(header.bytesPerPixel == 2) {
+		if (header.bytesPerPixel < 2 || header.bytesPerPixel > 4) {
+			qWarning() << "tex invalid bytesPerPixel!" << header.bytesPerPixel;
+			return false;
+		}
+
+		for (i=0; i<imageSectionSize; i+=header.bytesPerPixel) {
+			if (header.bytesPerPixel == 2) {
 				memcpy(&color, &constData[headerSize+i], 2);
 				pixels[i/2] = PsColor::fromPsColor(color);
-			} else if(header.bytesPerPixel == 3) {
+			} else if (header.bytesPerPixel == 3) {
 				pixels[i/3] = qRgb(constData[headerSize+i], constData[headerSize+i+1], constData[headerSize+i+2]);
+			} else if (header.bytesPerPixel == 4) {
+				pixels[i/4] = qRgba(constData[headerSize+i], constData[headerSize+i+1], constData[headerSize+i+2], constData[headerSize+i+3]);
 			}
-        }
+		}
 	}
 
-    return true;
+	return true;
+}
+
+void TexFile::setVersion(Version version)
+{
+	header.version = int(version);
+}
+
+void TexFile::updateHeader()
+{
+	header.nbPalettes = _colorTables.size();
+	header.hasPal = !_colorTables.isEmpty();
+	header.imageWidth = _image.width();
+	header.imageHeight = _image.height();
+	header.hasColorKeyArray = !colorKeyArray.isEmpty();
 }
 
 bool TexFile::save(QByteArray &data)
 {
+	updateHeader();
 	data.append((char *)&header, header.version==2 ? sizeof(TexStruct) : sizeof(TexStruct) - 4);
 
-	if(isPaletted()) {
+	if (isPaletted()) {
 		quint32 palID;
 
-		for(palID=0 ; palID < header.nbPalettes && palID < (quint32)_colorTables.size() ; ++palID) {
+		for (palID=0; palID < header.nbPalettes && palID < (quint32)_colorTables.size(); ++palID) {
 			const QVector<QRgb> &palette = _colorTables.at(palID);
 			quint32 colorID;
-			for(colorID=0 ; colorID < header.nbColorsPerPalette1 && colorID < (quint32)palette.size() ; ++colorID) {
+			for (colorID=0; colorID < header.nbColorsPerPalette1 && colorID < (quint32)palette.size(); ++colorID) {
 				const QRgb &color = palette.at(colorID);
 				data.append((char)qBlue(color));
 				data.append((char)qGreen(color));
 				data.append((char)qRed(color));
 				data.append((char)qAlpha(color));
 			}
-			for( ; colorID < header.nbColorsPerPalette1 ; ++colorID) {
-				const QRgb color = qRgba(0, 0, 0, 0);
-				data.append((char *)&color, 4);
-			}
-		}
-
-		for( ; palID < header.nbPalettes ; ++palID) {
-			for(quint32 colorID=0 ; colorID < header.nbColorsPerPalette1 ; ++colorID) {
+			for ( ; colorID < header.nbColorsPerPalette1; ++colorID) {
 				const QRgb color = qRgba(0, 0, 0, 0);
 				data.append((char *)&color, 4);
 			}
 		}
 
-		for(int y=0 ; y<_image.height() ; ++y) {
-			for(int x=0 ; x<_image.width() ; ++x) {
+		for (int y=0; y<_image.height(); ++y) {
+			for (int x=0; x<_image.width(); ++x) {
 				data.append((char)_image.pixelIndex(x, y));
 			}
 		}
@@ -156,7 +167,7 @@
 		data.append((char *)colorKeyArray.data(), colorKeyArray.size());
 	} else {
 		QRgb *pixels = (QRgb *)_image.bits();
-		for(int i=0 ; i<_image.width()*_image.height() ; ++i) {
+		for (int i=0; i<_image.width()*_image.height(); ++i) {
 			quint16 color = PsColor::toPsColor(pixels[i]);
 			data.append((char *)&color, 2);
 		}
@@ -164,3 +175,57 @@
 
 	return true;
 }
+
+TexFile TexFile::scaled(const QSize &size) const
+{
+	return TexFile(TextureFile(_image.scaled(size), _colorTables), header, colorKeyArray);
+}
+
+void TexFile::debug()
+{
+	TexStruct h = header;
+
+	QFile f("debugTex.txt");
+	f.open(QIODevice::WriteOnly);
+	f.write(QString("version= %1 | unknown1= %2 | hasColorKey= %3 | unknown2= %4 | unknown3= %5\n")
+	            .arg(h.version).arg(h.unknown1).arg(h.hasColorKey).arg(h.unknown2).arg(h.unknown3).toLatin1());
+	f.write(QString("minBitsPerColor= %1 | maxBitsPerColor= %2 | minAlphaBits= %3 | maxAlphaBits= %4 | minBitsPerPixel= %5\n")
+	            .arg(h.minBitsPerColor).arg(h.maxBitsPerColor).arg(h.minAlphaBits).arg(h.maxAlphaBits).arg(h.minBitsPerPixel).toLatin1());
+	f.write(QString("maxBitsPerPixel= %1 | unknown4= %2 | nbPalettes= %3 | nbColorsPerPalette1= %4 | bitDepth= %5\n")
+	            .arg(h.maxBitsPerPixel).arg(h.unknown4).arg(h.nbPalettes).arg(h.nbColorsPerPalette1).arg(h.bitDepth).toLatin1());
+	f.write(QString("imageWidth= %1 | imageHeight= %2 | pitch= %3 | unknown5= %4 | hasPal= %5\n")
+	            .arg(h.imageWidth).arg(h.imageHeight).arg(h.pitch).arg(h.unknown5).arg(h.hasPal).toLatin1());
+	f.write(QString("bitsPerIndex= %1 | indexedTo8bit= %2 | paletteSize= %3 | nbColorsPerPalette2= %4 | runtimeData1= %5\n")
+	            .arg(h.bitsPerIndex).arg(h.indexedTo8bit).arg(h.paletteSize).arg(h.nbColorsPerPalette2).arg(h.runtimeData1).toLatin1());
+	f.write(QString("bitsPerPixel= %1 | bytesPerPixel= %2 | nbRedBits1= %3 | nbGreenBits1= %4 | nbBlueBits1= %5\n")
+	            .arg(h.bitsPerPixel).arg(h.bytesPerPixel).arg(h.nbRedBits1).arg(h.nbGreenBits1).arg(h.nbBlueBits1).toLatin1());
+	f.write(QString("nbAlphaBits1= %1 | redBitmask= %2 | greenBitmask= %3 | blueBitmask= %4 | alphaBitmask= %5\n")
+	            .arg(h.nbAlphaBits1).arg(h.redBitmask).arg(h.greenBitmask).arg(h.blueBitmask).arg(h.alphaBitmask).toLatin1());
+	f.write(QString("redShift= %1 | greenShift= %2 | blueShift= %3 | alphaShift= %4 | nbRedBits2= %5\n")
+	            .arg(h.redShift).arg(h.greenShift).arg(h.blueShift).arg(h.alphaShift).arg(h.nbRedBits2).toLatin1());
+	f.write(QString("nbGreenBits2= %1 | nbBlueBits2= %2 | nbAlphaBits2= %3 | redMax= %4 | greenMax= %5\n")
+	            .arg(h.nbGreenBits2).arg(h.nbBlueBits2).arg(h.nbAlphaBits2).arg(h.redMax).arg(h.greenMax).toLatin1());
+	f.write(QString("blueMax= %1 | alphaMax= %2 | hasColorKeyArray= %3 | runtimeData2= %4 | referenceAlpha= %5\n")
+	            .arg(h.blueMax).arg(h.alphaMax).arg(h.hasColorKeyArray).arg(h.runtimeData2).arg(h.referenceAlpha).toLatin1());
+	f.write(QString("runtimeData3= %1 | unknown6= %2 | paletteIndex= %3 | runtimeData4= %4 | runtimeData5= %5\n")
+	            .arg(h.runtimeData3).arg(h.unknown6).arg(h.paletteIndex).arg(h.runtimeData4).arg(h.runtimeData5).toLatin1());
+	f.write(QString("unknown7= %1 | unknown8= %2 | unknown9= %3 | unknown10= %4 | unknown11= %5\n")
+	            .arg(h.unknown7).arg(h.unknown8).arg(h.unknown9).arg(h.unknown10).arg(h.unknown11).toLatin1());
+
+	for(int i=0 ; i<_colorTables.size() ; ++i) {
+		f.write(QString("Pal %1 ").arg(i).toLatin1());
+		foreach(const QRgb &color, _colorTables.at(i)) {
+			f.write(QString("(r=%1, g=%2, b=%3, a=%4) ")
+			            .arg(qRed(color)).arg(qGreen(color)).arg(qBlue(color)).arg(qAlpha(color))
+			            .toLatin1());
+		}
+		f.write("\n");
+	}
+
+	for(int i=0 ; i<colorKeyArray.size() ; ++i) {
+		f.write(QString("%1, ")
+		            .arg((quint8)colorKeyArray.at(i)).toLatin1());
+	}
+
+	f.close();
+}
diff -Nru makoureactor-1.7.2/core/TexFile.h makoureactor-1.8.0/core/TexFile.h
--- makoureactor-1.7.2/core/TexFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/TexFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -91,13 +91,21 @@
 class TexFile : public TextureFile
 {
 public:
+	enum Version {
+		None, FF7, FF8
+	};
+
 	TexFile() : TextureFile() {}
 	explicit TexFile(const QByteArray &data);
 	TexFile(const TextureFile &textureFile, const TexStruct &header,
 			const QVector<quint8> &colorKeyArray=QVector<quint8>());
 	virtual bool open(const QByteArray &data);
 	virtual bool save(QByteArray &data);
+	TexFile scaled(const QSize &size) const;
+	void setVersion(Version version);
+	void debug();
 private:
+	void updateHeader();
 	TexStruct header;
 	QVector<quint8> colorKeyArray;
 };
diff -Nru makoureactor-1.7.2/core/TextureFile.cpp makoureactor-1.8.0/core/TextureFile.cpp
--- makoureactor-1.7.2/core/TextureFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/TextureFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -26,7 +26,7 @@
 	_image(image), _currentColorTable(0)
 {
 	QVector<QRgb> colorTable = _image.colorTable();
-	if(!colorTable.empty()) {
+	if (!colorTable.empty()) {
 		_colorTables.append(colorTable);
 	}
 }
@@ -80,14 +80,14 @@
 
 void TextureFile::setCurrentColorTable(int id)
 {
-	if(id < _colorTables.size() && _currentColorTable != id) {
+	if (id < _colorTables.size() && _currentColorTable != id) {
 		_image.setColorTable(_colorTables.at(_currentColorTable = id));
 	}
 }
 
 void TextureFile::setColorTable(int id, const QVector<QRgb> &colorTable)
 {
-	if(id < _colorTables.size()) {
+	if (id < _colorTables.size()) {
 		_colorTables.replace(id, colorTable);
 	}
 }
@@ -102,9 +102,9 @@
 	QImage img(4*16, 4*16*colorTableCount(), QImage::Format_RGB32);
 
 	int y = 0;
-	foreach(const QVector<QRgb> &colorTable, _colorTables) {
+	for (const QVector<QRgb> &colorTable : _colorTables) {
 		int x = 0;
-		foreach(const QRgb &color, colorTable) {
+		for (const QRgb &color : colorTable) {
 			img.setPixel(x*4+0, y*4+0, color);
 			img.setPixel(x*4+0, y*4+1, color);
 			img.setPixel(x*4+0, y*4+2, color);
@@ -125,14 +125,14 @@
 			img.setPixel(x*4+3, y*4+2, color);
 			img.setPixel(x*4+3, y*4+3, color);
 
-			if(x==15) {
+			if (x==15) {
 				x = 0;
 				++y;
 			} else {
 				++x;
 			}
 		}
-		while(y % 16 != 0) {
+		while (y % 16 != 0) {
 			img.setPixel(x*4+0, y*4+0, Qt::black);
 			img.setPixel(x*4+0, y*4+1, Qt::black);
 			img.setPixel(x*4+0, y*4+2, Qt::black);
@@ -153,7 +153,7 @@
 			img.setPixel(x*4+3, y*4+2, Qt::black);
 			img.setPixel(x*4+3, y*4+3, Qt::black);
 
-			if(x==15) {
+			if (x==15) {
 				x = 0;
 				++y;
 			} else {
diff -Nru makoureactor-1.7.2/core/TimFile.cpp makoureactor-1.8.0/core/TimFile.cpp
--- makoureactor-1.7.2/core/TimFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/TimFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -51,7 +51,7 @@
 	bool hasPal;
 	int dataSize = data.size();
 
-	if(!data.startsWith(QByteArray("\x10\x00\x00\x00", 4)) || dataSize < 8) {
+	if (!data.startsWith(QByteArray("\x10\x00\x00\x00", 4)) || dataSize < 8) {
 		return false;
 	}
 
@@ -64,14 +64,14 @@
 //	qDebug() << QString("Tag = %1, version = %2, reste = %3").arg(tag).arg(version).arg(QString(data.mid(2,2).toHex()));
 //	qDebug() << QString("bpp = %1, hasPal = %2, flag = %3, reste = %4").arg(bpp).arg(hasPal).arg((quint8)data.at(4),0,2).arg(QString(data.mid(5,3).toHex()));
 
-	if(hasPal && bpp > 1)
+	if (hasPal && bpp > 1)
 		return false;
 
 	_colorTables.clear();
 
-	if(hasPal)
+	if (hasPal)
 	{
-		if(dataSize < 20)
+		if (dataSize < 20)
 			return false;
 
 		memcpy(&palSize, &constData[8], 4);
@@ -79,23 +79,23 @@
 		memcpy(&palY, &constData[14], 2);
 		memcpy(&palW, &constData[16], 2);
 		memcpy(&palH, &constData[18], 2);
-		if((quint32)dataSize < 8+palSize/* || palSize != (quint32)palW*palH*2+12*/)
+		if ((quint32)dataSize < 8+palSize/* || palSize != (quint32)palW*palH*2+12*/)
 			return false;
 
 		quint16 onePalSize = (bpp==0 ? 16 : 256);
 		int nbPal = (palSize-12)/(onePalSize*2);
-		if((palSize-12)%(onePalSize*2) != 0)
+		if ((palSize-12)%(onePalSize*2) != 0)
 		{
 			nbPal *= 2;
 		}
-		if(nbPal > 0)
+		if (nbPal > 0)
 		{
 			int pos=0;
-			for(int i=0 ; i<nbPal ; ++i)
+			for (int i=0; i<nbPal; ++i)
 			{
 				QVector<QRgb> pal;
 
-				for(quint16 j=0 ; j<onePalSize ; ++j) {
+				for (quint16 j=0; j<onePalSize; ++j) {
 					memcpy(&color, &constData[20+pos*2+j*2], 2);
 					pal.append(PsColor::fromPsColor(color, true));
 				}
@@ -122,7 +122,7 @@
 //		qDebug() << QString("NbPal = %1 (valid : %2)").arg(nbPal).arg((palSize-12)%(onePalSize*2));
 	}
 
-	if((quint32)dataSize < 20+palSize)
+	if ((quint32)dataSize < 20+palSize)
 		return false;
 
 	memcpy(&imgSize, &constData[8+palSize], 4);
@@ -130,15 +130,15 @@
 	memcpy(&imgY, &constData[14+palSize], 2);
 	memcpy(&w, &constData[16+palSize], 2);
 	memcpy(&h, &constData[18+palSize], 2);
-	if(bpp==0)		w*=4;
-	else if(bpp==1)	w*=2;
+	if (bpp==0)		w*=4;
+	else if (bpp==1)	w*=2;
 
 //	qDebug() << QString("-Image-");
 //	qDebug() << QString("Size = %1, w = %2, h = %3").arg(imgSize).arg(w).arg(h);
 //	qDebug() << QString("TIM Size = %1").arg(8+palSize+imgSize);
 
 	_image = QImage(w, h, hasPal ? QImage::Format_Indexed8 : QImage::Format_ARGB32);
-	if(hasPal) {
+	if (hasPal) {
 		_image.setColorTable(_colorTables.first());
 	}
 	//_image.fill(QColor(0, 0, 0, 0));
@@ -147,22 +147,22 @@
 	int size, i=0;
 	quint32 x=0, y=0;
 
-	if(bpp!=0) {
+	if (bpp!=0) {
 		size = qMin((quint32)(12 + w*h*bpp), dataSize - 8 - palSize);
 	} else {
 		size = qMin((quint32)(12 + w/2*h), dataSize - 8 - palSize);
 	}
 
-	if(8 + palSize + size > (quint32)dataSize)
+	if (8 + palSize + size > (quint32)dataSize)
 		return false;
 
-	if(bpp==0)//mag176, icon
+	if (bpp==0)//mag176, icon
 	{
-		while(i<size && y<h)
+		while (i<size && y<h)
 		{
 			_image.setPixel(x, y, (quint8)data.at(20+palSize+i) & 0xF);
 			++x;
-			if(x==w)
+			if (x==w)
 			{
 				x = 0;
 				++y;
@@ -170,7 +170,7 @@
 
 			_image.setPixel(x, y, (quint8)data.at(20+palSize+i) >> 4);
 			++x;
-			if(x==w)
+			if (x==w)
 			{
 				x = 0;
 				++y;
@@ -178,14 +178,14 @@
 			++i;
 		}
 	}
-	else if(bpp==1)
+	else if (bpp==1)
 	{
-		while(i<size && y<h)
+		while (i<size && y<h)
 		{
 			_image.setPixel(x, y, (quint8)data.at(20+palSize+i));
 
 			++x;
-			if(x==w)
+			if (x==w)
 			{
 				x = 0;
 				++y;
@@ -193,15 +193,15 @@
 			++i;
 		}
 	}
-	else if(bpp==2)
+	else if (bpp==2)
 	{
-		while(i<size && y<h)
+		while (i<size && y<h)
 		{
 			memcpy(&color, &constData[20+palSize+i], 2);
 			pixels[x + y*w] = PsColor::fromPsColor(color, true);
 
 			++x;
-			if(x==w)
+			if (x==w)
 			{
 				x = 0;
 				++y;
@@ -209,15 +209,15 @@
 			i+=2;
 		}
 	}
-	else if(bpp==3)
+	else if (bpp==3)
 	{
-		while(i<size && y<h)
+		while (i<size && y<h)
 		{
 			memcpy(&color, &constData[20+palSize+i], 3);
 			pixels[x + y*w] = qRgb(color >> 16, (color >> 8) & 0xFF, color & 0xFF);
 
 			++x;
-			if(x==w)
+			if (x==w)
 			{
 				x = 0;
 				++y;
@@ -230,7 +230,7 @@
 	return true;
 }
 
-bool TimFile::save(QByteArray &data)
+bool TimFile::save(QByteArray &data) const
 {
 	bool hasPal = bpp <= 1;
 	quint32 flag = (hasPal << 3) | (bpp & 3);
@@ -239,7 +239,7 @@
 	data.append("\x10\x00\x00\x00", 4);
 	data.append((char *)&flag, 4);
 
-	if(hasPal) {
+	if (hasPal) {
 		quint16 colorPerPal = bpp == 0 ? 16 : 256;
 		quint32 sizePalSection = 12 + _colorTables.size() * colorPerPal * 2;
 
@@ -249,20 +249,20 @@
 		data.append((char *)&palW, 2);
 		data.append((char *)&palH, 2);
 
-		foreach(const QVector<QRgb> &colorTable, _colorTables) {
+		for (const QVector<QRgb> &colorTable : _colorTables) {
 			int i;
-			for(i=0 ; i<colorTable.size() && i<colorPerPal ; ++i) {
+			for (i=0; i<colorTable.size() && i<colorPerPal; ++i) {
 				quint16 psColor = PsColor::toPsColor(colorTable.at(i));
 				data.append((char *)&psColor, 2);
 			}
-			if(i<colorPerPal) {
+			if (i<colorPerPal) {
 				data.append(QByteArray(colorPerPal - i, '\0'));
 			}
 		}
 
 		quint16 width = _image.width(), height = _image.height();
 		quint32 sizeImgSection = 12;
-		if(bpp==0) {
+		if (bpp==0) {
 			width/=4;
 			sizeImgSection += _image.width()/2 * height;
 		}
@@ -278,9 +278,9 @@
 
 		width *= 2;
 
-		for(int y=0 ; y<height ; ++y) {
-			for(int x=0 ; x<width ; ++x) {
-				if(bpp == 0) {
+		for (int y=0; y<height; ++y) {
+			for (int x=0; x<width; ++x) {
+				if (bpp == 0) {
 					quint8 index = (_image.pixelIndex(x*2, y) & 0xF) | ((_image.pixelIndex(x*2+1, y) & 0xF) << 4);
 					data.append((char)index);
 				} else {
@@ -298,9 +298,9 @@
 		data.append((char *)&width, 2);
 		data.append((char *)&height, 2);
 
-		for(int y=0 ; y<height ; ++y) {
-			for(int x=0 ; x<width ; ++x) {
-				if(bpp == 2) {
+		for (int y=0; y<height; ++y) {
+			for (int x=0; x<width; ++x) {
+				if (bpp == 2) {
 					quint16 color = PsColor::toPsColor(_image.pixel(x, y));
 					data.append((char *)&color, 2);
 				} else {
diff -Nru makoureactor-1.7.2/core/TimFile.h makoureactor-1.8.0/core/TimFile.h
--- makoureactor-1.7.2/core/TimFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/TimFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -29,7 +29,7 @@
 	explicit TimFile(const QByteArray &data);
 	TimFile(const TextureFile &texture, quint8 bpp, quint16 palX, quint16 palY, quint16 palW, quint16 palH, quint16 imgX, quint16 imgY);
 	bool open(const QByteArray &data);
-	bool save(QByteArray &data);
+	bool save(QByteArray &data) const;
 private:
 	quint8 bpp;
 	quint16 palX, palY;
diff -Nru makoureactor-1.7.2/core/Var.cpp makoureactor-1.8.0/core/Var.cpp
--- makoureactor-1.7.2/core/Var.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/Var.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -22,47 +22,47 @@
 {
 	// Loading file into Var::_varNames
 	QFile fic(Config::value("varFile").toString());
-	if(!fic.exists()) {
+	if (!fic.exists()) {
 		fic.setFileName(":/vars.cfg"); // Get default values
 	}
 
-	if(fic.open(QIODevice::ReadOnly | QIODevice::Text)) {
+	if (fic.open(QIODevice::ReadOnly | QIODevice::Text)) {
 		QString line;
 		QStringList list;
 		bool ok;
 		int address;
 		forever {
 			line = QString(fic.readLine());
-			if(line.isEmpty()) {
+			if (line.isEmpty()) {
 				break;
 			}
 
 			list = line.split(QChar('|'));
-			if(list.size() != 3) {
+			if (list.size() != 3) {
 				return false;
 			}
 
 			int bank = list.first().toInt(&ok);
-			if(!ok) {
+			if (!ok) {
 				return false;
 			}
-			if(bank < 1 || bank > 15) {
+			if (bank < 1 || bank > 15) {
 				continue;
 			}
 
 			address = list.at(1).toInt(&ok);
-			if(!ok) {
+			if (!ok) {
 				return false;
 			}
-			if(address < 0 || address > 255) {
+			if (address < 0 || address > 255) {
 				continue;
 			}
 
 			line = list.at(2);
-			if(line.isEmpty()) {
+			if (line.isEmpty()) {
 				return false;
 			}
-			if(line.size() > 255) {
+			if (line.size() > 255) {
 				line = line.left(255);
 			}
 
@@ -80,10 +80,10 @@
 {
 	// Saving varNames in the file
 	QFile fic(Config::value("varFile").toString());
-	if(fic.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+	if (fic.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
 		_varNames = varNames;
 		QMapIterator<quint16, QString> i(_varNames);
-		while(i.hasNext()) {
+		while (i.hasNext()) {
 			i.next();
 			fic.write(QString("%1|%2|%3\n")
 			          .arg(i.key() >> 8)
diff -Nru makoureactor-1.7.2/core/WindowBinFile.cpp makoureactor-1.8.0/core/WindowBinFile.cpp
--- makoureactor-1.7.2/core/WindowBinFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/WindowBinFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -27,15 +27,17 @@
 {
 	_charWidth.clear();
 	_font.clear();
+	_font2.clear();
+	_icons.clear();
 }
 
 bool WindowBinFile::open(const QString &path)
 {
 	QFile windowFile(path);
-	if(windowFile.open(QIODevice::ReadOnly)) {
+	if (windowFile.open(QIODevice::ReadOnly)) {
 		QByteArray windowData = windowFile.readAll();
 		windowFile.close();
-		if(!open(windowData)) {
+		if (!open(windowData)) {
 			return false;
 		}
 	} else {
@@ -54,7 +56,7 @@
 	quint16 size;
 	QList<quint16> positions, sizes;
 
-	while(cur + 2 < data.size()) {
+	while (cur + 2 < data.size()) {
 		positions.append(cur);
 
 		memcpy(&size, constData + cur, 2);
@@ -64,27 +66,73 @@
 		cur += 6 + size;
 	}
 
-	if(positions.size() == 3) {
-		if(!openFont(GZIP::decompress(constData + positions.at(1) + 6, sizes.at(1), 0))) {
-			return false;
-		}
-	} else if(positions.size() == 4) { // jp version
-		if(!openFont(GZIP::decompress(constData + positions.at(1) + 6, sizes.at(1), 0))) {
-			return false;
-		}
+	if (positions.size() < 3 || positions.size() > 4) {
+		return false;
+	}
 
-		if(!openFont2(GZIP::decompress(constData + positions.at(2) + 6, sizes.at(2), 0))) {
-			return false;
-		}
+	_icons = TimFile(GZIP::decompress(constData + positions.first() + 6, sizes.first(), 0));
+
+	if (!_icons.isValid()) {
+		return false;
+	}
+
+	if (!openFont(GZIP::decompress(constData + positions.at(1) + 6, sizes.at(1), 0))) {
+		return false;
 	}
 
-	if(!openFontSize(GZIP::decompress(constData + positions.last() + 6, sizes.last(), 0))) {
+	// jp version
+	if (positions.size() == 4 && !openFont2(GZIP::decompress(constData + positions.at(2) + 6, sizes.at(2), 0))) {
+		return false;
+	}
+
+	if (!openFontSize(GZIP::decompress(constData + positions.last() + 6, sizes.last(), 0))) {
 		return false;
 	}
 
 	return true;
 }
 
+void WindowBinFile::saveSection(const QByteArray &section, QByteArray &data, quint16 type)
+{
+	QByteArray compressedData = GZIP::compress(section, 9);
+	quint16 size = compressedData.size();
+	data.append((char *)&size, 2);
+	size = section.size();
+	data.append((char *)&size, 2);
+	data.append((char *)&type, 2);
+	data.append(compressedData);
+}
+
+bool WindowBinFile::save(QByteArray &data) const
+{
+	QByteArray sectionData;
+	if (!_icons.save(sectionData)) {
+		return false;
+	}
+
+	saveSection(sectionData, data, 0);
+
+	sectionData.clear();
+	if (!_font.save(sectionData)) {
+		return false;
+	}
+
+	saveSection(sectionData, data, 0);
+
+	if (isJp()) {
+		sectionData.clear();
+		if (!_font2.save(sectionData)) {
+			return false;
+		}
+
+		saveSection(sectionData, data, 0);
+	}
+
+	saveSection(QByteArray((char *)_charWidth.data(), _charWidth.size()), data, 1);
+
+	return true;
+}
+
 bool WindowBinFile::isValid() const
 {
 	return !_charWidth.isEmpty();
@@ -136,7 +184,7 @@
 
 bool WindowBinFile::openFontSize(const QByteArray &data)
 {
-	if(data.size() != 1302) {
+	if (data.size() != 1302) {
 		return false;
 	}
 
@@ -153,25 +201,78 @@
 	return _font.image();
 }
 
-QRect WindowBinFile::letterRect(int charId)
+QPoint WindowBinFile::letterPos(quint8 tableId, quint8 charId) const
 {
-	QSize size = QSize(12, 12);
-	QPoint point = QPoint((charId%21)*size.width(), (charId/21)*size.height());
+	int id = charId;
+	if (tableId >= 4) {
+		if (!isJp()) {
+			return QPoint();
+		}
+	} else {
+		id = (tableId % 2) * 231 + charId;
+	}
 
-	return QRect(point, size);
+	QSize size = letterSize();
+	return QPoint((id % 21) * size.width(), (id / 21) * size.height());
 }
 
-QImage WindowBinFile::letter(quint8 table, quint8 id, FontColor color)
+QRect WindowBinFile::letterRect(quint8 tableId, quint8 charId) const
 {
-	if(table >= 4) {
-		if(isJp()) {
-			_font2.setCurrentColorTable(palette(color, table));
-			return _font2.image().copy(letterRect(id));
-		}
+	QPoint pos = letterPos(tableId, charId);
+	if (pos.isNull()) {
+		return QRect();
+	}
+	return QRect(pos, letterSize());
+}
+
+QImage WindowBinFile::letter(quint8 tableId, quint8 charId, FontColor color)
+{
+	QRect rect = letterRect(tableId, charId);
+	if (rect.isNull()) {
 		return QImage();
 	}
-	_font.setCurrentColorTable(palette(color, table));
-	return _font.image().copy(letterRect((table % 2) * 231 + id));
+	TimFile &f = font(tableId);
+	f.setCurrentColorTable(palette(color, tableId));
+	return f.image().copy(letterRect(tableId, charId));
+}
+
+bool WindowBinFile::setLetter(quint8 tableId, quint8 charId, const QImage &image)
+{
+	QRect rect = letterRect(tableId, charId);
+
+	if (image.size() != rect.size()) {
+		return false;
+	}
+
+	int x2, y2 = rect.y();
+
+	for (int y=0; y<image.height(); ++y) {
+		x2 = rect.x();
+
+		for (int x=0; x<image.width(); ++x) {
+			font(tableId).imagePtr()->setPixel(x2, y2, image.pixelIndex(x, y));
+			++x2;
+		}
+
+		++y2;
+	}
+
+	modified = true;
+
+	return true;
+}
+
+uint WindowBinFile::letterPixelIndex(quint8 tableId, quint8 charId, const QPoint &pos) const
+{
+	return constFont(tableId).image().pixel(letterPos(tableId, charId) + pos);
+}
+
+bool WindowBinFile::setLetterPixelIndex(quint8 tableId, quint8 charId, const QPoint &pos, uint pixelIndex)
+{
+	// pixelIndex must be a number between 0 and 15
+	font(tableId).imagePtr()->setPixel(letterPos(tableId, charId) + pos, pixelIndex % 16);
+	modified = true;
+	return true;
 }
 
 int WindowBinFile::palette(FontColor color, quint8 table) const
@@ -183,7 +284,7 @@
 int WindowBinFile::absoluteId(quint8 table, quint8 id)
 {
 	int absId = id;
-	for(int i=0 ; i<table ; ++i) {
+	for (int i=0; i<table; ++i) {
 		absId += tableSize(i);
 	}
 	return absId;
@@ -191,7 +292,7 @@
 
 quint8 WindowBinFile::charWidth(quint8 table, quint8 id) const
 {
-	return CHAR_WIDTH(charInfo(table, id));
+	return CHARACTER_WIDTH(charInfo(table, id));
 }
 
 quint8 WindowBinFile::charLeftPadding(quint8 table, quint8 id) const
diff -Nru makoureactor-1.7.2/core/WindowBinFile.h makoureactor-1.8.0/core/WindowBinFile.h
--- makoureactor-1.7.2/core/WindowBinFile.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/WindowBinFile.h	2020-08-08 18:46:56.000000000 +0000
@@ -21,8 +21,8 @@
 #include <QtCore>
 #include "TimFile.h"
 
-#define LEFT_PADD(w)	(w >> 5)
-#define CHAR_WIDTH(w)	(w & 0x1F)
+inline quint8 LEFT_PADD(quint8 w) {return (w >> 5);}
+inline quint8 CHARACTER_WIDTH(quint8 w) {return(w & 0x1F);}
 
 class WindowBinFile
 {
@@ -42,6 +42,7 @@
 	void clear();
 	bool open(const QString &path);
 	bool open(const QByteArray &data);
+	bool save(QByteArray &data) const;
 	bool isValid() const;
 	bool isModified() const;
 	bool isJp() const;
@@ -50,15 +51,34 @@
 	int tableCount() const;
 	static int tableSize(quint8 table);
 	const QImage &image(FontColor color);
-	QImage letter(quint8 table, quint8 id, FontColor color);
+	QImage letter(quint8 tableId, quint8 charId, FontColor color);
+	bool setLetter(quint8 tableId, quint8 charId, const QImage &image);
+	uint letterPixelIndex(quint8 tableId, quint8 charId, const QPoint &pos) const;
+	bool setLetterPixelIndex(quint8 tableId, quint8 charId, const QPoint &pos, uint pixelIndex);
 	quint8 charWidth(quint8 table, quint8 id) const;
 	quint8 charLeftPadding(quint8 table, quint8 id) const;
 	void setCharWidth(quint8 table, quint8 id, quint8 width);
 	void setCharLeftPadding(quint8 table, quint8 id, quint8 padding);
 private:
-	QImage letter(int id, FontColor color);
+	static void saveSection(const QByteArray &section, QByteArray &data, quint16 type);
+	inline const TimFile &constFont(quint8 tableId) const {
+		if (isJp() && tableId >= 4) {
+			return _font2;
+		}
+		return _font;
+	}
+	inline TimFile &font(quint8 tableId) {
+		if (isJp() && tableId >= 4) {
+			return _font2;
+		}
+		return _font;
+	}
 	int palette(FontColor color, quint8 table) const;
-	static QRect letterRect(int charId);
+	QPoint letterPos(quint8 tableId, quint8 charId) const;
+	inline QSize letterSize() const {
+		return QSize(12, 12);
+	}
+	QRect letterRect(quint8 tableId, quint8 charId) const;
 	bool openFont(const QByteArray &data);
 	bool openFont2(const QByteArray &data);
 	bool openFontSize(const QByteArray &data);
@@ -71,7 +91,7 @@
 	}
 
 	QVector<quint8> _charWidth;
-	TimFile _font, _font2;
+	TimFile _icons, _font, _font2;
 	bool modified;
 };
 
diff -Nru makoureactor-1.7.2/core/world/TblFile.cpp makoureactor-1.8.0/core/world/TblFile.cpp
--- makoureactor-1.7.2/core/world/TblFile.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/core/world/TblFile.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -23,17 +23,17 @@
 
 bool TblFile::open(const QByteArray &data)
 {
-	if(data.size() % 24 != 0) {
+	if (data.size() % 24 != 0) {
 		return false;
 	}
 
 	int entryCount = data.size() / 24;
 	const char *constData = data.constData();
 
-	for(int i=0 ; i<entryCount ; ++i) {
+	for (int i=0; i<entryCount; ++i) {
 		TblFileEntry entry;
 
-		for(int j=0 ; j<2 ; ++j) {
+		for (int j=0; j<2; ++j) {
 			memcpy(entry.wm2Field + j, constData, sizeof(WorldToField));
 
 			constData += 12;
@@ -49,8 +49,8 @@
 {
 	QByteArray data;
 
-	foreach(const TblFileEntry &entry, _entries) {
-		for(int i=0 ; i<2 ; ++i) {
+	for (const TblFileEntry &entry : _entries) {
+		for (int i=0; i<2; ++i) {
 			const WorldToField &wm2Field = entry.wm2Field[i];
 
 			data.append((char *)&wm2Field.x, 2);
@@ -72,12 +72,12 @@
 	QString ret;
 
 	int mapId=0;
-	foreach(const TblFileEntry &entry, _entries) {
+	for (const TblFileEntry &entry : _entries) {
 		ret.append(QString("WM%1: ").arg(mapId++));
 		QStringList entriesStr;
-		for(int i=0 ; i<2 ; ++i) {
+		for (int i=0; i<2; ++i) {
 			const WorldToField &wm2Field = entry.wm2Field[i];
-			if(wm2Field.fieldId != 0) {
+			if (wm2Field.fieldId != 0) {
 				entriesStr.append(QString("At (x=%1, y=%2, z=%3) => field %4 (direction=%5)")
 								  .arg(wm2Field.x).arg(wm2Field.y).arg(wm2Field.z)
 								  .arg(wm2Field.fieldId).arg(wm2Field.dir));
diff -Nru makoureactor-1.7.2/Data.cpp makoureactor-1.8.0/Data.cpp
--- makoureactor-1.7.2/Data.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Data.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -54,27 +54,37 @@
 	ff7AppPath_cache = ff7DataPath_cache = QString();
 }
 
-
-QString Data::regValue(const QString &regPath, const QString &regKey)
+QString Data::regValue(const QString &regPath, const QString &regKey,
+                       RegTarget target, RegLocation loc)
 {
 #ifdef Q_OS_WIN
 	HKEY phkResult;
 	LONG error;
 	REGSAM flags = KEY_READ;
+	HKEY hkey = HKEY_LOCAL_MACHINE;
 
+	if (target == Target32) {
 #ifdef KEY_WOW64_32KEY
-	flags |= KEY_WOW64_32KEY; // if you compile in 64-bit, force reg search into 32-bit entries
+		flags |= KEY_WOW64_32KEY; // if you compile in 64-bit, force reg search into 32-bit entries
+#endif
+	} else if (target == Target64) {
+#ifdef KEY_WOW64_64KEY
+		flags |= KEY_WOW64_64KEY;
 #endif
+	}
 
-	// Open regPath relative to HKEY_LOCAL_MACHINE
-	error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, (wchar_t *)QDir::toNativeSeparators("SOFTWARE/" + regPath).utf16(), 0, flags, &phkResult);
-	if(ERROR_SUCCESS == error) {
+	// Open regPath relative to HKEY_LOCAL_MACHINE or HKEY_CURRENT_USER
+	if (loc == LocationUser) {
+		hkey = HKEY_CURRENT_USER;
+	}
+	error = RegOpenKeyEx(hkey, (wchar_t *)QDir::toNativeSeparators("SOFTWARE/" % regPath).utf16(), 0, flags, &phkResult);
+	if (ERROR_SUCCESS == error) {
 		BYTE value[MAX_PATH];
 		DWORD cValue = MAX_PATH, type;
 
 		// Open regKey which must is a string value (REG_SZ)
-		RegQueryValueEx(phkResult, (wchar_t *)regKey.utf16(), NULL, &type, value, &cValue);
-		if(ERROR_SUCCESS == error && type == REG_SZ) {
+		RegQueryValueEx(phkResult, (wchar_t *)regKey.utf16(), nullptr, &type, value, &cValue);
+		if (ERROR_SUCCESS == error && type == REG_SZ) {
 			RegCloseKey(phkResult);
 			return QString::fromUtf16((ushort *)value);
 		}
@@ -83,47 +93,72 @@
 #else
 	Q_UNUSED(regPath)
 	Q_UNUSED(regKey)
+	Q_UNUSED(target)
+	Q_UNUSED(loc)
 #endif
+
 	return QString();
 }
 
+QString Data::regValue(const QString &regPath, const QString &regKey,
+                       RegLocation loc)
+{
+	QString ret;
+
+#if defined(KEY_WOW64_32KEY) || defined(KEY_WOW64_64KEY)
+	ret = regValue(regPath, regKey, Target32, loc);
+	if (ret.isEmpty()) {
+		ret = regValue(regPath, regKey, Target64, loc);
+	}
+#else
+	ret = regValue(regPath, regKey, TargetNone, loc);
+#endif
+
+	return ret;
+}
+
 const QString &Data::searchRereleasedFF7Path()
 {
 #ifdef Q_OS_WIN
-	if(ff7RereleasePath_cache.isNull() && !ff7RereleaseAlreadySearched) {
+	if (ff7RereleasePath_cache.isNull() && !ff7RereleaseAlreadySearched) {
 		ff7RereleaseAlreadySearched = true;
 		HKEY phkResult, phkResult2;
 		LONG error;
+		REGSAM flags = KEY_READ;
+
+#ifdef KEY_WOW64_64KEY
+		flags |= KEY_WOW64_64KEY; // if you compile in 64-bit, force reg search into 64-bit entries
+#endif
 
 		// direct
 		ff7RereleasePath_cache = regValuePath("Microsoft/Windows/CurrentVersion/Uninstall/{141B8BA9-BFFD-4635-AF64-078E31010EC3}_is1", "InstallLocation");
-		if(!ff7RereleasePath_cache.isEmpty()) {
+		if (!ff7RereleasePath_cache.isEmpty()) {
 			return ff7RereleasePath_cache;
 		}
 
 		// if another id
-		error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"), 0, KEY_READ, &phkResult);
+		error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"), 0, flags, &phkResult);
 
-		if(ERROR_SUCCESS == error) {
+		if (ERROR_SUCCESS == error) {
 			DWORD index = 0;
 			WCHAR subKeyName[MAX_PATH];
 			DWORD subKeyCName = MAX_PATH;
-			while(ERROR_NO_MORE_ITEMS != (error = RegEnumKeyEx(phkResult, index, subKeyName, &subKeyCName, NULL, NULL, NULL, NULL))) {
+			while (ERROR_NO_MORE_ITEMS != (error = RegEnumKeyEx(phkResult, index, subKeyName, &subKeyCName, nullptr, nullptr, nullptr, nullptr))) {
 				QString subKeyNameStr = QString::fromUtf16((ushort *)subKeyName);
-				if(subKeyNameStr.endsWith("_is1")) {
+				if (subKeyNameStr.endsWith("_is1")) {
 					error = RegOpenKeyEx(phkResult, (LPCWSTR)QString("%1\\").arg(subKeyNameStr).utf16(), 0, KEY_READ, &phkResult2);
-					if(ERROR_SUCCESS == error) {
+					if (ERROR_SUCCESS == error) {
 						BYTE value[MAX_PATH];
 						DWORD cValue = MAX_PATH, type;
-						error = RegQueryValueEx(phkResult2, TEXT("DisplayName"), NULL, &type, value, &cValue);
-						if(ERROR_SUCCESS == error) {
-							if(type == REG_SZ) {
+						error = RegQueryValueEx(phkResult2, TEXT("DisplayName"), nullptr, &type, value, &cValue);
+						if (ERROR_SUCCESS == error) {
+							if (type == REG_SZ) {
 								QString softwareNameStr = QString::fromUtf16((ushort *)value);
-								if(softwareNameStr.compare("FINAL FANTASY VII", Qt::CaseInsensitive) == 0) {
+								if (softwareNameStr.compare("FINAL FANTASY VII", Qt::CaseInsensitive) == 0) {
 									cValue = MAX_PATH;
-									error = RegQueryValueEx(phkResult2, TEXT("InstallLocation"), NULL, &type, value, &cValue);
-									if(ERROR_SUCCESS == error) {
-										if(type == REG_SZ) {
+									error = RegQueryValueEx(phkResult2, TEXT("InstallLocation"), nullptr, &type, value, &cValue);
+									if (ERROR_SUCCESS == error) {
+										if (type == REG_SZ) {
 											RegCloseKey(phkResult2);
 											RegCloseKey(phkResult);
 											ff7RereleasePath_cache = QDir::fromNativeSeparators(QDir::cleanPath(QString::fromUtf16((ushort *)value)));
@@ -151,29 +186,35 @@
 
 QString Data::searchSteamFF7Path()
 {
-	return regValuePath("Microsoft/Windows/CurrentVersion/Uninstall/Steam App 39140", "InstallLocation");
+	QString ret = regValuePath("Microsoft/Windows/CurrentVersion/Uninstall/Steam App 39140", "InstallLocation");
+	if (ret.isEmpty() || !QFile::exists(ret)) {
+		QString steamPath = regValue("Valve/Steam", "SteamPath", LocationUser);
+		return steamPath % "/steamapps/common/FINAL FANTASY VII";
+	}
+
+	return ret;
 }
 
 QString Data::searchFF7Exe(FF7Version version)
 {
 	QString ff7Path;
 
-	switch(version) {
+	switch (version) {
 	case Standard:
 		ff7Path = regValuePath(FF7_WIN_REGISTER_PATH, "AppPath");
-		if(!ff7Path.isEmpty() && QFile::exists(ff7Path + "/ff7.exe")) {
+		if (!ff7Path.isEmpty() && QFile::exists(ff7Path + "/ff7.exe")) {
 			return ff7Path + "/ff7.exe";
 		}
 		return QString();
 	case Rerelease:
 		ff7Path = searchRereleasedFF7Path();
-		if(!ff7Path.isEmpty() && QFile::exists(ff7Path + "/FF7_Launcher.exe")) {
+		if (!ff7Path.isEmpty() && QFile::exists(ff7Path + "/FF7_Launcher.exe")) {
 			return ff7Path + "/FF7_Launcher.exe";
 		}
 		return QString();
 	case Steam:
 		ff7Path = searchSteamFF7Path();
-		if(!ff7Path.isEmpty() && QFile::exists(ff7Path + "/FF7_Launcher.exe")) {
+		if (!ff7Path.isEmpty() && QFile::exists(ff7Path + "/FF7_Launcher.exe")) {
 			return ff7Path + "/FF7_Launcher.exe";
 		}
 		return QString();
@@ -183,7 +224,7 @@
 
 	/*
 	QString ff7MusicPath = regValuePath("FF7Music", "InstDir");
-	if(!ff7MusicPath.isEmpty() && QFile::exists(ff7MusicPath + "/launchff7.exe")) {
+	if (!ff7MusicPath.isEmpty() && QFile::exists(ff7MusicPath + "/launchff7.exe")) {
 		return ff7MusicPath + "/launchff7.exe";
 	}
 	*/
@@ -194,29 +235,29 @@
 {
 	QString dataPath, ff7Path;
 
-	switch(version) {
+	switch (version) {
 	case Standard:
 		dataPath = regValuePath(FF7_WIN_REGISTER_PATH, "DataPath");
-		if(!dataPath.isEmpty() && QFile::exists(dataPath)) {
+		if (!dataPath.isEmpty() && QFile::exists(dataPath)) {
 			return dataPath;
 		}
 		return QString();
 	case Rerelease:
 		ff7Path = searchRereleasedFF7Path();
-		if(!ff7Path.isEmpty() && QFile::exists(ff7Path + "/data")) {
+		if (!ff7Path.isEmpty() && QFile::exists(ff7Path + "/data")) {
 			return ff7Path + "/data";
 		}
 		return QString();
 	case Steam:
 		ff7Path = searchSteamFF7Path();
-		if(!ff7Path.isEmpty() && QFile::exists(ff7Path + "/data")) {
+		if (!ff7Path.isEmpty() && QFile::exists(ff7Path + "/data")) {
 			return ff7Path + "/data";
 		}
 		return QString();
 	case Custom:
 		ff7Path = Config::value("customFF7Path").toString();
 		ff7Path = ff7Path.left(ff7Path.lastIndexOf('/'));
-		if(QFile::exists(ff7Path + "/data")) {
+		if (QFile::exists(ff7Path + "/data")) {
 			return ff7Path + "/data";
 		}
 	}
@@ -231,7 +272,7 @@
 	foreach(FF7Version version,
 			QList<FF7Version>() << Standard << Rerelease << Steam << Custom) {
 		QString dataPath = (*searchFF7Path)(version);
-		if(!dataPath.isEmpty()) {
+		if (!dataPath.isEmpty()) {
 			ff7List.insert(version, dataPath);
 		}
 	}
@@ -253,8 +294,8 @@
 {
 	FF7Version version = FF7Version(Config::value("FF7ExePathToUse", 0).toInt());
 
-	if(!pathList.contains(version)) {
-		foreach(const QString &appPath, pathList) {
+	if (!pathList.contains(version)) {
+		for (const QString &appPath : pathList) {
 			return appPath;
 		}
 	} else {
@@ -266,10 +307,10 @@
 
 const QString &Data::ff7AppPath()
 {
-	if(ff7AppPath_cache.isNull()) {
+	if (ff7AppPath_cache.isNull()) {
 		QString appPath = ff7Path(ff7AppPathList());
 
-		if(!appPath.isEmpty()) {
+		if (!appPath.isEmpty()) {
 			ff7AppPath_cache = appPath;
 		}
 	}
@@ -278,10 +319,10 @@
 
 const QString &Data::ff7DataPath()
 {
-	if(ff7DataPath_cache.isNull()) {
+	if (ff7DataPath_cache.isNull()) {
 		QString appPath = ff7Path(ff7DataPathList());
 
-		if(!appPath.isEmpty()) {
+		if (!appPath.isEmpty()) {
 			ff7DataPath_cache = appPath;
 		}
 	}
@@ -291,16 +332,24 @@
 QString Data::ff7KernelPath()
 {
 	QString path = ff7DataPath();
-	if(!path.isEmpty()) {
-		if(QFile::exists(path + "/kernel/KERNEL.BIN")) {
+	if (!path.isEmpty()) {
+		if (QFile::exists(path + "/kernel/KERNEL.BIN")) {
 			path.append("/kernel");
 		} else {
 			QString lang = QLocale::system().name().toLower();
 			lang = Config::value("lang", lang.left(lang.indexOf("_"))).toString().toLower();
-			if(lang == "de" || lang == "en" || lang == "es" || lang == "fr")
+			if (QFile::exists(path + QString("/lang-%1/kernel").arg(lang)))
 				path.append(QString("/lang-%1/kernel").arg(lang));
-			else
-				path.append(QString("/lang-fr/kernel"));
+			else {
+				QStringList langs;
+				langs << "de" << "en" << "es" << "fr" << "ja";
+				for (const QString &lang : qAsConst(langs)) {
+					if (QFile::exists(path + QString("/lang-%1/kernel").arg(lang))) {
+						path.append(QString("/lang-%1/kernel").arg(lang));
+						break;
+					}
+				}
+			}
 		}
 	}
 
@@ -310,8 +359,8 @@
 QString Data::charlgp_path()
 {
 	QString charPath = Config::value("charPath").toString();
-	if(charPath.isEmpty()) {
-		if(Data::ff7DataPath().isEmpty())	return QString();
+	if (charPath.isEmpty()) {
+		if (Data::ff7DataPath().isEmpty())	return QString();
 		charPath = Data::ff7DataPath()%"/field/char.lgp";
 	}
 
@@ -321,22 +370,22 @@
 int Data::loadKernel2Bin()
 {
 	QString path = Config::value("kernel2Path").toString();
-	if(path.isEmpty()) {
+	if (path.isEmpty()) {
 		path = ff7KernelPath();
-		if(path.isEmpty()) {
+		if (path.isEmpty()) {
 			return 2;
 		}
 		path.append("/kernel2.bin");
 	}
 
 	QFile fic(path);
-	if(fic.open(QIODevice::ReadOnly)) {
+	if (fic.open(QIODevice::ReadOnly)) {
 		quint32 fileSize;
-		if(fic.read((char *)&fileSize, 4) != 4) {
+		if (fic.read((char *)&fileSize, 4) != 4) {
 			return 2;
 		}
 
-		if(fileSize + 4 != fic.size()) {
+		if (fileSize + 4 != fic.size()) {
 			return 2;
 		}
 
@@ -346,8 +395,8 @@
 
 		fic.close();
 
-		for(int i=0 ; i<10 ; ++i) {
-			if(pos + 4 >= dataSize) {
+		for (int i=0; i<10; ++i) {
+			if (pos + 4 >= dataSize) {
 				return 1;
 			}
 
@@ -355,14 +404,14 @@
 			pos += fileSize + 4;
 		}
 
-		if(pos + 4 >= dataSize) {
+		if (pos + 4 >= dataSize) {
 			return 1;
 		}
 
 		memcpy(&fileSize, constData + pos, 4);
 		pos += 4;
 
-		if(pos + (int)fileSize > dataSize) {
+		if (pos + (int)fileSize > dataSize) {
 			return 1;
 		}
 
@@ -370,14 +419,14 @@
 		fill(data, pos, fileSize, item_names);
 		pos += fileSize;
 
-		if(pos + 4 > dataSize) {
+		if (pos + 4 > dataSize) {
 			return 1;
 		}
 
 		memcpy(&fileSize, constData + pos, 4);
 		pos += 4;
 
-		if(pos + (int)fileSize > dataSize) {
+		if (pos + (int)fileSize > dataSize) {
 			return 1;
 		}
 
@@ -385,14 +434,14 @@
 		fill(data, pos, fileSize, weapon_names);
 		pos += fileSize;
 
-		if(pos + 4 > dataSize) {
+		if (pos + 4 > dataSize) {
 			return 1;
 		}
 
 		memcpy(&fileSize, constData + pos, 4);
 		pos += 4;
 
-		if(pos + (int)fileSize > dataSize) {
+		if (pos + (int)fileSize > dataSize) {
 			return 1;
 		}
 
@@ -400,14 +449,14 @@
 		fill(data, pos, fileSize, armor_names);
 		pos += fileSize;
 
-		if(pos + 4 > dataSize) {
+		if (pos + 4 > dataSize) {
 			return 1;
 		}
 
 		memcpy(&fileSize, constData + pos, 4);
 		pos += 4;
 
-		if(pos + (int)fileSize > dataSize) {
+		if (pos + (int)fileSize > dataSize) {
 			return 1;
 		}
 
@@ -415,14 +464,14 @@
 		fill(data, pos, fileSize, accessory_names);
 		pos += fileSize;
 
-		if(pos + 4 > dataSize) {
+		if (pos + 4 > dataSize) {
 			return 1;
 		}
 
 		memcpy(&fileSize, constData + pos, 4);
 		pos += 4;
 
-		if(pos + (int)fileSize > dataSize) {
+		if (pos + (int)fileSize > dataSize) {
 			return 1;
 		}
 
@@ -436,16 +485,16 @@
 int Data::loadWindowBin()
 {
 	QString path = Config::value("windowBinPath").toString();
-	if(path.isEmpty()) {
+	if (path.isEmpty()) {
 		path = ff7KernelPath();
-		if(path.isEmpty()) {
+		if (path.isEmpty()) {
 			return 1;
 		}
 		path.append("/window.bin");
 	}
 
-	if(!windowBin.open(path)) {
-		qWarning() << "Cannot open window.bin";
+	if (!windowBin.open(path)) {
+		qWarning() << "Cannot open" << path;
 		return 2;
 	}
 
@@ -454,15 +503,15 @@
 
 bool Data::load()
 {
-	if(char_names.isEmpty()) {
+	if (char_names.isEmpty()) {
 		char_names
 				<< QObject::tr("Cloud") << QObject::tr("Barret") << QObject::tr("Tifa")
-				<< QObject::tr("Aeris") << QObject::tr("Red XIII") << QObject::tr("Yuffie")
+				<< QObject::tr("Aerith") << QObject::tr("Red XIII") << QObject::tr("Yuffie")
 				<< QObject::tr("Cait Sith") << QObject::tr("Vincent") << QObject::tr("Cid")
 				<< QObject::tr("Yound Cloud") << QObject::tr("Sephiroth") << QObject::tr("Chocobo");
 	}
 
-	if(key_names.isEmpty()) {
+	if (key_names.isEmpty()) {
 		key_names
 				<< QObject::tr("[CAMERA|L2]") << QObject::tr("[TARGET|R2]")
 				<< QObject::tr("[PAGE UP|L1]") << QObject::tr("[PAGE DOWN|R1]")
@@ -474,28 +523,28 @@
 				<< QObject::tr("[DOWN]") << QObject::tr("[LEFT]");
 	}
 
-	if(movie_names_cd1.isEmpty()) {
+	if (movie_names_cd1.isEmpty()) {
 		QStringList movie_names_common;
-		for(int i=0 ; i<20 ; ++i) {
+		for (int i=0; i<20; ++i) {
 			movie_names_common.append(movieList[i]);
 		}
 
 		movie_names_cd1.append(movie_names_common);
 		movie_names_cd2.append(movie_names_common);
 		movie_names_cd3.append(movie_names_common);
-		for(int i=20 ; i<54 ; ++i) {
+		for (int i=20; i<54; ++i) {
 			movie_names_cd1.append(movieList[i]);
 		}
-		for(int i=54 ; i<96 ; ++i) {
+		for (int i=54; i<96; ++i) {
 			movie_names_cd2.append(movieList[i]);
 		}
-		for(int i=96 ; i<106 ; ++i) {
+		for (int i=96; i<106; ++i) {
 			movie_names_cd3.append(movieList[i]);
 		}
 	}
 
-	if(music_names.isEmpty()) {
-		for(int i=0 ; i<100 ; ++i) {
+	if (music_names.isEmpty()) {
+		for (int i=0; i<100; ++i) {
 			music_names.append(musicList[i]);
 			music_desc.append(musicList2[i]);
 		}
@@ -521,7 +570,7 @@
 	const char *constData = data.constData();
 	QList<quint16> positions;
 
-	if(dataSize < 2) {
+	if (dataSize < 2) {
 		return;
 	}
 
@@ -529,13 +578,13 @@
 
 	count = position / 2;
 
-	if(dataSize < position) {
+	if (dataSize < position) {
 		return;
 	}
 
-	for(i=0 ; i<count ; ++i) {
+	for (i=0; i<count; ++i) {
 		memcpy(&position, constData + pos + i*2, 2);
-		if(position >= dataSize || lastPosition > position) {
+		if (position >= dataSize || lastPosition > position) {
 			return;
 		}
 		positions.append(position);
@@ -544,43 +593,47 @@
 	positions.append(dataSize);
 
 	i=0;
-	foreach(position, positions) {
+	for (quint16 position : positions) {
 		names.append(FF7Text(data.mid(pos + position, positions.at(i+1) - position)).text(false, true));
 		++i;
-		if(i == count)	break;
+		if (i == count)	break;
 	}
 }
 
 bool Data::openMaplist(const QByteArray &data)
 {
-	if(data.size() < 2) {
+	if (data.size() < 2) {
 		return false;
 	}
 
 	quint16 nbMap;
 	memcpy(&nbMap, data.constData(), 2);
 
-	if(data.size() != 2+nbMap*32) {
+	if (data.size() != 2+nbMap*32) {
 		return false;
 	}
 
 	field_names.clear();
-	for(int i=0 ; i<nbMap ; ++i) {
+	for (int i=0; i<nbMap; ++i) {
 		field_names.append(QString(data.mid(2+i*32, 32)).simplified());
 	}
+	// Remove empty entries at the end
+	while (!field_names.isEmpty() && field_names.last().isEmpty()) {
+		field_names.removeLast();
+	}
 
 	return true;
 }
 
 bool Data::saveMaplist(QByteArray &data)
 {
-	if(field_names.size() > 65535) {
+	if (field_names.size() > 65535) {
 		return false;
 	}
 	quint16 nbMap = field_names.size();
 	data.append((char *)&nbMap, 2);
 
-	foreach(const QString &fieldName, field_names) {
+	for (const QString &fieldName : qAsConst(field_names)) {
 		data.append(fieldName.toLatin1()
 		            .leftJustified(32, '\0', true));
 	}
@@ -606,7 +659,7 @@
 	"ending1", "ending3", "fcar", "white2", "ending2"
 };
 
-const char *Data::mapList[788] = {
+const char *Data::_mapList[788] = {
 	"dummy", "wm0", "wm1", "wm2", "wm3", "wm4", "wm5", "wm6",
 	"wm7", "wm8", "wm9", "wm10", "wm11", "wm12", "wm13", "wm14",
 	"wm15", "wm16", "wm17", "wm18", "wm19", "wm20", "wm21", "wm22",
@@ -724,11 +777,11 @@
 void Data::openMaplist(bool PC)
 {
 	field_names.clear();
-	for(int i=0 ; i<788 ; ++i) {
-		field_names.append(mapList[i]);
+	for (int i=0; i<788; ++i) {
+		field_names.append(_mapList[i]);
 	}
 
-	if(PC) {
+	if (PC) {
 		toPCMaplist(field_names);
 	}
 }
@@ -755,7 +808,7 @@
 
 const char *Data::musicList[100] =
 {
-	"none", "none", "oa", "ob", "dun2", "guitar2", "fanfare", "makoro", "bat",
+	"none", "nothing", "oa", "ob", "dun2", "guitar2", "fanfare", "makoro", "bat",
 	"fiddle", "kurai", "chu", "ketc", "earis", "ta", "tb", "sato",
 	"parade", "comical", "yume", "mati", "sido", "siera", "walz", "corneo",
 	"horror", "canyon", "red", "seto", "ayasi", "sinra", "sinraslo", "dokubo",
@@ -772,12 +825,12 @@
 
 const char *Data::musicList2[100] =
 {
-	"none", "none", "Opening - Bombing Mission", "Bombing Mission",
+	"none", "nothing", "Opening - Bombing Mission", "Bombing Mission",
 	"Chasing The Black-Caped Man", "On The Other Side Of The Mountain",
 	"Fanfare (intro)", "Mako Reactor", "Fighting", "Fiddle De Chocobo",
 	"Anxious Heart", "Still More Fighting", "Cait Sith's Theme", "Aerith's Theme",
 	"Final Fantasy VII Main Theme", "Final Fantasy VII Main Theme B", "sato",
-	"Rufus' Welcoming Ceremony", "J-E-N-O-V-A", "Who Are You", "Ahead on Our Way",
+	"Rufus' Welcoming Ceremony", "comical", "Who Are You", "Ahead on Our Way",
 	"It's Difficult to Stand on Both Feet, Isn't It", "If You Open Your Heart",
 	"Waltz de Chocobo", "Don of the Slums", "Trail Of Blood", "Cosmo Canyon",
 	"Red XIII's Theme", "Great Warrior", "Lurking in the Darkness",
@@ -788,7 +841,7 @@
 	"Life Stream", "Electric de Chocobo", "Turk's Theme", "Fanfare",
 	"Highwind Takes To The Skies", "The Makou Cannon Is Fired ~ Shinra Explodes A",
 	"Interrupted By Fireworks", "Those Chosen By The Planet (Intro)", "Cinco de Chocobo",
-	"J-E-N-O-V-A (2)", "Descendant Of Shinobi", "Hurry!", "Gold Saucer",
+	"J-E-N-O-V-A", "Descendant Of Shinobi", "Hurry!", "Gold Saucer",
 	"Parochial Town", "Good Night, Until Tomorrow", "Continue", "A Great Success",
 	"Tango Of Tears", "Racing Chocobo ~ Place Your Bets", "Debut",
 	"Off The Edge Of Despair", "Holding My Thoughts In My Heart", "wind",
@@ -804,3 +857,30 @@
 	"The Makou Cannon Is Fired ~ Shinra Explodes C", "Highwind Takes to the Skies",
 	"The Prelude", "World Crisis", "heart", "Staff Roll"
 };
+
+QColor Data::color(Color color)
+{
+	bool darkTheme = Config::value("dark_theme", false).toBool();
+
+	switch (color) {
+	case ColorEvidence:
+		return darkTheme ? qRgb(67, 67, 211) : qRgb(196, 196, 255);
+	case ColorRedForeground:
+		return darkTheme ? qRgb(0xF0, 0x90, 0x90) : qRgb(0xb0, 0x18, 0x18);
+	case ColorGreenForeground:
+		return darkTheme ? qRgb(0x00, 0xc6, 0x00) : qRgb(0x00, 0x68, 0x00);
+	case ColorBlueForeground:
+		return darkTheme ? qRgb(0x5E, 0xAF, 0xFF) : qRgb(0x00, 0x57, 0xAF);
+	case ColorPurpleForeground:
+		return darkTheme ? qRgb(0xC9, 0x92, 0xFF) : qRgb(0x66, 0x00, 0xCC);
+	case ColorOrangeForeground:
+		return darkTheme ? qRgb(0xFF, 0x8D, 0x1A) : qRgb(0x8C, 0x46, 0x00);
+	case ColorGreyForeground:
+		return darkTheme ? qRgb(0xCC, 0xCC, 0xCC) : qRgb(0x59, 0x59, 0x59);
+	case ColorDisabledForeground:
+		return darkTheme ? qRgb(0xAA, 0xAA, 0xAA) : qRgb(0xCC, 0xCC, 0xCC);
+	case ColorRedBackground:
+		return darkTheme ? qRgb(0xB6, 0x00, 0x00) : qRgb(0xFF, 0xCC, 0xCC);
+	}
+	return QColor();
+}
diff -Nru makoureactor-1.7.2/Data.h makoureactor-1.8.0/Data.h
--- makoureactor-1.7.2/Data.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Data.h	2020-08-08 18:46:56.000000000 +0000
@@ -31,6 +31,17 @@
 	enum FF7Version {
 		Standard, Rerelease, Steam, Custom
 	};
+	enum Color {
+		ColorEvidence,
+		ColorRedForeground,
+		ColorGreenForeground,
+		ColorBlueForeground,
+		ColorPurpleForeground,
+		ColorOrangeForeground,
+		ColorGreyForeground,
+		ColorDisabledForeground,
+		ColorRedBackground
+	};
 
 	static void refreshFF7Paths();
 	static const QString &ff7DataPath();
@@ -47,6 +58,22 @@
 	static void openMaplist(bool PC=false);
 	static bool saveMaplist(QByteArray &data);
 	static void toPCMaplist(QStringList &field_names);
+	static QColor color(Color color);
+	inline static QStringList maplist() {
+		return field_names;
+	}
+	inline static void setMaplist(const QStringList &maplist) {
+		field_names = maplist;
+	}
+	inline static void addMap(const QString &map) {
+		field_names.append(map);
+	}
+	inline static void setMap(int i, const QString &map) {
+		field_names[i] = map;
+	}
+	inline static QString mapName(int i) {
+		return field_names.value(i);
+	}
 	static QStringList char_names;
 	static QStringList key_names;
 	static QStringList item_names;
@@ -58,15 +85,24 @@
 	static int currentModelID;
 	static QStringList *currentHrcNames;
 	static QList<QStringList> *currentAnimNames;
-	static QStringList field_names;
 	static QStringList movie_names_cd1, movie_names_cd2, movie_names_cd3;
 	static QStringList music_names;
 	static QStringList music_desc;
-	static QString regValue(const QString &regPath, const QString &regKey);
-	static inline QString regValuePath(const QString &regPath, const QString &regKey) {
-		return QDir::fromNativeSeparators(QDir::cleanPath(regValue(regPath, regKey)));
-	}
 private:
+	enum RegLocation {
+		LocationUser,
+		LocationMachine
+	};
+	enum RegTarget {
+		TargetNone,
+		Target32,
+		Target64
+	};
+	static QString regValue(const QString &regPath, const QString &regKey, RegLocation loc = LocationMachine);
+	static inline QString regValuePath(const QString &regPath, const QString &regKey, RegLocation loc = LocationMachine) {
+		return QDir::fromNativeSeparators(QDir::cleanPath(regValue(regPath, regKey, loc)));
+	}
+	static QString regValue(const QString &regPath, const QString &regKey, RegTarget target, RegLocation loc);
 	static const QString &searchRereleasedFF7Path();
 	static QString searchSteamFF7Path();
 	static QString searchFF7Exe(FF7Version version);
@@ -74,12 +110,13 @@
 	static QString ff7Path(const QMap<FF7Version, QString> &pathList);
 	static QMap<Data::FF7Version, QString> ff7PathList(QString (*searchFF7Path)(FF7Version));
 	static void fill(const QByteArray &data, int pos, int dataSize, QStringList &names);
+	static QStringList field_names;
 	static QString ff7DataPath_cache;
 	static QString ff7AppPath_cache;
 	static QString ff7RereleasePath_cache;
 	static bool ff7RereleaseAlreadySearched;
 	static const char *movieList[106];
-	static const char *mapList[788];
+	static const char *_mapList[788];
 	static const char *musicList[100];
 	static const char *musicList2[100];
 
diff -Nru makoureactor-1.7.2/debian/bzr-builder.manifest makoureactor-1.8.0/debian/bzr-builder.manifest
--- makoureactor-1.7.2/debian/bzr-builder.manifest	2016-11-12 20:46:37.000000000 +0000
+++ makoureactor-1.8.0/debian/bzr-builder.manifest	2020-08-08 18:46:56.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0~344
-lp:makoureactor revid:git-v1:c0c1435f9dff5970d394b67da7af51185f0b24af
+# bzr-builder format 0.3 deb-version {debupstream}-0~431
+lp:makoureactor revid:git-v1:0d9c6a8d2228cdb56a2635e0aafa742e304a1a78
diff -Nru makoureactor-1.7.2/debian/changelog makoureactor-1.8.0/debian/changelog
--- makoureactor-1.7.2/debian/changelog	2016-11-12 20:46:37.000000000 +0000
+++ makoureactor-1.8.0/debian/changelog	2020-08-08 18:46:56.000000000 +0000
@@ -1,8 +1,19 @@
-makoureactor (1.7.2-0~344~ubuntu16.04.1) xenial; urgency=low
+makoureactor (1.8.0-0~431~ubuntu16.04.1) xenial; urgency=low
 
   * Auto build.
 
- -- sithlord48 <sithlord48@gmail.com>  Sat, 12 Nov 2016 20:46:37 +0000
+ -- sithlord48 <sithlord48@gmail.com>  Sat, 08 Aug 2020 18:46:56 +0000
+
+makoureactor (1.8.0) xenial; urgency=low
+
+  * Major version with lot of changes
+  * Improved text editor
+  * Open/Save fixes
+  * LGP Archive file preview
+  * Dark Mode
+  * Fixes for Android version
+
+ -- myst6re <myst6re@gmail.com>  Sat, 8 Aug 2020 15:17:52 +0200
 
 makoureactor (1.7.2) trusty; urgency=low
 
diff -Nru makoureactor-1.7.2/deploy.bat makoureactor-1.8.0/deploy.bat
--- makoureactor-1.7.2/deploy.bat	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/deploy.bat	2020-08-08 18:46:56.000000000 +0000
@@ -12,8 +12,8 @@
 rem Deploy DLLs
 %LIB_DIR%\windeployqt.exe --force --release --dir %OUTPUT_DIR% --no-quick-import --no-translations --no-webkit2 --no-angle --no-svg --no-webkit %EXE_PATH%
 
-rem Removing unused DLLs
-del /q %OUTPUT_DIR%\opengl32sw.dll
+rem Removing unused DLLs (obsolete)
+if exist %OUTPUT_DIR%\opengl32sw.dll del /q %OUTPUT_DIR%\opengl32sw.dll
 
 rem Deploy Translations
 for %%l in (%LANGUAGES%) do (
@@ -23,6 +23,3 @@
 
 rem Deploy Exe
 xcopy /y %EXE_PATH% %OUTPUT_DIR%
-
-rem Compress Exe and DLLs. Note: DLLs in platforms/ directory should not be compressed.
-upx %OUTPUT_DIR%\*.dll %OUTPUT_DIR%\*.exe
diff -Nru makoureactor-1.7.2/FieldModelThread.cpp makoureactor-1.8.0/FieldModelThread.cpp
--- makoureactor-1.7.2/FieldModelThread.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/FieldModelThread.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -24,7 +24,7 @@
 	_field(0), _animationId(0),
 	_animate(true)
 {
-	if(mutexField == 0) {
+	if (mutexField == 0) {
 		mutexField = new QMutex();
 	}
 }
@@ -70,7 +70,7 @@
 
 void FieldModelThread::run()
 {
-	if(!_field) {
+	if (!_field) {
 		qWarning() << "FieldModelThread::run() -> No field provided!";
 		return;
 	}
@@ -84,13 +84,13 @@
 
 	mutexField->lock();
 	Field *field = _field;
-	foreach(int modelId, modelIds) {
-		if(_canceled) {
+	for (int modelId : modelIds) {
+		if (_canceled) {
 			mutexField->unlock();
 			return;
 		}
 		FieldModelFile *fieldModel = field->fieldModel(modelId, animationId, animate);
-		if(!_canceled && fieldModel->isValid()) {
+		if (!_canceled && fieldModel->isValid()) {
 			emit modelLoaded(field, fieldModel, modelId, animationId, animate);
 		}
 	}
Binary files /tmp/tmpOolwmm/uTiAUmByol/makoureactor-1.7.2/images/cursor.png and /tmp/tmpOolwmm/ZV2pe9GiH5/makoureactor-1.8.0/images/cursor.png differ
Binary files /tmp/tmpOolwmm/uTiAUmByol/makoureactor-1.7.2/images/text-editor.png and /tmp/tmpOolwmm/ZV2pe9GiH5/makoureactor-1.8.0/images/text-editor.png differ
diff -Nru makoureactor-1.7.2/main.cpp makoureactor-1.8.0/main.cpp
--- makoureactor-1.7.2/main.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/main.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -20,42 +20,82 @@
 #include "core/Var.h"
 #include "core/Config.h"
 #include "Data.h"
+#include "core/FF7Font.h"
 
 int main(int argc, char *argv[])
 {
-	QGLFormat::setDefaultFormat(QGLFormat(QGL::DirectRendering));
-
 	QApplication app(argc, argv);
 	app.setWindowIcon(QIcon(":/images/logo-shinra.png"));
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-	QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-#endif
 
 	Config::set();
 
 	QString lang = QLocale::system().name().toLower();
 	lang = Config::value("lang", lang.left(lang.indexOf("_"))).toString();
 	QTranslator translator1;
-	if(translator1.load("qt_" % lang, app.applicationDirPath()) || translator1.load("qt_" % lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+	if (translator1.load("qt_" % lang, app.applicationDirPath()) || translator1.load("qt_" % lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
 		app.installTranslator(&translator1);
 	QTranslator translator2;
-	if(translator2.load("Makou_Reactor_" % lang, Config::programResourceDir())) {
+	if (translator2.load("Makou_Reactor_" % lang, Config::programResourceDir())) {
 		app.installTranslator(&translator2);
 		Config::setValue("lang", lang);
 	} else {
 		Config::setValue("lang", "en");
 	}
 
-	if(!Var::load()) {
+	if (Config::value("dark_theme", false).toBool()) {
+		qApp->setStyle(QStyleFactory::create("Fusion"));
+		QPalette darkPalette;
+		QColor disabledColor = QColor(127, 127, 127);
+		darkPalette.setColor(QPalette::Window, QColor(0x19, 0x19, 0x19));
+		darkPalette.setColor(QPalette::WindowText, Qt::white);
+		darkPalette.setColor(QPalette::Base, QColor(0x20, 0x20, 0x20));
+		darkPalette.setColor(QPalette::AlternateBase, QColor(0x27, 0x27, 0x27));
+		darkPalette.setColor(QPalette::ToolTipBase, QColor(0xFE, 0xFE, 0xFE));
+		darkPalette.setColor(QPalette::ToolTipText, QColor(0xFE, 0xFE, 0xFE));
+		darkPalette.setColor(QPalette::Text, QColor(0xFE, 0xFE, 0xFE));
+		darkPalette.setColor(QPalette::Disabled, QPalette::Text, disabledColor);
+		darkPalette.setColor(QPalette::Button, QColor(0x20, 0x20, 0x20));
+		darkPalette.setColor(QPalette::ButtonText, Qt::white);
+		darkPalette.setColor(QPalette::Disabled, QPalette::ButtonText, disabledColor);
+		darkPalette.setColor(QPalette::BrightText, Qt::red);
+		darkPalette.setColor(QPalette::Link, QColor(42, 130, 218));
+		darkPalette.setColor(QPalette::LinkVisited, QColor(42, 130, 218));
+
+		darkPalette.setColor(QPalette::Highlight, QColor(0x77, 0x77, 0x77));
+		darkPalette.setColor(QPalette::HighlightedText, Qt::white);
+		darkPalette.setColor(QPalette::Disabled, QPalette::HighlightedText, disabledColor);
+
+		darkPalette.setColor(QPalette::Light, QColor(0x34, 0x34, 0x34));
+		darkPalette.setColor(QPalette::Midlight, QColor(0x27, 0x27, 0x27));
+		darkPalette.setColor(QPalette::Dark, QColor(0x7, 0x7, 0x7));
+		darkPalette.setColor(QPalette::Mid, QColor(0x14, 0x14, 0x14));
+		darkPalette.setColor(QPalette::Shadow, Qt::black);
+
+#if (QT_VERSION > QT_VERSION_CHECK(5, 11, 0))
+		darkPalette.setColor(QPalette::PlaceholderText, QColor(0x53, 0x53, 0x53));
+#endif
+
+		qApp->setPalette(darkPalette);
+
+		qApp->setStyleSheet("QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }");
+	}
+
+	if (!Var::load()) {
 		QMessageBox::warning(0, QObject::tr("Error"), QObject::tr("The file 'var.cfg' could not be loaded.\nMake sure it is valid or delete it."));
 	}
-	if(!Data::load()) {
+
+	if (!Data::load()) {
 		qWarning() << "Error loading data!";
 	}
 
+	/* if (!FF7Font::listFonts()) {
+		QMessageBox::critical(nullptr, QObject::tr("Data loading"), QObject::tr("Fonts couldn't be loaded!"));
+		return -1;
+	} */
+
 	Window *window = new Window;
 	window->show();
-	if(argc > 1) {
+	if (argc > 1) {
 		window->openFile(argv[1]);
 	}
 
diff -Nru makoureactor-1.7.2/Makou_Reactor.desktop makoureactor-1.8.0/Makou_Reactor.desktop
--- makoureactor-1.7.2/Makou_Reactor.desktop	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Makou_Reactor.desktop	2020-08-08 18:46:56.000000000 +0000
@@ -1,15 +1,13 @@
-[Desktop Entry]
-Type=Application
-Version=1.7.2
-Name=Makou Reactor
-GenericName=FF7 Field Script Editor
-GenericName[fr]=Éditeur d'écrans FF7
-Comment=Can edit field from Final Fantasy VII (PS & PC)
-Comment[fr]=Permet de modifier les écrans de Final Fantasy VII (PS et PC)
-Icon=logo-shinra.png
-Exec=/usr/bin/makoureactor
-Path=
-Terminal=false
-Categories=Application;Game;
-Keywords=PlayStation;Final Fantasy;
-StartupNotify=false
+[Desktop Entry]
+Type=Application
+Name=Makou Reactor
+GenericName=FF7 Field Script Editor
+GenericName[fr]=Éditeur d'écrans FF7
+Comment=Can edit field from Final Fantasy VII (PS & PC)
+Comment[fr]=Permet de modifier les écrans de Final Fantasy VII (PS et PC)
+Icon=logo-shinra
+Exec=/usr/bin/makoureactor
+Terminal=false
+Categories=Game;
+Keywords=PlayStation;Final Fantasy;
+StartupNotify=false
diff -Nru makoureactor-1.7.2/Makou_Reactor_fr.ts makoureactor-1.8.0/Makou_Reactor_fr.ts
--- makoureactor-1.7.2/Makou_Reactor_fr.ts	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Makou_Reactor_fr.ts	2020-08-08 18:46:56.000000000 +0000
@@ -2,6 +2,19 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="fr_FR">
 <context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="widgets/AboutDialog.cpp" line="11"/>
+        <source>By Jérôme &amp;lt;myst6re&amp;gt; Arzel &lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;</source>
+        <translation>Par Jérôme &amp;lt;myst6re&amp;gt; Arzel &lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <location filename="widgets/AboutDialog.cpp" line="17"/>
+        <source>Thanks to:&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;TrueOdin&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;li&gt;DLPB&lt;/li&gt;&lt;/ul&gt;</source>
+        <translation>Merci à&amp;nbsp;:&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;TrueOdin&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;li&gt;DLPB&lt;/li&gt;&lt;/ul&gt;</translation>
+    </message>
+</context>
+<context>
     <name>AnimEditorDialog</name>
     <message>
         <location filename="widgets/AnimEditorDialog.cpp" line="25"/>
@@ -13,7 +26,7 @@
 <context>
     <name>ApercuBG</name>
     <message>
-        <location filename="widgets/ApercuBG.cpp" line="77"/>
+        <location filename="widgets/ApercuBG.cpp" line="82"/>
         <source>Error</source>
         <oldsource>Erreur</oldsource>
         <translation>Erreur</translation>
@@ -32,6 +45,29 @@
     </message>
 </context>
 <context>
+    <name>ArchivePreview</name>
+    <message>
+        <location filename="widgets/ArchivePreview.cpp" line="103"/>
+        <source>Image %1</source>
+        <translation>Image %1</translation>
+    </message>
+    <message>
+        <location filename="widgets/ArchivePreview.cpp" line="116"/>
+        <source>Palette %1</source>
+        <translation>Palette %1</translation>
+    </message>
+    <message>
+        <location filename="widgets/ArchivePreview.cpp" line="131"/>
+        <source>Save Background</source>
+        <translation>Enregistrer le background</translation>
+    </message>
+    <message>
+        <location filename="widgets/ArchivePreview.cpp" line="133"/>
+        <source>PNG image (*.png);;JPG image (*.jpg);;BMP image (*.bmp);;Portable Pixmap (*.ppm)</source>
+        <translation>Image PNG (*.png);;Image JPG (*.jpg);;Image BMP (*.bmp);;Portable Pixmap (*.ppm)</translation>
+    </message>
+</context>
+<context>
     <name>BGDialog</name>
     <message>
         <location filename="widgets/BGDialog.cpp" line="53"/>
@@ -125,172 +161,200 @@
 <context>
     <name>ConfigWindow</name>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="26"/>
+        <location filename="widgets/ConfigWindow.cpp" line="27"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="28"/>
+        <location filename="widgets/ConfigWindow.cpp" line="29"/>
         <source>Dependencies</source>
         <oldsource>Dépendances</oldsource>
         <translation>Dépendances</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="33"/>
+        <location filename="widgets/ConfigWindow.cpp" line="34"/>
         <source>Final Fantasy VII Installs</source>
         <oldsource>Final Fantasy VII installés</oldsource>
         <translation>Final Fantasy VII installés</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="37"/>
+        <location filename="widgets/ConfigWindow.cpp" line="38"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="39"/>
+        <location filename="widgets/ConfigWindow.cpp" line="40"/>
         <source>kernel2.bin</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="41"/>
-        <location filename="widgets/ConfigWindow.cpp" line="44"/>
-        <location filename="widgets/ConfigWindow.cpp" line="47"/>
+        <location filename="widgets/ConfigWindow.cpp" line="42"/>
+        <location filename="widgets/ConfigWindow.cpp" line="45"/>
+        <location filename="widgets/ConfigWindow.cpp" line="48"/>
         <source>Change</source>
         <oldsource>Changer</oldsource>
         <translation>Changer</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="42"/>
+        <location filename="widgets/ConfigWindow.cpp" line="43"/>
         <source>window.bin</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="45"/>
+        <location filename="widgets/ConfigWindow.cpp" line="46"/>
         <source>char.lgp</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="65"/>
+        <location filename="widgets/ConfigWindow.cpp" line="70"/>
+        <source>Theme</source>
+        <translation>Thème</translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="72"/>
+        <source>Dark mode</source>
+        <translation>Mode sombre</translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="77"/>
         <source>OpenGL</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="67"/>
+        <location filename="widgets/ConfigWindow.cpp" line="79"/>
         <source>Disable OpenGL</source>
         <oldsource>Désactiver OpenGL</oldsource>
         <translation>Désactiver OpenGL</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="72"/>
+        <location filename="widgets/ConfigWindow.cpp" line="84"/>
         <source>Text Editor</source>
         <oldsource>Editeur de texte</oldsource>
         <translation>Editeur de texte</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="79"/>
+        <location filename="widgets/ConfigWindow.cpp" line="91"/>
         <source>Defaults</source>
         <translation>Valeurs par défaut</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="115"/>
+        <location filename="widgets/ConfigWindow.cpp" line="97"/>
+        <source>Latin</source>
+        <translation>Latin</translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="98"/>
+        <source>Japanese</source>
+        <translation>Japonais</translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="50"/>
+        <source>Edit...</source>
+        <translation>Modifier...</translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="124"/>
+        <source>Encoding</source>
+        <translation>Encodage</translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="131"/>
         <source>Autosize: margin right</source>
         <translation>Taille auto. : marge à droite</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="129"/>
+        <location filename="widgets/ConfigWindow.cpp" line="145"/>
         <source>Miscellaneous</source>
         <translation>Divers</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="258"/>
+        <location filename="widgets/ConfigWindow.cpp" line="283"/>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="261"/>
-        <location filename="widgets/ConfigWindow.cpp" line="265"/>
+        <location filename="widgets/ConfigWindow.cpp" line="286"/>
+        <location filename="widgets/ConfigWindow.cpp" line="290"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="285"/>
-        <location filename="widgets/ConfigWindow.cpp" line="295"/>
+        <location filename="widgets/ConfigWindow.cpp" line="310"/>
+        <location filename="widgets/ConfigWindow.cpp" line="320"/>
         <source>EXE files (*.exe)</source>
         <translation>Fichiers EXE (*.exe)</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="354"/>
         <source>Lgp Archives (*.lgp);;All Files(*)</source>
-        <translation>Lgp Archives (*.lgp);;All Files(*)</translation>
+        <translation type="vanished">Lgp Archives (*.lgp);;All Files(*)</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="452"/>
+        <location filename="widgets/ConfigWindow.cpp" line="514"/>
         <source>You must restart Makou Reactor to apply all changes.</source>
         <translation>Vous devez redémarrer Makou Reactor pour appliquer tous les changements.</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="84"/>
         <source>Japanese Characters</source>
         <oldsource>Caractères japonais</oldsource>
-        <translation>Caractères japonais</translation>
+        <translation type="vanished">Caractères japonais</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="117"/>
+        <location filename="widgets/ConfigWindow.cpp" line="133"/>
         <source>{SPACED CHARACTERS} width</source>
         <oldsource>Largeur {SPACED CHARACTERS}</oldsource>
         <translation>Largeur {SPACED CHARACTERS}</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="121"/>
+        <location filename="widgets/ConfigWindow.cpp" line="137"/>
         <source>Script Editor</source>
         <oldsource>Editeur de script</oldsource>
         <translation>Editeur de script</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="123"/>
+        <location filename="widgets/ConfigWindow.cpp" line="139"/>
         <source>Expand lines by default</source>
         <oldsource>Lignes expansées par défaut</oldsource>
         <translation>Lignes expansées par défaut</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="131"/>
+        <location filename="widgets/ConfigWindow.cpp" line="147"/>
         <source>Don&apos;t strictly verify the file format</source>
         <oldsource>Ne pas vérifier strictement le format des fichiers</oldsource>
         <translation>Ne pas vérifier strictement le format des fichiers</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="285"/>
-        <location filename="widgets/ConfigWindow.cpp" line="295"/>
+        <location filename="widgets/ConfigWindow.cpp" line="310"/>
+        <location filename="widgets/ConfigWindow.cpp" line="320"/>
         <source>Find ff7.exe</source>
         <oldsource>Chercher ff7.exe</oldsource>
         <translation>Chercher ff7.exe</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="340"/>
+        <location filename="widgets/ConfigWindow.cpp" line="365"/>
         <source>Find kernel2.bin</source>
         <oldsource>Chercher kernel2.bin</oldsource>
         <translation>Chercher kernel2.bin</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="340"/>
-        <location filename="widgets/ConfigWindow.cpp" line="347"/>
+        <location filename="widgets/ConfigWindow.cpp" line="365"/>
+        <location filename="widgets/ConfigWindow.cpp" line="372"/>
         <source>Bin Files (*.bin);;All Files (*)</source>
         <translation>Bin Files (*.bin);;All Files (*)</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="347"/>
+        <location filename="widgets/ConfigWindow.cpp" line="372"/>
         <source>Find window.bin</source>
         <oldsource>Chercher window.bin</oldsource>
         <translation>Chercher window.bin</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="354"/>
+        <location filename="widgets/ConfigWindow.cpp" line="381"/>
         <source>Find char.lgp</source>
         <oldsource>Chercher char.lgp</oldsource>
         <translation>Chercher char.lgp</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="452"/>
+        <location filename="widgets/ConfigWindow.cpp" line="514"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -409,86 +473,198 @@
         <translation>Rechercher...</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="143"/>
         <source>PC Field File (*)</source>
-        <translation>Fichier Field PC (*)</translation>
+        <translation type="vanished">Fichier Field PC (*)</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="145"/>
         <source>DAT File (*.DAT)</source>
-        <translation>Fichier DAT (*.DAT)</translation>
+        <translation type="vanished">Fichier DAT (*.DAT)</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="30"/>
+        <source>Rename field</source>
+        <translation>Renommer écran</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="148"/>
+        <location filename="widgets/FieldList.cpp" line="33"/>
+        <source>Add field</source>
+        <translation>Ajouter écran</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="36"/>
+        <source>Delete field</source>
+        <translation>Supprimer écran</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="51"/>
+        <source>&amp;Field List Toolbar</source>
+        <translation>Barre d&apos;o&amp;utils écrans</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="54"/>
         <source>Add a field</source>
         <translation>Ajouter un écran</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="169"/>
+        <location filename="widgets/FieldList.cpp" line="56"/>
+        <source>Remove a field</source>
+        <translation>Supprimer un écran</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="220"/>
+        <location filename="widgets/FieldList.cpp" line="263"/>
+        <source>Not implemented for PS.</source>
+        <translation>Pas implémenté pour la PS.</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="229"/>
         <source>Choose a name</source>
         <translation>Choisissez un nom</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="170"/>
+        <location filename="widgets/FieldList.cpp" line="230"/>
         <source>Field name:</source>
         <translation>Nom écran :</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="177"/>
+        <location filename="widgets/FieldList.cpp" line="189"/>
+        <location filename="widgets/FieldList.cpp" line="237"/>
         <source>Name not filled</source>
         <translation>Nom vide</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="178"/>
+        <location filename="widgets/FieldList.cpp" line="190"/>
+        <location filename="widgets/FieldList.cpp" line="238"/>
         <source>Please set a new field name.</source>
         <translation>Veuillez écrire un nouveau nom d&apos;écran.</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="180"/>
+        <location filename="widgets/FieldList.cpp" line="194"/>
+        <location filename="widgets/FieldList.cpp" line="241"/>
         <source>Name already present in archive</source>
         <translation>Nom déjà présent dans l&apos;archive</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="181"/>
+        <location filename="widgets/FieldList.cpp" line="195"/>
+        <location filename="widgets/FieldList.cpp" line="242"/>
         <source>Please choose another name.</source>
         <translation>Veuillez choisir un autre nom.</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="192"/>
-        <location filename="widgets/FieldList.cpp" line="195"/>
-        <location filename="widgets/FieldList.cpp" line="200"/>
-        <location filename="widgets/FieldList.cpp" line="207"/>
+        <location filename="widgets/FieldList.cpp" line="277"/>
+        <source>Are you sure you want to remove %1?
+Other maps can refer to it!</source>
+        <translation>Êtes-vous sûr de vouloir supprimer %1 ?
+D&apos;autres écrans peuvent y référer !</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="280"/>
+        <source>the selected field</source>
+        <translation>l&apos;écran sélectionné</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="281"/>
+        <source>the selected fields</source>
+        <translation>les écrans sélectionnés</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="283"/>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="220"/>
+        <location filename="widgets/FieldList.cpp" line="263"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="192"/>
         <source>Not implemented.</source>
-        <translation>Pas implémenté.</translation>
+        <translation type="vanished">Pas implémenté.</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="195"/>
         <source>Field with this name already exist.</source>
-        <translation>Un écran existe déjà avec ce nom.</translation>
+        <translation type="vanished">Un écran existe déjà avec ce nom.</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="200"/>
         <source>Unknown error.</source>
-        <translation>Erreur inconnue.</translation>
+        <translation type="vanished">Erreur inconnue.</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="207"/>
         <source>Cannot open file.</source>
-        <translation>Impossible d&apos;ouvrir le fichier.</translation>
+        <translation type="vanished">Impossible d&apos;ouvrir le fichier.</translation>
+    </message>
+</context>
+<context>
+    <name>FieldSaveIO</name>
+    <message>
+        <location filename="core/field/FieldIO.cpp" line="66"/>
+        <source>Cannot save field map %1</source>
+        <oldsource>Cannot save field %1</oldsource>
+        <translation>Impossible de sauvegarder l&apos;écran %1</translation>
     </message>
 </context>
 <context>
     <name>FontManager</name>
     <message>
-        <location filename="widgets/FontManager.cpp" line="24"/>
+        <location filename="widgets/FontManager.cpp" line="25"/>
         <source>Font Manager</source>
         <translation>Gestionnaire de polices de caractères</translation>
     </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="55"/>
+        <source>Japanese</source>
+        <translation>Japonais</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="115"/>
+        <source>&amp;Displayed name:</source>
+        <translation>Nom &amp;affiché :</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="116"/>
+        <source>&amp;File name:</source>
+        <translation>Nom du &amp;fichier :</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="132"/>
+        <source>This name already exist or is invalid, please choose another.</source>
+        <translation>Ce nom existe déjà ou est invalide, merci d&apos;en choisir un autre.</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="149"/>
+        <source>Remove font</source>
+        <translation>Supprimer la police de caractères</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="150"/>
+        <source>Do you want to remove the selected font?</source>
+        <translation>Voulez-vous supprimer la police de caractères sélectionnée ?</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="obsolete">Ajouter</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">Supprimer</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="55"/>
+        <source>Latin</source>
+        <translation>Latin</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="111"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="132"/>
+        <source>Choose another name</source>
+        <oldsource>Choisissez un autre nom</oldsource>
+        <translation>Sélectionnez un autre nom</translation>
+    </message>
 </context>
 <context>
     <name>FontWidget</name>
@@ -509,13 +685,13 @@
         <translation>Cyan</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="43"/>
+        <location filename="widgets/FontWidget.cpp" line="45"/>
         <source>Export...</source>
         <oldsource>Exporter...</oldsource>
         <translation>Exporter...</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="44"/>
+        <location filename="widgets/FontWidget.cpp" line="46"/>
         <source>Import...</source>
         <oldsource>Importer...</oldsource>
         <translation>Importer...</translation>
@@ -546,87 +722,102 @@
         <translation>Blanc</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="37"/>
-        <location filename="widgets/FontWidget.cpp" line="39"/>
         <source>From Image...</source>
-        <translation>À partir d&apos;une image...</translation>
+        <translation type="vanished">À partir d&apos;une image...</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="45"/>
+        <location filename="widgets/FontWidget.cpp" line="47"/>
         <source>Cancel Changes</source>
         <translation>Annuler les modifications</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="102"/>
+        <location filename="widgets/FontWidget.cpp" line="57"/>
+        <source>Text:</source>
+        <translation>Texte :</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontWidget.cpp" line="59"/>
+        <source>Width:</source>
+        <translation>Largeur :</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontWidget.cpp" line="108"/>
         <source>Table %1</source>
         <translation>Table %1</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="166"/>
+        <location filename="widgets/FontWidget.cpp" line="191"/>
+        <location filename="widgets/FontWidget.cpp" line="267"/>
         <source>FF7 font file (*.bin)</source>
         <oldsource>Fichier police FF7 (*.bin)</oldsource>
         <translation>Fichier police FF7 (*.bin)</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="167"/>
-        <location filename="widgets/FontWidget.cpp" line="243"/>
         <source>FF8 font file (*.tdw)</source>
         <oldsource>Fichier police FF8 (*.tdw)</oldsource>
-        <translation>Fichier police FF8 (*.tdw)</translation>
+        <translation type="vanished">Fichier police FF8 (*.tdw)</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="168"/>
+        <location filename="widgets/FontWidget.cpp" line="193"/>
         <source>Image File (*.png)</source>
         <oldsource>Fichier image PNG (*.png)</oldsource>
         <translation>Fichier image PNG (*.png)</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="169"/>
-        <source>Image File (*.jpg))</source>
-        <oldsource>Fichier image JPG (*.jpg)</oldsource>
+        <location filename="widgets/FontWidget.cpp" line="194"/>
+        <source>Image File (*.jpg)</source>
+        <oldsource>Image File (*.jpg))</oldsource>
         <translation>Fichier image JPG (*.jpg)</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="170"/>
+        <location filename="widgets/FontWidget.cpp" line="195"/>
         <source>Image File (*.bmp)</source>
         <oldsource>Fichier image BMP (*.bmp)</oldsource>
         <translation>Fichier image BMP (*.bmp)</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="174"/>
+        <location filename="widgets/FontWidget.cpp" line="199"/>
         <source>Translation file %1 (*.txt)</source>
         <oldsource>Fichier traduction %1 (*.txt)</oldsource>
         <translation>Fichier traduction %1 (*.txt)</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="178"/>
+        <location filename="widgets/FontWidget.cpp" line="203"/>
         <source>Export font</source>
         <translation>Exporter police de caractère</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="218"/>
-        <location filename="widgets/FontWidget.cpp" line="265"/>
+        <location filename="widgets/FontWidget.cpp" line="216"/>
+        <location filename="widgets/FontWidget.cpp" line="219"/>
+        <location filename="widgets/FontWidget.cpp" line="242"/>
+        <location filename="widgets/FontWidget.cpp" line="285"/>
+        <location filename="widgets/FontWidget.cpp" line="289"/>
+        <source>Error</source>
+        <oldsource>Erreur</oldsource>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontWidget.cpp" line="216"/>
+        <location filename="widgets/FontWidget.cpp" line="242"/>
+        <location filename="widgets/FontWidget.cpp" line="289"/>
         <source>Error opening file (%1)</source>
         <translation>Erreur d&apos;ouverture du fichier. (%1)</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="247"/>
+        <location filename="widgets/FontWidget.cpp" line="219"/>
+        <source>Error saving file</source>
+        <translation>Erreur d&apos;enregistrement</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontWidget.cpp" line="271"/>
         <source>Import font</source>
         <translation>Importer police de caractère</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="261"/>
+        <location filename="widgets/FontWidget.cpp" line="285"/>
         <source>Invalid file</source>
         <translation>Fichier invalide</translation>
     </message>
-    <message>
-        <location filename="widgets/FontWidget.cpp" line="218"/>
-        <location filename="widgets/FontWidget.cpp" line="261"/>
-        <location filename="widgets/FontWidget.cpp" line="265"/>
-        <source>Error</source>
-        <oldsource>Erreur</oldsource>
-        <translation>Erreur</translation>
-    </message>
 </context>
 <context>
     <name>GrpScriptList</name>
@@ -688,34 +879,34 @@
         <translation>Descendre un groupe</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="103"/>
+        <location filename="widgets/GrpScriptList.cpp" line="104"/>
         <source>Up</source>
         <translation>Déplacer vers le haut</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="105"/>
+        <location filename="widgets/GrpScriptList.cpp" line="106"/>
         <source>Down</source>
         <translation>Déplacer vers le bas</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="100"/>
+        <location filename="widgets/GrpScriptList.cpp" line="101"/>
         <source>Remove a group</source>
         <translation>Supprimer un groupe</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="271"/>
+        <location filename="widgets/GrpScriptList.cpp" line="316"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="271"/>
+        <location filename="widgets/GrpScriptList.cpp" line="316"/>
         <source>Are you sure you want to remove %1?
 Some scripts can refer to it!</source>
         <translation>Voulez-vous vraiment supprimer %1 ?
 Certains scripts peuvent y faire référence !</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="95"/>
+        <location filename="widgets/GrpScriptList.cpp" line="96"/>
         <source>&amp;Group Editor</source>
         <oldsource>Édition des &amp;groupes</oldsource>
         <translation>Édition des &amp;groupes</translation>
@@ -726,19 +917,29 @@
         <translation>Monter un groupe</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="98"/>
+        <location filename="widgets/GrpScriptList.cpp" line="99"/>
         <source>Add a group</source>
         <oldsource>Ajouter un groupe</oldsource>
         <translation>Ajouter un groupe</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="274"/>
+        <location filename="widgets/GrpScriptList.cpp" line="255"/>
+        <source>You have more than 16 models in this field, the game may crash.</source>
+        <translation>Vous avez plus de 16 modèles dans cet écran, le jeu est susceptible de planter.</translation>
+    </message>
+    <message>
+        <location filename="widgets/GrpScriptList.cpp" line="261"/>
+        <source>You have more than 48 groups in this field, the game may crash.</source>
+        <translation>Vous avez plus de 48 groupes dans cet écran, le jeu est susceptible de planter.</translation>
+    </message>
+    <message>
+        <location filename="widgets/GrpScriptList.cpp" line="319"/>
         <source>the group selected</source>
         <oldsource>le groupe sélectionné</oldsource>
         <translation>le groupe sélectionné</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="275"/>
+        <location filename="widgets/GrpScriptList.cpp" line="320"/>
         <source>the selected groups</source>
         <oldsource>les groupes sélectionnés</oldsource>
         <translation>les groupes sélectionnés</translation>
@@ -798,26 +999,53 @@
     </message>
     <message>
         <location filename="widgets/ImportDialog.cpp" line="53"/>
+        <source> (partial: models and animations are not linked properly)</source>
+        <translation> (partiel : les modèles et les animations ne sont pas reliés correctement)</translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="54"/>
+        <source> (partial: Z-depth might be a little broken)</source>
+        <translation> (partiel : la profondeur Z sera potentiellement incorrecte)</translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="59"/>
+        <location filename="widgets/ImportDialog.cpp" line="69"/>
         <source>Change</source>
         <oldsource>Changer</oldsource>
         <translation>Changer</translation>
     </message>
     <message>
-        <location filename="widgets/ImportDialog.cpp" line="57"/>
+        <location filename="widgets/ImportDialog.cpp" line="63"/>
         <source>MIM file:</source>
         <oldsource>Fichier MIM :</oldsource>
         <translation>Fichier MIM :</translation>
     </message>
     <message>
-        <location filename="widgets/ImportDialog.cpp" line="119"/>
+        <location filename="widgets/ImportDialog.cpp" line="73"/>
+        <source>BSX file:</source>
+        <translation>Fichier BSX :</translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="147"/>
+        <source>Select the associated BSX file</source>
+        <translation>Sélectionnez le fichier BSX associé</translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="148"/>
+        <source>BSX File (*.BSX);;All Files (*)</source>
+        <oldsource>BSX File (*.BSX);;All Files(*)</oldsource>
+        <translation>Fichier BSX (*.BSX);;Tous les fichiers (*)</translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="158"/>
         <source>Select the associated MIM file</source>
         <oldsource>Sélectionner le fichier MIM associé</oldsource>
         <translation>Sélectionner le fichier MIM associé</translation>
     </message>
     <message>
-        <location filename="widgets/ImportDialog.cpp" line="119"/>
-        <source>MIM File (*.MIM);;All Files(*)</source>
-        <oldsource>Fichier MIM (*.MIM);;Tous les fichiers (*)</oldsource>
+        <location filename="widgets/ImportDialog.cpp" line="159"/>
+        <source>MIM File (*.MIM);;All Files (*)</source>
+        <oldsource>MIM File (*.MIM);;All Files(*)</oldsource>
         <translation>Fichier MIM (*.MIM);;Tous les fichiers (*)</translation>
     </message>
 </context>
@@ -832,331 +1060,451 @@
 <context>
     <name>LgpDialog</name>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="677"/>
         <source>LGP archive manager</source>
         <oldsource>Gestionnaire d&apos;archive LGP</oldsource>
-        <translation>Gestionnaire d&apos;archive LGP</translation>
+        <translation type="vanished">Gestionnaire d&apos;archive LGP</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="688"/>
-        <location filename="widgets/LgpDialog.cpp" line="734"/>
-        <location filename="widgets/LgpDialog.cpp" line="893"/>
         <source>Rename</source>
         <oldsource>Renommer</oldsource>
-        <translation>Renommer</translation>
+        <translation type="vanished">Renommer</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="690"/>
         <source>Replace</source>
         <oldsource>Remplacer</oldsource>
-        <translation>Remplacer</translation>
+        <translation type="vanished">Remplacer</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="692"/>
         <source>Extract</source>
         <oldsource>Extraire</oldsource>
-        <translation>Extraire</translation>
+        <translation type="vanished">Extraire</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="741"/>
-        <location filename="widgets/LgpDialog.cpp" line="744"/>
-        <location filename="widgets/LgpDialog.cpp" line="747"/>
-        <location filename="widgets/LgpDialog.cpp" line="785"/>
-        <location filename="widgets/LgpDialog.cpp" line="878"/>
-        <location filename="widgets/LgpDialog.cpp" line="883"/>
-        <location filename="widgets/LgpDialog.cpp" line="904"/>
-        <location filename="widgets/LgpDialog.cpp" line="930"/>
-        <location filename="widgets/LgpDialog.cpp" line="961"/>
         <source>Error</source>
         <oldsource>Erreur</oldsource>
-        <translation>Erreur</translation>
+        <translation type="vanished">Erreur</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="768"/>
-        <location filename="widgets/LgpDialog.cpp" line="805"/>
         <source>%1 file (*.%1)</source>
         <oldsource>Fichier %1 (*.%1)</oldsource>
-        <translation>Fichier %1 (*.%1)</translation>
+        <translation type="vanished">Fichier %1 (*.%1)</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="770"/>
-        <location filename="widgets/LgpDialog.cpp" line="807"/>
-        <location filename="widgets/LgpDialog.cpp" line="857"/>
         <source>All files (*)</source>
         <oldsource>Tous les fichiers (*)</oldsource>
-        <translation>Tous les fichiers (*)</translation>
+        <translation type="vanished">Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="694"/>
         <source>Add</source>
-        <translation>Ajouter</translation>
+        <translation type="vanished">Ajouter</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="696"/>
         <source>Delete</source>
-        <translation>Supprimer</translation>
+        <translation type="vanished">Supprimer</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="699"/>
         <source>Save</source>
-        <translation>Sauvegarder</translation>
+        <translation type="vanished">Sauvegarder</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="734"/>
-        <location filename="widgets/LgpDialog.cpp" line="894"/>
         <source>New Name:</source>
-        <translation>Nouveau nom :</translation>
+        <translation type="vanished">Nouveau nom :</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="741"/>
-        <location filename="widgets/LgpDialog.cpp" line="879"/>
         <source>The name &apos;%1&apos; is invalid, don&apos;t put special characters.</source>
-        <translation>Le nom &apos;%1&apos; est invalide, ne mettez pas de caractères spéciaux.</translation>
+        <translation type="vanished">Le nom &apos;%1&apos; est invalide, ne mettez pas de caractères spéciaux.</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="744"/>
-        <location filename="widgets/LgpDialog.cpp" line="884"/>
         <source>A file named &apos;%1&apos; already exists, please choose another name.</source>
-        <translation>Un fichier nommé &apos;%1&apos; existe déjà, veuillez choisir un autre nom.</translation>
+        <translation type="vanished">Un fichier nommé &apos;%1&apos; existe déjà, veuillez choisir un autre nom.</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="747"/>
         <source>Can not Rename the file</source>
-        <translation>Impossible de renommer le fichier</translation>
+        <translation type="vanished">Impossible de renommer le fichier</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="777"/>
-        <location filename="widgets/LgpDialog.cpp" line="814"/>
-        <location filename="widgets/LgpDialog.cpp" line="858"/>
         <source>New File</source>
-        <translation>Nouveau fichier</translation>
+        <translation type="vanished">Nouveau fichier</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="785"/>
         <source>Can not modify the archive!</source>
-        <translation>Impossible de modifier l&apos;archive !</translation>
+        <translation type="vanished">Impossible de modifier l&apos;archive !</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="829"/>
         <source>Can not write to file (message: %1).</source>
-        <translation>Impossible d&apos;écrire dans le fichier (message : %1).</translation>
+        <translation type="vanished">Impossible d&apos;écrire dans le fichier (message : %1).</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="829"/>
         <source>Write error</source>
-        <translation>Erreur d&apos;écriture</translation>
+        <translation type="vanished">Erreur d&apos;écriture</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="834"/>
         <source>Opening error</source>
-        <translation>Erreur d&apos;ouverture</translation>
+        <translation type="vanished">Erreur d&apos;ouverture</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="834"/>
         <source>Can not open the file (message: %1).</source>
-        <translation>Impossible d&apos;ouvrir le fichier (message : %1).</translation>
+        <translation type="vanished">Impossible d&apos;ouvrir le fichier (message : %1).</translation>
     </message>
     <message>
         <source>Can not add the file</source>
         <translation type="vanished">Impossible d&apos;ajouter le fichier</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="930"/>
         <source>Cannot delete the file!</source>
-        <translation>Impossible de supprimer le fichier !</translation>
+        <translation type="vanished">Impossible de supprimer le fichier !</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="937"/>
         <source>Save as</source>
-        <translation>Enregistrer sous</translation>
+        <translation type="vanished">Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="937"/>
         <source>Lgp File (*.lgp)</source>
-        <translation>Fichier Lgp (*.lgp)</translation>
+        <translation type="vanished">Fichier Lgp (*.lgp)</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="948"/>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="vanished">Annuler</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="961"/>
         <source>Cannot create the archive (message: %1).</source>
-        <translation>Impossible de créer l&apos;archive (message : %1).</translation>
+        <translation type="vanished">Impossible de créer l&apos;archive (message : %1).</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="919"/>
         <source>Delete ?</source>
-        <translation>Supprimer ?</translation>
+        <translation type="vanished">Supprimer ?</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="905"/>
         <source>Can not add the file &apos;%1&apos;</source>
-        <translation>Impossible d&apos;ajouter le fichier &apos;%1&apos;</translation>
+        <translation type="vanished">Impossible d&apos;ajouter le fichier &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="920"/>
         <source>Are you sure you want to delete this file from the archive?</source>
         <oldsource>Êtes-vous sûr de vouloir Delete ce fichier de l&apos;archive ?</oldsource>
-        <translation>Êtes-vous sûr de vouloir supprimer ce fichier de l&apos;archive ?</translation>
+        <translation type="vanished">Êtes-vous sûr de vouloir supprimer ce fichier de l&apos;archive ?</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="948"/>
         <source>Saving...</source>
-        <translation>Sauvegarde...</translation>
+        <translation type="vanished">Sauvegarde...</translation>
     </message>
 </context>
 <context>
     <name>LgpItemModel</name>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="510"/>
+        <location filename="widgets/LgpWidget.cpp" line="513"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="585"/>
+        <location filename="widgets/LgpWidget.cpp" line="588"/>
         <source>Name</source>
         <oldsource>Nom</oldsource>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="586"/>
+        <location filename="widgets/LgpWidget.cpp" line="589"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
 </context>
 <context>
-    <name>MassExportDialog</name>
+    <name>LgpWidget</name>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="25"/>
-        <source>Mass Export</source>
-        <oldsource>Exporter en masse</oldsource>
-        <translation>Exporter en masse</translation>
+        <location filename="widgets/LgpWidget.cpp" line="680"/>
+        <source>LGP archive manager</source>
+        <translation>Gestionnaire d&apos;archive LGP</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="32"/>
-        <source>Current</source>
-        <oldsource>Courant</oldsource>
-        <translation>Courant</translation>
+        <location filename="widgets/LgpWidget.cpp" line="691"/>
+        <location filename="widgets/LgpWidget.cpp" line="838"/>
+        <location filename="widgets/LgpWidget.cpp" line="1056"/>
+        <source>Rename</source>
+        <translation>Renommer</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="33"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="widgets/LgpWidget.cpp" line="693"/>
+        <source>Replace</source>
+        <translation>Remplacer</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="34"/>
-        <source>-</source>
-        <translation>-</translation>
+        <location filename="widgets/LgpWidget.cpp" line="695"/>
+        <source>Extract</source>
+        <translation>Extraire</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="41"/>
-        <source>Export fields</source>
-        <translation>Exporter les écrans</translation>
+        <location filename="widgets/LgpWidget.cpp" line="697"/>
+        <source>Extract All</source>
+        <translation>Extraire tout</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="44"/>
-        <source>Export backgrounds</source>
-        <oldsource>Exporter les décors</oldsource>
-        <translation>Exporter les décors</translation>
+        <location filename="widgets/LgpWidget.cpp" line="699"/>
+        <source>Add</source>
+        <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="46"/>
-        <source>PNG image</source>
-        <oldsource>Image PNG</oldsource>
-        <translation>Image PNG</translation>
+        <location filename="widgets/LgpWidget.cpp" line="701"/>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="47"/>
-        <source>JPG image</source>
-        <oldsource>Image JPG</oldsource>
-        <translation>Image JPG</translation>
+        <location filename="widgets/LgpWidget.cpp" line="838"/>
+        <location filename="widgets/LgpWidget.cpp" line="1057"/>
+        <source>New Name:</source>
+        <translation>Nouveau nom :</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="48"/>
-        <source>BMP image</source>
-        <oldsource>Image BMP</oldsource>
-        <translation>Image BMP</translation>
+        <location filename="widgets/LgpWidget.cpp" line="845"/>
+        <location filename="widgets/LgpWidget.cpp" line="848"/>
+        <location filename="widgets/LgpWidget.cpp" line="851"/>
+        <location filename="widgets/LgpWidget.cpp" line="888"/>
+        <location filename="widgets/LgpWidget.cpp" line="1002"/>
+        <location filename="widgets/LgpWidget.cpp" line="1041"/>
+        <location filename="widgets/LgpWidget.cpp" line="1046"/>
+        <location filename="widgets/LgpWidget.cpp" line="1067"/>
+        <location filename="widgets/LgpWidget.cpp" line="1091"/>
+        <location filename="widgets/LgpWidget.cpp" line="1119"/>
+        <source>Error</source>
+        <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="50"/>
-        <source>Export sounds</source>
-        <oldsource>Exporter les sons</oldsource>
-        <translation>Exporter les sons</translation>
+        <location filename="widgets/LgpWidget.cpp" line="845"/>
+        <location filename="widgets/LgpWidget.cpp" line="1042"/>
+        <source>The name &apos;%1&apos; is invalid, don&apos;t put special characters.</source>
+        <translation>Le nom &apos;%1&apos; est invalide, ne mettez pas de caractères spéciaux.</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="52"/>
-        <source>AKAO sound</source>
-        <oldsource>Son AKAO</oldsource>
-        <translation>son AKAO</translation>
+        <location filename="widgets/LgpWidget.cpp" line="848"/>
+        <location filename="widgets/LgpWidget.cpp" line="1047"/>
+        <source>A file named &apos;%1&apos; already exists, please choose another name.</source>
+        <translation>Un fichier nommé &apos;%1&apos; existe déjà, veuillez choisir un autre nom.</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="54"/>
-        <source>Export texts</source>
-        <oldsource>Exporter les textes</oldsource>
-        <translation>Exporter les textes</translation>
+        <location filename="widgets/LgpWidget.cpp" line="851"/>
+        <source>Can not Rename the file</source>
+        <translation>Impossible de renommer le fichier</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="56"/>
-        <source>XML Text</source>
-        <oldsource>Texte XML</oldsource>
-        <translation>Texte XML</translation>
+        <location filename="widgets/LgpWidget.cpp" line="871"/>
+        <location filename="widgets/LgpWidget.cpp" line="907"/>
+        <source>%1 file (*.%1)</source>
+        <translation>Fichier %1 (*.%1)</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="57"/>
-        <source>Simple text TXT</source>
-        <oldsource>Texte simple TXT</oldsource>
-        <translation>Texte simple TXT</translation>
+        <location filename="widgets/LgpWidget.cpp" line="873"/>
+        <location filename="widgets/LgpWidget.cpp" line="909"/>
+        <location filename="widgets/LgpWidget.cpp" line="1020"/>
+        <source>All files (*)</source>
+        <translation>Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="63"/>
-        <source>Choose...</source>
-        <oldsource>Choisir...</oldsource>
-        <translation>Choisir...</translation>
+        <location filename="widgets/LgpWidget.cpp" line="880"/>
+        <location filename="widgets/LgpWidget.cpp" line="1021"/>
+        <source>New File</source>
+        <translation>Nouveau fichier</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="65"/>
-        <source>Overwrite existing files</source>
-        <oldsource>Écraser les fichiers existants</oldsource>
-        <translation>Écraser les fichiers existants</translation>
+        <location filename="widgets/LgpWidget.cpp" line="888"/>
+        <source>Can not modify the archive!</source>
+        <translation>Impossible de modifier l&apos;archive !</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="69"/>
-        <source>Export</source>
-        <oldsource>Exporter</oldsource>
-        <translation>Exporter</translation>
+        <location filename="widgets/LgpWidget.cpp" line="916"/>
+        <source>Extract file</source>
+        <translation>Extraire un fichier</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="78"/>
-        <source>Export directory:</source>
-        <oldsource>Emplacement de l&apos;export :</oldsource>
-        <translation>Emplacement de l&apos;export :</translation>
+        <location filename="widgets/LgpWidget.cpp" line="931"/>
+        <source>Write error</source>
+        <translation>Erreur d&apos;écriture</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="97"/>
-        <source>PC</source>
-        <translation>PC</translation>
+        <location filename="widgets/LgpWidget.cpp" line="931"/>
+        <source>Can not write to file (message: %1).</source>
+        <translation>Impossible d&apos;écrire dans le fichier (message : %1).</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="936"/>
+        <source>Opening error</source>
+        <translation>Erreur d&apos;ouverture</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="936"/>
+        <source>Can not open the file (message: %1).</source>
+        <translation>Impossible d&apos;ouvrir le fichier (message : %1).</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="949"/>
+        <source>Extract all</source>
+        <translation>Extraire tout</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="956"/>
+        <source>Extracting...</source>
+        <translation>Extraction...</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="956"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="1068"/>
+        <source>Can not add the file &apos;%1&apos;</source>
+        <translation>Impossible d&apos;ajouter le fichier &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="1081"/>
+        <source>Delete?</source>
+        <oldsource>Delete ?</oldsource>
+        <translation>Supprimer ?</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="1082"/>
+        <source>Are you sure you want to delete this file from the archive?</source>
+        <translation>Êtes-vous sûr de vouloir supprimer ce fichier de l&apos;archive ?</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="1091"/>
+        <source>Cannot delete the file!</source>
+        <translation>Impossible de supprimer le fichier !</translation>
+    </message>
+</context>
+<context>
+    <name>MassExportDialog</name>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="25"/>
+        <source>Mass Export</source>
+        <oldsource>Exporter en masse</oldsource>
+        <translation>Exporter en masse</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="32"/>
+        <source>Current</source>
+        <oldsource>Courant</oldsource>
+        <translation>Courant</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="33"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="34"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="41"/>
+        <source>Export fields</source>
+        <translation>Exporter les écrans</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="44"/>
+        <source>Export backgrounds</source>
+        <oldsource>Exporter les décors</oldsource>
+        <translation>Exporter les décors</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="46"/>
+        <source>PNG image</source>
+        <oldsource>Image PNG</oldsource>
+        <translation>Image PNG</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="47"/>
+        <source>JPG image</source>
+        <oldsource>Image JPG</oldsource>
+        <translation>Image JPG</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="48"/>
+        <source>BMP image</source>
+        <oldsource>Image BMP</oldsource>
+        <translation>Image BMP</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="50"/>
+        <source>Export musics</source>
+        <oldsource>Export sounds</oldsource>
+        <translation>Exporter les musiques</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="52"/>
+        <source>AKAO music</source>
+        <oldsource>AKAO sound</oldsource>
+        <translation>Musique AKAO</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="53"/>
+        <source>PSF MIDI</source>
+        <translation>PSF MIDI</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="55"/>
+        <source>Export texts</source>
+        <oldsource>Exporter les textes</oldsource>
+        <translation>Exporter les textes</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="57"/>
+        <source>XML Text</source>
+        <oldsource>Texte XML</oldsource>
+        <translation>Texte XML</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="58"/>
+        <source>Simple text TXT</source>
+        <oldsource>Texte simple TXT</oldsource>
+        <translation>Texte simple TXT</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="64"/>
+        <source>Choose...</source>
+        <oldsource>Choisir...</oldsource>
+        <translation>Choisir...</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="66"/>
+        <source>Overwrite existing files</source>
+        <oldsource>Écraser les fichiers existants</oldsource>
+        <translation>Écraser les fichiers existants</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="70"/>
+        <source>Export</source>
+        <oldsource>Exporter</oldsource>
+        <translation>Exporter</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="79"/>
+        <source>Export directory:</source>
+        <oldsource>Emplacement de l&apos;export :</oldsource>
+        <translation>Emplacement de l&apos;export :</translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="98"/>
+        <source>PC</source>
+        <translation>PC</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="97"/>
+        <location filename="widgets/MassExportDialog.cpp" line="98"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="99"/>
+        <location filename="widgets/MassExportDialog.cpp" line="100"/>
         <source>FIELD File %1</source>
         <oldsource>Fichier FIELD %1</oldsource>
         <translation>Fichier FIELD %1</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="100"/>
+        <location filename="widgets/MassExportDialog.cpp" line="101"/>
         <source>Uncompressed FIELD %1</source>
         <oldsource>Fichier décompressé FIELD %1</oldsource>
         <translation>Fichier décompressé FIELD %1</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="118"/>
+        <location filename="widgets/MassExportDialog.cpp" line="120"/>
         <source>Choose a directory</source>
         <oldsource>Choisir un dossier</oldsource>
         <translation>Choisir un dossier</translation>
@@ -1261,7 +1609,7 @@
         <translation>Fichier décompressé FIELD %1</translation>
     </message>
     <message>
-        <location filename="widgets/MassImportDialog.cpp" line="106"/>
+        <location filename="widgets/MassImportDialog.cpp" line="107"/>
         <source>Choose a directory</source>
         <oldsource>Choisir un dossier</oldsource>
         <translation>Choisir un dossier</translation>
@@ -1385,7 +1733,7 @@
     </message>
     <message>
         <location filename="widgets/ModelManagerPC.cpp" line="154"/>
-        <location filename="widgets/ModelManagerPC.cpp" line="407"/>
+        <location filename="widgets/ModelManagerPC.cpp" line="413"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
@@ -1426,158 +1774,163 @@
 <context>
     <name>OpcodeList</name>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="28"/>
+        <location filename="widgets/OpcodeList.cpp" line="29"/>
         <source>Action</source>
         <translation>Action</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="52"/>
+        <location filename="widgets/OpcodeList.cpp" line="53"/>
         <source>Copy</source>
         <oldsource>Copier</oldsource>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="72"/>
+        <location filename="widgets/OpcodeList.cpp" line="73"/>
         <source>Expand the tree</source>
         <oldsource>Étendre l&apos;arbre</oldsource>
         <translation>Étendre l&apos;arbre</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="37"/>
+        <location filename="widgets/OpcodeList.cpp" line="38"/>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="41"/>
+        <location filename="widgets/OpcodeList.cpp" line="42"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="48"/>
+        <location filename="widgets/OpcodeList.cpp" line="49"/>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="56"/>
+        <location filename="widgets/OpcodeList.cpp" line="57"/>
         <source>Copy text</source>
         <translation>Copier texte</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="60"/>
+        <location filename="widgets/OpcodeList.cpp" line="61"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="64"/>
+        <location filename="widgets/OpcodeList.cpp" line="65"/>
         <source>Up</source>
         <translation>Déplacer vers le haut</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="68"/>
+        <location filename="widgets/OpcodeList.cpp" line="69"/>
         <source>Down</source>
         <translation>Déplacer vers le bas</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="73"/>
+        <location filename="widgets/OpcodeList.cpp" line="74"/>
         <source>Undo</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="77"/>
+        <location filename="widgets/OpcodeList.cpp" line="78"/>
         <source>Redo</source>
         <oldsource>Refaire</oldsource>
         <translation>Refaire</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="81"/>
+        <location filename="widgets/OpcodeList.cpp" line="82"/>
         <source>Edit text</source>
         <oldsource>Modifier texte</oldsource>
         <translation>Modifier texte</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="85"/>
-        <location filename="widgets/OpcodeList.cpp" line="225"/>
+        <location filename="widgets/OpcodeList.cpp" line="86"/>
+        <location filename="widgets/OpcodeList.cpp" line="242"/>
         <source>Disable tree</source>
         <translation>Désactiver arbre</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="227"/>
+        <location filename="widgets/OpcodeList.cpp" line="87"/>
+        <source>Search opcode...</source>
+        <translation>Chercher l&apos;opcode...</translation>
+    </message>
+    <message>
+        <location filename="widgets/OpcodeList.cpp" line="244"/>
         <source>Enable tree</source>
         <translation>Activer abre</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="261"/>
+        <location filename="widgets/OpcodeList.cpp" line="278"/>
         <source>Goto label</source>
         <oldsource>Aller au label</oldsource>
         <translation>Aller au label</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="262"/>
+        <location filename="widgets/OpcodeList.cpp" line="279"/>
         <source>Alt + Click to go to the label</source>
         <oldsource>Alt + clic pour aller au label</oldsource>
         <translation>Alt + clic pour aller au label</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="135"/>
+        <location filename="widgets/OpcodeList.cpp" line="139"/>
         <source>&amp;Script editor</source>
         <oldsource>Édition du &amp;script</oldsource>
         <translation>Édition du &amp;script</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="141"/>
+        <location filename="widgets/OpcodeList.cpp" line="145"/>
         <source>Add line</source>
         <translation>Ajouter a line</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="143"/>
+        <location filename="widgets/OpcodeList.cpp" line="147"/>
         <source>Remove line</source>
         <translation>Supprimer a line</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="146"/>
+        <location filename="widgets/OpcodeList.cpp" line="150"/>
         <source>Move up</source>
         <translation>Monter une commande</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="148"/>
+        <location filename="widgets/OpcodeList.cpp" line="152"/>
         <source>Move down</source>
         <translation>Descendre une commande</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="264"/>
+        <location filename="widgets/OpcodeList.cpp" line="281"/>
         <source>Goto script</source>
         <translation>Aller au script</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="265"/>
+        <location filename="widgets/OpcodeList.cpp" line="282"/>
         <source>Alt + Click to go to the script</source>
         <translation>Alt + clic pour aller au script</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="421"/>
+        <location filename="widgets/OpcodeList.cpp" line="459"/>
         <source>If this script is run,
  assume that the last non-empty script that runs</source>
         <translation>Si ce script est exécuté,
  considérez que c&apos;est le dernier script non vide qui est exécuté</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="44"/>
-        <location filename="widgets/OpcodeList.cpp" line="722"/>
+        <location filename="widgets/OpcodeList.cpp" line="45"/>
+        <location filename="widgets/OpcodeList.cpp" line="760"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="723"/>
+        <location filename="widgets/OpcodeList.cpp" line="761"/>
         <source>Are you sure you want to delete %1?</source>
         <translation>Voulez-vous vraiment supprimer %1 ?</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="725"/>
+        <location filename="widgets/OpcodeList.cpp" line="763"/>
         <source>the selected command</source>
         <translation>the selected command</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="726"/>
+        <location filename="widgets/OpcodeList.cpp" line="764"/>
         <source>the selected commands</source>
         <translation>les commandes sélectionnées</translation>
     </message>
@@ -1585,10 +1938,14 @@
 <context>
     <name>OperationsManager</name>
     <message>
-        <location filename="widgets/OperationsManager.cpp" line="23"/>
         <source>Miscellaneous operations</source>
         <oldsource>Opérations diverses</oldsource>
-        <translation>Opérations diverses</translation>
+        <translation type="vanished">Opérations diverses</translation>
+    </message>
+    <message>
+        <location filename="widgets/OperationsManager.cpp" line="23"/>
+        <source>Batch processing</source>
+        <translation>Traitement par lot</translation>
     </message>
     <message>
         <location filename="widgets/OperationsManager.cpp" line="25"/>
@@ -1597,26 +1954,41 @@
     </message>
     <message>
         <location filename="widgets/OperationsManager.cpp" line="26"/>
+        <source>Autosize all text windows in the game</source>
+        <translation>Redimensionner toutes les fenêtres du jeu</translation>
+    </message>
+    <message>
+        <location filename="widgets/OperationsManager.cpp" line="27"/>
         <source>Disable all texts in the game</source>
         <translation>Désactiver tous les textes du jeu</translation>
     </message>
     <message>
-        <location filename="widgets/OperationsManager.cpp" line="27"/>
+        <location filename="widgets/OperationsManager.cpp" line="28"/>
         <source>Disable all battles in the game</source>
         <translation>Désactiver tous combats du jeu</translation>
     </message>
     <message>
-        <location filename="widgets/OperationsManager.cpp" line="29"/>
         <source>Remove unused data in field model loaders</source>
-        <translation>Supprimer les données inutiles des listes des modèles 3D</translation>
+        <translation type="vanished">Supprimer les données inutiles des listes des modèles 3D</translation>
     </message>
     <message>
         <location filename="widgets/OperationsManager.cpp" line="30"/>
-        <source>Remove all unused data for field backgrounds</source>
+        <source>Clean unused data in field model loaders</source>
+        <oldsource>Remove all unused data for field backgrounds</oldsource>
+        <translation>Supprimer les données inutilisées pour les listes de modèles 3D</translation>
+    </message>
+    <message>
+        <location filename="widgets/OperationsManager.cpp" line="31"/>
+        <source>Clean unused data for field backgrounds</source>
         <translation>Supprimer les données inutilisées pour les décors</translation>
     </message>
     <message>
-        <location filename="widgets/OperationsManager.cpp" line="34"/>
+        <location filename="widgets/OperationsManager.cpp" line="32"/>
+        <source>Repair broken backgrounds (lastmap, fr_e)</source>
+        <translation>Réparer les décors cassés ((lastmap, fr_e)</translation>
+    </message>
+    <message>
+        <location filename="widgets/OperationsManager.cpp" line="36"/>
         <source>Apply</source>
         <oldsource>Appliquer</oldsource>
         <translation>Appliquer</translation>
@@ -1632,147 +2004,204 @@
     </message>
 </context>
 <context>
+    <name>PsfDialog</name>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="21"/>
+        <source>psflib</source>
+        <translation>psflib</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="23"/>
+        <source>Title</source>
+        <translation>Titre</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="25"/>
+        <source>Artist</source>
+        <translation>Artiste</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="27"/>
+        <source>Game</source>
+        <translation>Jeu</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="29"/>
+        <source>Year</source>
+        <translation>Année</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="31"/>
+        <source>Genre</source>
+        <translation>Genre</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="33"/>
+        <source>Comment</source>
+        <translation>Commentaire</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="35"/>
+        <source>Copyright</source>
+        <translation>Copyright</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="37"/>
+        <source>Author</source>
+        <translation>Auteur</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="62"/>
+        <source>(auto)</source>
+        <translation>(auto)</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
-        <location filename="Data.cpp" line="459"/>
+        <location filename="Data.cpp" line="508"/>
         <source>Cloud</source>
         <oldsource>Clad</oldsource>
         <translation>Clad</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="459"/>
+        <location filename="Data.cpp" line="508"/>
         <source>Barret</source>
         <translation>Barret</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="459"/>
+        <location filename="Data.cpp" line="508"/>
         <source>Tifa</source>
         <translation>Tifa</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="460"/>
         <source>Aeris</source>
-        <translation>Aeris</translation>
+        <translation type="vanished">Aeris</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="460"/>
+        <location filename="Data.cpp" line="509"/>
         <source>Red XIII</source>
         <translation>Red XIII</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="460"/>
+        <location filename="Data.cpp" line="509"/>
         <source>Yuffie</source>
         <translation>Youfie</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="461"/>
+        <location filename="Data.cpp" line="509"/>
+        <source>Aerith</source>
+        <translation>Aerith</translation>
+    </message>
+    <message>
+        <location filename="Data.cpp" line="510"/>
         <source>Cait Sith</source>
         <translation>Cait Sith</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="461"/>
+        <location filename="Data.cpp" line="510"/>
         <source>Vincent</source>
         <translation>Vincent</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="461"/>
+        <location filename="Data.cpp" line="510"/>
         <source>Cid</source>
         <translation>Cid</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="462"/>
+        <location filename="Data.cpp" line="511"/>
         <source>Yound Cloud</source>
         <oldsource>Jeune Clad</oldsource>
         <translation>Jeune Clad</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="462"/>
+        <location filename="Data.cpp" line="511"/>
         <source>Sephiroth</source>
         <translation>Sephiroth</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="462"/>
+        <location filename="Data.cpp" line="511"/>
         <source>Chocobo</source>
         <translation>Chocobo</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="467"/>
+        <location filename="Data.cpp" line="516"/>
         <source>[CAMERA|L2]</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="467"/>
+        <location filename="Data.cpp" line="516"/>
         <source>[TARGET|R2]</source>
         <translation>[CIBLE|R2]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="468"/>
+        <location filename="Data.cpp" line="517"/>
         <source>[PAGE UP|L1]</source>
         <oldsource>[PAGE HAUT|L1]</oldsource>
         <translation>[PAGE HAUT|L1]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="468"/>
+        <location filename="Data.cpp" line="517"/>
         <source>[PAGE DOWN|R1]</source>
         <translation>[PAGE BAS|R1]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="469"/>
+        <location filename="Data.cpp" line="518"/>
         <source>[MENU|TRIANGLE]</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="469"/>
+        <location filename="Data.cpp" line="518"/>
         <source>[OK|CIRCLE]</source>
         <translation>[OK|ROND]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="470"/>
+        <location filename="Data.cpp" line="519"/>
         <source>[CANCEL|CROSS]</source>
         <translation>[ANNULER|CROIX]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="470"/>
+        <location filename="Data.cpp" line="519"/>
         <source>[SWITCH|SQUARE]</source>
         <translation>[CHANGER|CARRE]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="471"/>
+        <location filename="Data.cpp" line="520"/>
         <source>[ASSIST|SELECT]</source>
         <translation>[ASSISTER|SELECT]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="472"/>
+        <location filename="Data.cpp" line="521"/>
         <source>[START]</source>
         <translation>[DEMARRER|START]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="473"/>
+        <location filename="Data.cpp" line="522"/>
         <source>[UP]</source>
         <translation>[HAUT]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="473"/>
+        <location filename="Data.cpp" line="522"/>
         <source>[RIGHT]</source>
         <translation>[DROITE]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="474"/>
+        <location filename="Data.cpp" line="523"/>
         <source>[DOWN]</source>
         <translation>[BAS]</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="474"/>
+        <location filename="Data.cpp" line="523"/>
         <source>[LEFT]</source>
         <translation>[GAUCHE]</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="223"/>
+        <location filename="core/field/GrpScript.cpp" line="224"/>
         <source>Untitled</source>
         <translation>Sans nom</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="254"/>
+        <location filename="core/field/GrpScript.cpp" line="255"/>
         <source>Field model</source>
         <translation>Objet 3D</translation>
     </message>
@@ -1781,131 +2210,131 @@
         <translation type="vanished">Zone</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="256"/>
+        <location filename="core/field/GrpScript.cpp" line="257"/>
         <source>Line</source>
         <translation>Ligne</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="257"/>
+        <location filename="core/field/GrpScript.cpp" line="258"/>
         <source>Animation</source>
         <translation>Animation</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="258"/>
+        <location filename="core/field/GrpScript.cpp" line="259"/>
         <source>Main</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="281"/>
+        <location filename="core/field/GrpScript.cpp" line="282"/>
         <source>S0 - Init</source>
         <translatorcomment>S0 - Init</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="282"/>
+        <location filename="core/field/GrpScript.cpp" line="283"/>
         <source>S0 - Main</source>
         <translation>S0 - Main</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="284"/>
+        <location filename="core/field/GrpScript.cpp" line="285"/>
         <source>S1 - Talk</source>
         <oldsource>S1 - Parler</oldsource>
         <translation>S1 - Parler</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="285"/>
+        <location filename="core/field/GrpScript.cpp" line="286"/>
         <source>S1 - [OK]</source>
         <translation>S1 - [OK]</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="288"/>
+        <location filename="core/field/GrpScript.cpp" line="289"/>
         <source>S2 - Contact</source>
         <oldsource>S2 - Toucher</oldsource>
         <translation>S2 - Toucher</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="289"/>
+        <location filename="core/field/GrpScript.cpp" line="290"/>
         <source>S2 - Move</source>
         <oldsource>S2 - Bouger</oldsource>
         <translation>S2 - Bouger</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="292"/>
+        <location filename="core/field/GrpScript.cpp" line="293"/>
         <source>S3 - Move</source>
         <oldsource>S3 - Bouger</oldsource>
         <translation>S3 - Bouger</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="295"/>
+        <location filename="core/field/GrpScript.cpp" line="296"/>
         <source>S4 - Go</source>
         <oldsource>S4 - Aller</oldsource>
         <translation>S4 - Aller</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="298"/>
+        <location filename="core/field/GrpScript.cpp" line="299"/>
         <source>S5 - Go 1x</source>
         <oldsource>S5 - Aller 1x</oldsource>
         <translation>S5 - Aller 1x</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="301"/>
+        <location filename="core/field/GrpScript.cpp" line="302"/>
         <source>S6 - Go away</source>
         <oldsource>S6 - Partir</oldsource>
         <translation>S6 - Partir</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="305"/>
+        <location filename="core/field/GrpScript.cpp" line="306"/>
         <source>Script %1</source>
         <translation>Script %1</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="530"/>
+        <location filename="core/field/GrpScript.cpp" line="540"/>
         <source>Group &apos;%1&apos;:</source>
         <oldsource>Groupe &apos;%1&apos; :</oldsource>
         <translation>Groupe &apos;%1&apos; :</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="538"/>
+        <location filename="core/field/GrpScript.cpp" line="548"/>
         <source>Script &apos;%1&apos; :</source>
         <translation>Script &apos;%1&apos; :</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="329"/>
+        <location filename="core/field/Opcode.cpp" line="349"/>
         <source> (No%1)</source>
         <oldsource> (n°%1)</oldsource>
         <translation> (n°%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="330"/>
+        <location filename="core/field/Opcode.cpp" line="350"/>
         <source>? (No%1)</source>
         <oldsource>? (n°%1)</oldsource>
         <translation>? (n°%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="341"/>
+        <location filename="core/field/Opcode.cpp" line="361"/>
         <source>(no text)</source>
         <oldsource>(Pas de texte)</oldsource>
         <translation>(Pas de texte)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="347"/>
-        <location filename="core/field/Opcode.cpp" line="363"/>
-        <location filename="core/field/Opcode.cpp" line="369"/>
-        <location filename="core/field/Opcode.cpp" line="374"/>
+        <location filename="core/field/Opcode.cpp" line="367"/>
         <location filename="core/field/Opcode.cpp" line="383"/>
         <location filename="core/field/Opcode.cpp" line="389"/>
+        <location filename="core/field/Opcode.cpp" line="394"/>
+        <location filename="core/field/Opcode.cpp" line="403"/>
+        <location filename="core/field/Opcode.cpp" line="409"/>
         <source>No%1</source>
         <oldsource>n°%1</oldsource>
         <translation>n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="380"/>
+        <location filename="core/field/Opcode.cpp" line="400"/>
         <source>%1 (#%2)</source>
         <oldsource>%1 (n°%2)</oldsource>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="397"/>
+        <location filename="core/field/Opcode.cpp" line="417"/>
         <source>%1 (disc %2)</source>
         <oldsource>%1 (disque %2)</oldsource>
         <translation>%1 (disque %2)</translation>
@@ -1931,25 +2360,25 @@
         <translation type="vanished">Jouer un effet sonore sur le canal 4</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="443"/>
+        <location filename="core/field/Opcode.cpp" line="462"/>
         <source>Resumes music and sound effects</source>
         <oldsource>Reprendre la musique et les effets sonores</oldsource>
         <translation>Reprendre la musique et les effets sonores</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="444"/>
+        <location filename="core/field/Opcode.cpp" line="463"/>
         <source>Pauses music and sound effects</source>
         <oldsource>Mettre en pause la musique et les effets sonores</oldsource>
         <translation>Mettre en pause la musique et les effets sonores</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="447"/>
+        <location filename="core/field/Opcode.cpp" line="466"/>
         <source>Resumes only sound effects</source>
         <oldsource>Reprendre uniquement les effets sonores</oldsource>
         <translation>Reprendre uniquement les effets sonores</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="448"/>
+        <location filename="core/field/Opcode.cpp" line="467"/>
         <source>Pauses only sound effects</source>
         <oldsource>Mettre en pause uniquement les effets sonores</oldsource>
         <translation>Mettre en pause uniquement les effets sonores</translation>
@@ -1995,97 +2424,97 @@
         <translation type="vanished">Volume transitions (canal 4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="457"/>
+        <location filename="core/field/Opcode.cpp" line="476"/>
         <source>Pan control (channel #1)</source>
         <oldsource>Contrôle spatial (canal 1)</oldsource>
         <translation>Contrôle spatial (canal 1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="458"/>
+        <location filename="core/field/Opcode.cpp" line="477"/>
         <source>Pan control (channel #2)</source>
         <oldsource>Contrôle spatial (canal 2)</oldsource>
         <translation>Contrôle spatial (canal 2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="459"/>
+        <location filename="core/field/Opcode.cpp" line="478"/>
         <source>Pan control (channel #3)</source>
         <oldsource>Contrôle spatial (canal 3)</oldsource>
         <translation>Contrôle spatial (canal 3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="460"/>
+        <location filename="core/field/Opcode.cpp" line="479"/>
         <source>Pan control (channel #4)</source>
         <oldsource>Contrôle spatial (canal 4)</oldsource>
         <translation>Contrôle spatial (canal 4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="461"/>
+        <location filename="core/field/Opcode.cpp" line="480"/>
         <source>Pan transitions (channel #1)</source>
         <oldsource>Transitions spatiales (canal 1)</oldsource>
         <translation>Transitions spatiales (canal 1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="462"/>
+        <location filename="core/field/Opcode.cpp" line="481"/>
         <source>Pan transitions (channel #2)</source>
         <oldsource>Transitions spatiales (canal 2)</oldsource>
         <translation>Transitions spatiales (canal 2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="463"/>
+        <location filename="core/field/Opcode.cpp" line="482"/>
         <source>Pan transitions (channel #3)</source>
         <oldsource>Transitions spatiales (canal 3)</oldsource>
         <translation>Transitions spatiales (canal 3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="464"/>
+        <location filename="core/field/Opcode.cpp" line="483"/>
         <source>Pan transitions (channel #4)</source>
         <oldsource>Transitions spatiales (canal 4)</oldsource>
         <translation>Transitions spatiales (canal 4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="465"/>
+        <location filename="core/field/Opcode.cpp" line="484"/>
         <source>Tempo control (channel #1)</source>
         <oldsource>Contrôle du tempo (canal 1)</oldsource>
         <translation>Contrôle du tempo (canal 1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="466"/>
+        <location filename="core/field/Opcode.cpp" line="485"/>
         <source>Tempo control (channel #2)</source>
         <oldsource>Contrôle du tempo (canal 2)</oldsource>
         <translation>Contrôle du tempo (canal 2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="467"/>
+        <location filename="core/field/Opcode.cpp" line="486"/>
         <source>Tempo control (channel #3)</source>
         <oldsource>Contrôle du tempo (canal 3)</oldsource>
         <translation>Contrôle du tempo (canal 3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="468"/>
+        <location filename="core/field/Opcode.cpp" line="487"/>
         <source>Tempo control (channel #4)</source>
         <oldsource>Contrôle du tempo (canal 4)</oldsource>
         <translation>Contrôle du tempo (canal 4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="469"/>
+        <location filename="core/field/Opcode.cpp" line="488"/>
         <source>Tempo transitions (channel #1)</source>
         <oldsource>Tempo transitions (canal 1)</oldsource>
         <translation>Transitions tempo (canal 1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="470"/>
+        <location filename="core/field/Opcode.cpp" line="489"/>
         <source>Tempo transitions (channel #2)</source>
         <oldsource>Tempo transitions (canal 2)</oldsource>
         <translation>Transitions tempo (canal 2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="471"/>
+        <location filename="core/field/Opcode.cpp" line="490"/>
         <source>Tempo transitions (channel #3)</source>
         <oldsource>Tempo transitions (canal 3)</oldsource>
         <translation>Transitions tempo (canal 3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="472"/>
+        <location filename="core/field/Opcode.cpp" line="491"/>
         <source>Tempo transitions (channel #4)</source>
         <oldsource>Tempo transitions (canal 4)</oldsource>
         <translation>Transitions tempo (canal 4)</translation>
@@ -2101,25 +2530,25 @@
         <translation type="vanished">Transitions du volume transitions sur tous les canaux</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="475"/>
+        <location filename="core/field/Opcode.cpp" line="494"/>
         <source>Pan control for all channels</source>
         <oldsource>Contrôle spatial sur tous les canaux</oldsource>
         <translation>Contrôle spatial sur tous les canaux</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="476"/>
+        <location filename="core/field/Opcode.cpp" line="495"/>
         <source>Pan transitions for all channels</source>
         <oldsource>Transitions spatiales sur tous les canaux</oldsource>
         <translation>Transitions spatiales sur tous les canaux</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="477"/>
+        <location filename="core/field/Opcode.cpp" line="496"/>
         <source>Tempo control for all channels</source>
         <oldsource>Contrôle du tempo sur tous les canaux</oldsource>
         <translation>Contrôle du tempo sur tous les canaux</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="478"/>
+        <location filename="core/field/Opcode.cpp" line="497"/>
         <source>Tempo transitions for all channels</source>
         <oldsource>Tempo transitions sur tous les canaux</oldsource>
         <translation>Transitions tempo  sur tous les canaux</translation>
@@ -2130,228 +2559,228 @@
         <translation type="vanished">Transition sur le volume de la musique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="486"/>
+        <location filename="core/field/Opcode.cpp" line="505"/>
         <source>Music tempo transition</source>
         <oldsource>Transition sur le tempo de la musique</oldsource>
         <translation>Transition sur le tempo de la musique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="494"/>
+        <location filename="core/field/Opcode.cpp" line="514"/>
         <source>AKAO: %1?</source>
         <oldsource>AKAO : %1?</oldsource>
         <translation>AKAO : %1?</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="531"/>
+        <location filename="core/field/Opcode.cpp" line="551"/>
         <source>%1 and %2 and %3</source>
         <oldsource>%1 et %2 et %3</oldsource>
         <translation>%1 et %2 et %3</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3387"/>
+        <location filename="core/field/Opcode.cpp" line="3498"/>
         <source>Check if %1 and store the result in var[15][111]</source>
-        <translation>Vérifier si %1 et enregistrer le résultat dans var[15][11]</translation>
+        <translation>Vérifier si %1 et enregistrer le résultat dans var[15][111]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3429"/>
+        <location filename="core/field/Opcode.cpp" line="3540"/>
         <source>Enables</source>
         <translation>Permettre</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3429"/>
+        <location filename="core/field/Opcode.cpp" line="3540"/>
         <source>Disables</source>
         <translation>Interdire</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3470"/>
+        <location filename="core/field/Opcode.cpp" line="3581"/>
         <source>Add %2 HP to party member #%1</source>
         <translation>Augmenter de %2 HPs le membre n°%1 de l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3487"/>
+        <location filename="core/field/Opcode.cpp" line="3598"/>
         <source>Remove %2 HP to party member #%1</source>
         <translation>Diminuer de %2 HPs le membre n°%1 de l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3568"/>
+        <location filename="core/field/Opcode.cpp" line="3686"/>
         <source>No Background/Border</source>
         <translation>Pas de fond, ni de bordure</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3573"/>
+        <location filename="core/field/Opcode.cpp" line="3691"/>
         <source>Set the window #%1 mode: %2 (%3 the closing of the window by the player)</source>
         <translation>Décoration de la fenêtre n°%1 : %2 (%3 la fermeture de la fenêtre par le joueur)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3576"/>
+        <location filename="core/field/Opcode.cpp" line="3694"/>
         <source>prevent</source>
         <translation>empêcher</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3609"/>
+        <location filename="core/field/Opcode.cpp" line="3727"/>
         <source>Reset the window #%1</source>
         <translation>Remettre la fenêtre n°%1 à zéro</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3653"/>
+        <location filename="core/field/Opcode.cpp" line="3771"/>
         <source>Close the window #%1 (stronger)</source>
         <translation>Fermer la fenêtre n°%1 (plus fort)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3685"/>
+        <location filename="core/field/Opcode.cpp" line="3803"/>
         <source>Number of row in the window #%1 = %2</source>
         <translation>Configurer le nombre de lignes de texte à %2 dans la fenêtre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3744"/>
+        <location filename="core/field/Opcode.cpp" line="3862"/>
         <source>Get windows %1 color to %2 (R), %3 (G) and %4 (B)</source>
         <translation>Obtenir la couleur du côté %1 des fenêtres et en stocker les composantes dans %2 (R), %3 (V) et %4 (B)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3776"/>
+        <location filename="core/field/Opcode.cpp" line="3894"/>
         <source>Set windows %1 color: RGB(%2, %3, %4)</source>
         <translation>Changer la couleur du côté %1 des fenêtres : RVB(%2, %3, %4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4060"/>
+        <location filename="core/field/Opcode.cpp" line="4178"/>
         <source>Perform no operation...</source>
         <translation>Ne rien faire...</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4216"/>
+        <location filename="core/field/Opcode.cpp" line="4334"/>
         <source>Scroll to playable character</source>
         <translation>Centrer sur le personnage jouable</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4266"/>
+        <location filename="core/field/Opcode.cpp" line="4384"/>
         <source>Wait for scroll</source>
         <translation>Attendre la fin du dernier centrage pour continuer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4425"/>
+        <location filename="core/field/Opcode.cpp" line="4543"/>
         <source>Wait for fade</source>
         <translation>Attendre la fin du voilage de l&apos;écran pour continuer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4466"/>
+        <location filename="core/field/Opcode.cpp" line="4584"/>
         <source>Retrieves the field ID number of the last field in %1</source>
         <translation>Stocker l&apos;id de l&apos;écran précédent dans %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4498"/>
+        <location filename="core/field/Opcode.cpp" line="4616"/>
         <source>Scroll to party member #%2 (speed=%1 frames, type=%3)</source>
         <translation>Centrer sur le personnage n°%2 de l&apos;équipe actuelle (vitesse=%1 img, type=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4532"/>
+        <location filename="core/field/Opcode.cpp" line="4650"/>
         <source>Start battle #%1</source>
         <translation>Commencer le combat n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4561"/>
+        <location filename="core/field/Opcode.cpp" line="4679"/>
         <source>%1 random battle</source>
         <translation>%1 les combats aléatoires</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1932"/>
-        <location filename="core/field/Opcode.cpp" line="4591"/>
+        <location filename="core/field/Opcode.cpp" line="2025"/>
+        <location filename="core/field/Opcode.cpp" line="4709"/>
         <source>The party cannot escape the battle</source>
         <translation>Impossible de fuir</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1935"/>
-        <location filename="core/field/Opcode.cpp" line="4594"/>
+        <location filename="core/field/Opcode.cpp" line="2028"/>
+        <location filename="core/field/Opcode.cpp" line="4712"/>
         <source>Do not show battle rewards</source>
         <translation>Ne pas afficher d&apos;écran de récompense</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4623"/>
+        <location filename="core/field/Opcode.cpp" line="4741"/>
         <source>Get direction of the party member #%1 to %2</source>
         <translation>Obtenir la direction du personnage n°%1 de l&apos;équipe actuelle et la stocker dans %2</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4656"/>
+        <location filename="core/field/Opcode.cpp" line="4774"/>
         <source>Get group ID of the party member #%1 to %2</source>
         <translation>Obtenir l&apos;id du personnage n°%1 de l&apos;équipe actuelle et le stocker dans %2</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4981"/>
+        <location filename="core/field/Opcode.cpp" line="5099"/>
         <source>%1 talk script for the current field model</source>
         <translation>%1 la possibilité de parler à l&apos;objet 3D</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5088"/>
+        <location filename="core/field/Opcode.cpp" line="5206"/>
         <source>Bit %2 ON in %1</source>
         <translation>Mettre le bit %2 à 1 dans %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5105"/>
+        <location filename="core/field/Opcode.cpp" line="5223"/>
         <source>Bit %2 OFF in %1</source>
         <translation>Mettre le bit %2 à 0 dans %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5122"/>
+        <location filename="core/field/Opcode.cpp" line="5240"/>
         <source>Toggle bit %2 in %1</source>
         <translation>Inverser la valeur du bit %2 dans %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5475"/>
+        <location filename="core/field/Opcode.cpp" line="5593"/>
         <source>Set random value to %1 (8-bit)</source>
         <translation>Affecter une valeur aléatoire à %1 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5759"/>
+        <location filename="core/field/Opcode.cpp" line="5877"/>
         <source>%1 field model</source>
         <translation>%1 l&apos;objet 3D</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6054"/>
+        <location filename="core/field/Opcode.cpp" line="6172"/>
         <source>Wait for animation</source>
         <translation>Attendre que l&apos;animation soit terminée pour continuer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6217"/>
+        <location filename="core/field/Opcode.cpp" line="6335"/>
         <source>Set the field model move speed: %1</source>
         <translation>Configurer la vitesse des déplacements de l&apos;objet 3D : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6811"/>
+        <location filename="core/field/Opcode.cpp" line="6929"/>
         <source>Wait for offset object</source>
         <translation>Attendre la fin de l&apos;exécution de l&apos;Offset Object pour continuer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6827"/>
-        <location filename="core/field/Opcode.cpp" line="7327"/>
+        <location filename="core/field/Opcode.cpp" line="6945"/>
+        <location filename="core/field/Opcode.cpp" line="7445"/>
         <source>Set range of the talk circle for the field model: %1</source>
         <translation>Modifier la distance nécessaire pour parler avec l&apos;objet 3D : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6886"/>
+        <location filename="core/field/Opcode.cpp" line="7004"/>
         <source>%1 contact with field model</source>
         <translation>%1 la possibilité de toucher l&apos;objet 3D</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6907"/>
+        <location filename="core/field/Opcode.cpp" line="7025"/>
         <source>Add %1 to the current party</source>
         <translation>Ajouter %1 à l&apos;équipe actuelle</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6928"/>
+        <location filename="core/field/Opcode.cpp" line="7046"/>
         <source>Remove %1 from the current party</source>
         <translation>Retirer %1 de l&apos;équipe actuelle</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6986"/>
+        <location filename="core/field/Opcode.cpp" line="7104"/>
         <source>If %1 is in the current party (%2)</source>
         <translation>Si %1 est dans l&apos;équipe actuelle (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7021"/>
+        <location filename="core/field/Opcode.cpp" line="7139"/>
         <source>not available</source>
         <translation>n&apos;existe plus</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7021"/>
+        <location filename="core/field/Opcode.cpp" line="7139"/>
         <source>available</source>
         <translation>existe</translation>
     </message>
@@ -2360,608 +2789,674 @@
         <translation type="vanished">Effacer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7160"/>
+        <location filename="core/field/Opcode.cpp" line="7278"/>
         <source>Gateways %1</source>
         <translation>%1 les changements de décor par le joueur</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7187"/>
+        <location filename="core/field/Opcode.cpp" line="7305"/>
         <source>Set line (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</source>
         <translation>Modifier la ligne (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7386"/>
+        <location filename="core/field/Opcode.cpp" line="7504"/>
         <source>Preload the field map %1</source>
         <translation>Commencer à charger l&apos;écran %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7422"/>
+        <location filename="core/field/Opcode.cpp" line="7540"/>
         <source>%1 (param1=%2, param2=%3, param3=%4, param4=%5, param5=%6)</source>
         <oldsource>%1 (16-bit) (param1=%2, param2=%3, param3=%4, param4=%5, param5=%6)</oldsource>
         <translation>%1 (param1=%2, param2=%3, param3=%4, param4=%5, param5=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7495"/>
+        <location filename="core/field/Opcode.cpp" line="7630"/>
         <source>stay</source>
         <translation>rester immobile</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7496"/>
+        <location filename="core/field/Opcode.cpp" line="7631"/>
         <source>walk</source>
         <translation>marcher</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7497"/>
+        <location filename="core/field/Opcode.cpp" line="7632"/>
         <source>run</source>
         <translation>courir</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7514"/>
+        <location filename="core/field/Opcode.cpp" line="7649"/>
         <source>Break field model animation</source>
         <translation>Stoppe l&apos;animation de l&apos;objet 3D</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7523"/>
+        <location filename="core/field/Opcode.cpp" line="7658"/>
         <source>Wait for rotation</source>
         <translation>Attendre que la rotation soit terminée pour continuer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7596"/>
+        <location filename="core/field/Opcode.cpp" line="7731"/>
         <source>Show the state #%2 of the background parameter #%1</source>
         <translation>Afficher l&apos;état n°%2 du paramètre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7695"/>
+        <location filename="core/field/Opcode.cpp" line="7830"/>
         <source>Show previous state of the background parameter #%1</source>
         <translation>Afficher l&apos;état précédent du paramètre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8142"/>
+        <location filename="core/field/Opcode.cpp" line="8277"/>
         <source>Play music #%1</source>
         <translation>Jouer musique n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8204"/>
+        <location filename="core/field/Opcode.cpp" line="8339"/>
         <source>%1 (param1 (8-bit)=%2, param2=%3, param3=%4, param4=%5, param5=%6)</source>
         <oldsource>%1 (8-bit) (param1=%2, param2=%3, param3=%4, param4=%5, param5=%6)</oldsource>
         <translation>%1 (param1 (8 bits)=%2, param2=%3, param3=%4, param4=%5, param5=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8294"/>
+        <location filename="core/field/Opcode.cpp" line="8446"/>
         <source>Unlock</source>
         <translation>Déverrouiller</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8294"/>
+        <location filename="core/field/Opcode.cpp" line="8446"/>
         <source>Lock</source>
         <comment>test</comment>
         <translation>Verrouiller</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8314"/>
+        <location filename="core/field/Opcode.cpp" line="8466"/>
         <source>Set the music #%1 for next battle</source>
         <translation>Choisir musique n°%1 comme musique de combat</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8370"/>
+        <location filename="core/field/Opcode.cpp" line="8522"/>
         <source>Set next movie: %1</source>
         <translation>Choisir prochaine cinématique : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8385"/>
+        <location filename="core/field/Opcode.cpp" line="8537"/>
         <source>Play movie</source>
         <translation>Jouer la cinématique choisie</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="564"/>
-        <location filename="core/field/Opcode.cpp" line="565"/>
+        <location filename="core/field/Opcode.cpp" line="584"/>
+        <location filename="core/field/Opcode.cpp" line="585"/>
         <source>reverse</source>
         <oldsource>inverse</oldsource>
         <translation>inverse</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="418"/>
+        <location filename="core/field/Opcode.cpp" line="438"/>
         <source>Play music [param1: music ID, 0-based]</source>
         <translation>Jouer musique [param1 : music id, à partir de 0]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="421"/>
+        <location filename="core/field/Opcode.cpp" line="440"/>
         <source>Play music and resume from last position [param1: music ID, 0-based]</source>
         <translation>Jouer musique et reprendre de la dernière position [param1 : musique id, à partir de 0]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="423"/>
+        <location filename="core/field/Opcode.cpp" line="442"/>
         <source>Play a sound effect (will be terminated if another effect is played on channel) [param1: panning, param2: effect ID]</source>
         <translation>Jouer un effet sonore (sera arrêté si un autre effet est joué sur le canal) [param1 : panoramique, param2 : effet id]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="427"/>
+        <location filename="core/field/Opcode.cpp" line="446"/>
         <source>Play a sound effect (will be terminated if another effect is played on channel) [param1: panning, param2: effect ID, param3: ?]</source>
         <translation>Jouer un effet sonore (sera arrêté si un autre effet est joué sur le canal) [param1 : panoramique, param2 : effet id, param3 : ?]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="431"/>
+        <location filename="core/field/Opcode.cpp" line="450"/>
         <source>Play a sound effect (will be terminated if another effect is played on channel) [param1: panning, param2: effect ID, param3: ?, param4: ?]</source>
         <translation>Jouer un effet sonore (sera arrêté si un autre effet est joué sur le canal) [param1 : panoramique, param2 : effet id, param3 : ?, param4 : ?]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="435"/>
+        <location filename="core/field/Opcode.cpp" line="454"/>
         <source>Play a sound effect (will be terminated if another effect is played on channel) [param1: panning, param2: effect ID, param3: ?, param4: ?, param5: ?]</source>
         <translation>Jouer un effet sonore (sera arrêté si un autre effet est joué sur le canal) [param1 : panoramique, param2 : effet id, param3 : ?, param4 : ?, param5 : ?]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="438"/>
+        <location filename="core/field/Opcode.cpp" line="457"/>
         <source>Play a sound effect on channel #1 [param1: panning, param2: effect ID]</source>
         <translation>Jouer un effet sonore sur le canal n°1 [param1 : panoramique, param2 : effet id]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="439"/>
+        <location filename="core/field/Opcode.cpp" line="458"/>
         <source>Play a sound effect on channel #2 [param1: panning, param2: effect ID]</source>
         <translation>Jouer un effet sonore sur le canal n°2 [param1 : panoramique, param2 : effet id]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="440"/>
+        <location filename="core/field/Opcode.cpp" line="459"/>
         <source>Play a sound effect on channel #3 [param1: panning, param2: effect ID]</source>
         <translation>Jouer un effet sonore sur le canal n°3 [param1 : panoramique, param2 : effet id]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="441"/>
+        <location filename="core/field/Opcode.cpp" line="460"/>
         <source>Play a sound effect on channel #4 [param1: panning, param2: effect ID]</source>
         <translation>Jouer un effet sonore sur le canal n°4 [param1 : panoramique, param2 : effet id]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="442"/>
+        <location filename="core/field/Opcode.cpp" line="461"/>
         <source>Play a sound effect (cannot be stopped) [param1: effect ID]</source>
         <translation>Jouer un effet sonore (ne peut pas être arrêté) [param2 : effet id]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="453"/>
-        <source>Volume transitions (channel #1) [param1: transition time, param2: target volume]</source>
-        <translation>Transitions de volume (canal n°1) [param1 : durée, param2 : volume cible]</translation>
+        <location filename="core/field/Opcode.cpp" line="468"/>
+        <source>Volume control (channel #1) [param1: volume]</source>
+        <translation>Contrôle de volume (canal #1) [param1 : volume]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="454"/>
-        <source>Volume transitions (channel #2) [param1: transition time, param2: target volume]</source>
-        <translation>Transitions de volume (canal n°2) [param1 : durée, param2 : volume cible]</translation>
+        <location filename="core/field/Opcode.cpp" line="469"/>
+        <source>Volume control (channel #2) [param1: volume]</source>
+        <translation>Contrôle de volume (canal #2) [param1 : volume]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="455"/>
+        <location filename="core/field/Opcode.cpp" line="470"/>
+        <source>Volume control (channel #3) [param1: volume]</source>
+        <translation>Contrôle de volume (canal #3) [param1 : volume]</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="471"/>
+        <source>Volume control (channel #4) [param1: volume]</source>
+        <translation>Contrôle de volume (canal #4) [param1 : volume]</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="472"/>
+        <source>Volume transitions (channel #1) [param1: transition time, param2: target volume]</source>
+        <translation>Transitions de volume (canal n°1) [param1 : durée, param2 : volume cible]</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="473"/>
+        <source>Volume transitions (channel #2) [param1: transition time, param2: target volume]</source>
+        <translation>Transitions de volume (canal n°2) [param1 : durée, param2 : volume cible]</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="474"/>
         <source>Volume transitions (channel #3) [param1: transition time, param2: target volume]</source>
         <translation>Transitions de volume (canal n°3) [param1 : durée, param2 : volume cible]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="456"/>
+        <location filename="core/field/Opcode.cpp" line="475"/>
         <source>Volume transitions (channel #4) [param1: transition time, param2: target volume]</source>
         <translation>Transitions de volume (canal n°4) [param1 : durée, param2 : volume cible]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="473"/>
+        <location filename="core/field/Opcode.cpp" line="492"/>
         <source>Volume control for all channels [param1: volume]</source>
         <translation>Contrôle de volume sur tous les canaux [param1 : volume]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="474"/>
+        <location filename="core/field/Opcode.cpp" line="493"/>
         <source>Volume transitions for all channels [param1: transition time, param2: target volume]</source>
         <translation>Transition de volume sur tous les canaux [param1 : durée, param2 : volume cible]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="479"/>
+        <location filename="core/field/Opcode.cpp" line="498"/>
         <source>Set music volume [param1: volume]</source>
         <translation>Définir le volume de la musique [param1 : volume]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="480"/>
+        <location filename="core/field/Opcode.cpp" line="499"/>
         <source>Music volume transition [param1: transition time, param2: target volume]</source>
         <translation>Volume transition de la musique [param1 : durée, param2 : volume cible]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="482"/>
+        <location filename="core/field/Opcode.cpp" line="501"/>
         <source>Set music pan (noop in PC version)</source>
         <translation>Définir panorama de la musique (ne fait rien sur la version PC)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="483"/>
+        <location filename="core/field/Opcode.cpp" line="502"/>
         <source>Music pan transition (noop in PC version)</source>
         <translation>Transition de panorama de la musique (ne fait rien sur la version PC)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="484"/>
+        <location filename="core/field/Opcode.cpp" line="503"/>
         <source>Music pan fade (noop in PC version)</source>
         <translation>Panorama du fondu musical (ne fait rien sur la version PC)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="485"/>
+        <location filename="core/field/Opcode.cpp" line="504"/>
         <source>Set music tempo [param1: tempo, 0x20 is normal]</source>
         <translation>Définir le tempo de la musique [param1 : tempo, la valeur normale est 0x20]</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="566"/>
+        <location filename="core/field/Opcode.cpp" line="507"/>
+        <source>Stop music-like (noop in PC version)</source>
+        <translation>Arrêter la musique ou approchant (ne fait rien dans la version PC)</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="586"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="601"/>
+        <location filename="core/field/Opcode.cpp" line="621"/>
         <source>? (ID=%1)</source>
         <oldsource>? (id=%1)</oldsource>
         <translation>? (id=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="621"/>
+        <location filename="core/field/Opcode.cpp" line="641"/>
         <source>Return</source>
         <oldsource>Retourner</oldsource>
         <translation>Retourner</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="655"/>
+        <location filename="core/field/Opcode.cpp" line="675"/>
         <source>Execute script #%3 in extern group %1 (priority %2/6) - Only if the script is not already running</source>
         <oldsource>Exécuter le script n°%3 du groupe externe %1 (priorité %2/6) - Seulement si le script n&apos;est pas déjà en cours d&apos;exécution</oldsource>
         <translation>Exécuter le script n°%3 du groupe externe %1 (priorité %2/6) - Seulement si le script n&apos;est pas déjà en cours d&apos;exécution</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="673"/>
+        <location filename="core/field/Opcode.cpp" line="693"/>
         <source>Execute script #%3 in extern group %1 (priority %2/6)</source>
         <oldsource>Exécuter le script n°%3 du groupe externe %1 (priorité %2/6)</oldsource>
         <translation>Exécuter le script n°%3 du groupe externe %1 (priorité %2/6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="691"/>
+        <location filename="core/field/Opcode.cpp" line="711"/>
         <source>Execute script #%3 in group %1 (priority %2/6) - Waiting for end of execution to continue</source>
         <oldsource>Exécuter le script n°%3 du groupe %1 (priorité %2/6) - Attend la fin de l&apos;exécution pour continuer</oldsource>
         <translation>Exécuter le script n°%3 du groupe %1 (priorité %2/6) - Attend la fin de l&apos;exécution pour continuer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="728"/>
+        <location filename="core/field/Opcode.cpp" line="748"/>
         <source>Execute script #%3 in extern group associated with the character #%1 in the current party (priority %2/6) - Only if the script is not already running</source>
         <oldsource>Exécuter le script n°%3 du groupe externe lié au personnage No%1 de l&apos;équipe (priorité %2/6) - Seulement si le script n&apos;est pas déjà en cours d&apos;exécution</oldsource>
         <translation>Exécuter le script n°%3 du groupe externe lié au personnage n°%1 de l&apos;équipe (priorité %2/6) - Seulement si le script n&apos;est pas déjà en cours d&apos;exécution</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="746"/>
+        <location filename="core/field/Opcode.cpp" line="766"/>
         <source>Execute script #%3 in extern group associated with the character #%1 in the current party (priority %2/6)</source>
         <oldsource>Exécuter le script n°%3 du groupe externe lié au personnage No%1 de l&apos;équipe (priorité %2/6)</oldsource>
         <translation>Exécuter le script n°%3 du groupe externe lié au personnage n°%1 de l&apos;équipe (priorité %2/6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="764"/>
+        <location filename="core/field/Opcode.cpp" line="784"/>
         <source>Execute script #%3 in group associated with the character #%1 in the current party (priority %2/6) - Waiting for end of execution to continue</source>
         <oldsource>Exécuter le script n°%3 du groupe lié au personnage No%1 de l&apos;équipe (priorité %2/6) - Attend la fin de l&apos;exécution pour continuer</oldsource>
         <translation>Exécuter le script n°%3 du groupe lié au personnage n°%1 de l&apos;équipe (priorité %2/6) - Attend la fin de l&apos;exécution pour continuer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="783"/>
+        <location filename="core/field/Opcode.cpp" line="803"/>
         <source>Return and execute script #%2 from the appellant group (Priority %1/6)</source>
         <oldsource>Retourner et exécuter le script n°%2 du groupe appelant (priorité %1/6)</oldsource>
         <translation>Retourner et exécuter le script n°%2 du groupe appelant (priorité %1/6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="836"/>
+        <location filename="core/field/Opcode.cpp" line="856"/>
         <source>Split party field (member 1: X=%1, Y=%2, dir=%3 ; member 2 : X=%4, Y=%5, dir=%6) (speed %7)</source>
         <oldsource>Faire sortir les membres de l&apos;équipe à partir du personnage jouable (perso 1 : X=%1, Y=%2, dir=%3 ; perso 2 : X=%4, Y=%5, dir=%6) (vitesse %7)</oldsource>
         <translation>Faire sortir les membres de l&apos;équipe à partir du personnage jouable (perso 1 : X=%1, Y=%2, dir=%3 ; perso 2 : X=%4, Y=%5, dir=%6) (vitesse %7)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1019"/>
+        <location filename="core/field/Opcode.cpp" line="1039"/>
         <source>PNAME - Disable right menu (%1)</source>
         <oldsource>PNAME - Désactiver le menu de droite (%1)</oldsource>
         <translation>PNAME - Désactiver le menu de droite (%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1072"/>
+        <location filename="core/field/Opcode.cpp" line="1092"/>
         <source>Set field message speed (%2) | %1 |</source>
         <oldsource>Modifier la vitesse des messages (%2) | %1 |</oldsource>
         <translation>Modifier la vitesse des messages (%2) | %1 |</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1095"/>
+        <location filename="core/field/Opcode.cpp" line="1115"/>
         <source>Fill materia menu with all materias in full quantity</source>
         <oldsource>Remplir le menu matéria de toutes les matérias en quantité maximum</oldsource>
         <translation>Remplir le menu matéria de toutes les matérias en quantité maximum</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1109"/>
+        <location filename="core/field/Opcode.cpp" line="1129"/>
         <source>Fills all available item entries in full quantity</source>
         <oldsource>Remplir l&apos;inventaire par tous les objets en quantité maximum</oldsource>
         <translation>Remplir l&apos;inventaire par tous les objets en quantité maximum</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1130"/>
+        <location filename="core/field/Opcode.cpp" line="1150"/>
         <source>%1 battles</source>
         <oldsource>%1 les combats</oldsource>
         <translation>%1 les combats</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1131"/>
-        <location filename="core/field/Opcode.cpp" line="1157"/>
-        <location filename="core/field/Opcode.cpp" line="2151"/>
-        <location filename="core/field/Opcode.cpp" line="2715"/>
-        <location filename="core/field/Opcode.cpp" line="4443"/>
-        <location filename="core/field/Opcode.cpp" line="4562"/>
-        <location filename="core/field/Opcode.cpp" line="4982"/>
-        <location filename="core/field/Opcode.cpp" line="6887"/>
-        <location filename="core/field/Opcode.cpp" line="7470"/>
+        <location filename="core/field/Opcode.cpp" line="1151"/>
+        <location filename="core/field/Opcode.cpp" line="1177"/>
+        <location filename="core/field/Opcode.cpp" line="2244"/>
+        <location filename="core/field/Opcode.cpp" line="2816"/>
+        <location filename="core/field/Opcode.cpp" line="4561"/>
+        <location filename="core/field/Opcode.cpp" line="4680"/>
+        <location filename="core/field/Opcode.cpp" line="5100"/>
+        <location filename="core/field/Opcode.cpp" line="7005"/>
+        <location filename="core/field/Opcode.cpp" line="7605"/>
         <source>Activate</source>
         <oldsource>Activer</oldsource>
         <translation>Activer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1131"/>
-        <location filename="core/field/Opcode.cpp" line="1157"/>
-        <location filename="core/field/Opcode.cpp" line="2151"/>
-        <location filename="core/field/Opcode.cpp" line="2715"/>
-        <location filename="core/field/Opcode.cpp" line="4443"/>
-        <location filename="core/field/Opcode.cpp" line="4562"/>
-        <location filename="core/field/Opcode.cpp" line="4982"/>
-        <location filename="core/field/Opcode.cpp" line="6887"/>
-        <location filename="core/field/Opcode.cpp" line="7470"/>
+        <location filename="core/field/Opcode.cpp" line="1151"/>
+        <location filename="core/field/Opcode.cpp" line="1177"/>
+        <location filename="core/field/Opcode.cpp" line="2244"/>
+        <location filename="core/field/Opcode.cpp" line="2816"/>
+        <location filename="core/field/Opcode.cpp" line="4561"/>
+        <location filename="core/field/Opcode.cpp" line="4680"/>
+        <location filename="core/field/Opcode.cpp" line="5100"/>
+        <location filename="core/field/Opcode.cpp" line="7005"/>
+        <location filename="core/field/Opcode.cpp" line="7605"/>
         <source>Deactivate</source>
         <translation>Désactiver</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1183"/>
+        <location filename="core/field/Opcode.cpp" line="1203"/>
         <source>Change name of %1 by text %2</source>
         <oldsource>Changer le nom de %1 par le texte %2</oldsource>
         <translation>Changer le nom de %1 par le texte %2</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1216"/>
+        <location filename="core/field/Opcode.cpp" line="1236"/>
         <source>Set game time to 0, unlock &quot;PHS&quot; and Save menu. New party: Cloud | (empty) | (empty)</source>
         <oldsource>Set game time to 0, unlock &quot;PHS&quot; and Save menu. New party: Cloud | (empty) | (empty);</oldsource>
         <translation>Met le temps à 0, débloque le menu &quot;PHS&quot; et &quot;Sauvegarder&quot;. Nouvelle équipe : Clad | (Vide) | (Vide)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1258"/>
+        <location filename="core/field/Opcode.cpp" line="1278"/>
         <source>SPECIAL - </source>
         <translation>SPECIAL - </translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1368"/>
+        <location filename="core/field/Opcode.cpp" line="1394"/>
         <source>Label %1</source>
         <translation>Label %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1401"/>
-        <location filename="core/field/Opcode.cpp" line="1432"/>
-        <location filename="core/field/Opcode.cpp" line="1461"/>
-        <location filename="core/field/Opcode.cpp" line="1492"/>
+        <location filename="core/field/Opcode.cpp" line="1427"/>
+        <location filename="core/field/Opcode.cpp" line="1458"/>
+        <location filename="core/field/Opcode.cpp" line="1487"/>
+        <location filename="core/field/Opcode.cpp" line="1518"/>
         <source>Goto label %1</source>
         <oldsource>Aller au label %1</oldsource>
         <translation>Aller au label %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1547"/>
-        <location filename="core/field/Opcode.cpp" line="1589"/>
-        <location filename="core/field/Opcode.cpp" line="1633"/>
-        <location filename="core/field/Opcode.cpp" line="1689"/>
-        <location filename="core/field/Opcode.cpp" line="1744"/>
-        <location filename="core/field/Opcode.cpp" line="1800"/>
+        <location filename="core/field/Opcode.cpp" line="1573"/>
+        <location filename="core/field/Opcode.cpp" line="1615"/>
+        <location filename="core/field/Opcode.cpp" line="1659"/>
+        <location filename="core/field/Opcode.cpp" line="1715"/>
+        <location filename="core/field/Opcode.cpp" line="1770"/>
+        <location filename="core/field/Opcode.cpp" line="1826"/>
         <source>If %1 %3 %2 (%4)</source>
         <oldsource>Si %1 %3 %2 (%4)</oldsource>
         <translation>Si %1 %3 %2 (%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1553"/>
-        <location filename="core/field/Opcode.cpp" line="1595"/>
-        <location filename="core/field/Opcode.cpp" line="1639"/>
-        <location filename="core/field/Opcode.cpp" line="1695"/>
-        <location filename="core/field/Opcode.cpp" line="1750"/>
-        <location filename="core/field/Opcode.cpp" line="1806"/>
-        <location filename="core/field/Opcode.cpp" line="2661"/>
-        <location filename="core/field/Opcode.cpp" line="2680"/>
-        <location filename="core/field/Opcode.cpp" line="2699"/>
-        <location filename="core/field/Opcode.cpp" line="6990"/>
-        <location filename="core/field/Opcode.cpp" line="7004"/>
+        <location filename="core/field/Opcode.cpp" line="1579"/>
+        <location filename="core/field/Opcode.cpp" line="1621"/>
+        <location filename="core/field/Opcode.cpp" line="1665"/>
+        <location filename="core/field/Opcode.cpp" line="1721"/>
+        <location filename="core/field/Opcode.cpp" line="1776"/>
+        <location filename="core/field/Opcode.cpp" line="1832"/>
+        <location filename="core/field/Opcode.cpp" line="1921"/>
+        <location filename="core/field/Opcode.cpp" line="2762"/>
+        <location filename="core/field/Opcode.cpp" line="2781"/>
+        <location filename="core/field/Opcode.cpp" line="2800"/>
+        <location filename="core/field/Opcode.cpp" line="7108"/>
+        <location filename="core/field/Opcode.cpp" line="7122"/>
         <source>else goto label %1</source>
         <oldsource>aller au label %1 sinon</oldsource>
         <translation>aller au label %1 sinon</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1851"/>
-        <location filename="core/field/Opcode.cpp" line="3378"/>
+        <location filename="core/field/Opcode.cpp" line="1875"/>
+        <source>8 bit</source>
+        <translation>8 bits</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1876"/>
+        <source>16 bit</source>
+        <translation>16 bits</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1877"/>
+        <source>24 bit</source>
+        <translation>24 bits</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1878"/>
+        <source>32 bit</source>
+        <translation>32 bits</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1883"/>
+        <source>From is a pointer</source>
+        <translation>&apos;De&apos; est un pointeur</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1887"/>
+        <source>To is a pointer</source>
+        <translation>&apos;Vers&apos; est un pointeur</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1890"/>
+        <source>Write/Read entire savemap (from=%1, to=%2, absValue=%3, flags={%4})</source>
+        <translation>Écrire/Lire toute la savemap (de=%1, vers=%2, valeurAbsolue=%3, flags={%4})</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1918"/>
+        <source>If Red XIII is named Nanaki (%2)</source>
+        <translation>Si Rouge XIII se nomme Nanaki (%2)</translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1944"/>
+        <location filename="core/field/Opcode.cpp" line="3489"/>
         <source>Bike (parameter %1)</source>
         <oldsource>Course de moto (paramètre %1)</oldsource>
         <translation>Course de moto (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1852"/>
+        <location filename="core/field/Opcode.cpp" line="1945"/>
         <source>Chocobo Races (parameter %1)</source>
         <oldsource>Course de chocobo (paramètre %1)</oldsource>
         <translation>Course de chocobo (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1853"/>
+        <location filename="core/field/Opcode.cpp" line="1946"/>
         <source>Snowboard -normal mode- (parameter %1)</source>
         <oldsource>Descente en snowboard -mode normal- (paramètre %1)</oldsource>
         <translation>Descente en snowboard -mode normal- (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1854"/>
+        <location filename="core/field/Opcode.cpp" line="1947"/>
         <source>Fort Condor (parameter %1)</source>
         <oldsource>Fort Condor (paramètre %1)</oldsource>
         <translation>Fort Condor (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1855"/>
+        <location filename="core/field/Opcode.cpp" line="1948"/>
         <source>Submarine (parameter %1)</source>
         <oldsource>Sous-marin (paramètre %1)</oldsource>
         <translation>Sous-marin (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1856"/>
+        <location filename="core/field/Opcode.cpp" line="1949"/>
         <source>Speed Square (parameter %1)</source>
         <oldsource>Speed Square (paramètre %1)</oldsource>
         <translation>Speed Square (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1857"/>
+        <location filename="core/field/Opcode.cpp" line="1950"/>
         <source>Snowboard -Gold Saucer mode- (parameter %1)</source>
         <oldsource>Descente en snowboard -mode Gold Saucer- (paramètre %1)</oldsource>
         <translation>Descente en snowboard -mode Gold Saucer- (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1858"/>
-        <location filename="core/field/Opcode.cpp" line="3392"/>
+        <location filename="core/field/Opcode.cpp" line="1951"/>
+        <location filename="core/field/Opcode.cpp" line="3503"/>
         <source>%1? (parameter %2)</source>
         <oldsource>%1? (paramètre %2)</oldsource>
         <translation>%1? (paramètre %2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1861"/>
+        <location filename="core/field/Opcode.cpp" line="1954"/>
         <source>Mini-game: %5 (After the game goto field %1 (X=%2, Y=%3, triangle ID=%4))</source>
         <oldsource>Lancer un mini-jeu : %5 (Après le jeu aller à l&apos;écran %1 (X=%2, Y=%3, triangle id=%4))</oldsource>
         <translation>Lancer un mini-jeu : %5 (Après le jeu aller à l&apos;écran %1 (X=%2, Y=%3, triangle id=%4))</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1931"/>
-        <location filename="core/field/Opcode.cpp" line="4590"/>
+        <location filename="core/field/Opcode.cpp" line="2024"/>
+        <location filename="core/field/Opcode.cpp" line="4708"/>
         <source>Pre-emptive attack</source>
         <oldsource>Attaque préventive</oldsource>
         <translation>Attaque préventive</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1937"/>
-        <location filename="core/field/Opcode.cpp" line="4595"/>
+        <location filename="core/field/Opcode.cpp" line="2030"/>
+        <location filename="core/field/Opcode.cpp" line="4713"/>
         <source>Disable game over</source>
         <oldsource>Désactiver Game Over</oldsource>
         <translation>Désactiver Game Over</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1943"/>
-        <location filename="core/field/Opcode.cpp" line="4601"/>
+        <location filename="core/field/Opcode.cpp" line="2036"/>
+        <location filename="core/field/Opcode.cpp" line="4719"/>
         <source>Battle mode: %1</source>
         <oldsource>Mode de combat : %1</oldsource>
         <translation>Mode de combat : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1964"/>
+        <location filename="core/field/Opcode.cpp" line="2057"/>
         <source>Stores the result of the last battle in %1</source>
         <oldsource>Stocker le résultat du dernier combat dans %1</oldsource>
         <translation>Stocker le résultat du dernier combat dans %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2020"/>
+        <location filename="core/field/Opcode.cpp" line="2113"/>
         <source>Fades the screen to the colour RGB(%2, %3, %4) (speed=%5, type=%1)</source>
         <oldsource>Voiler l&apos;écran avec la couleur RVB(%2, %3, %4) (vitesse=%5, type=%1)</oldsource>
         <translation>Voiler l&apos;écran avec la couleur RVB(%2, %3, %4) (vitesse=%5, type=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2065"/>
-        <location filename="core/field/Opcode.cpp" line="2086"/>
-        <location filename="core/field/Opcode.cpp" line="2427"/>
-        <location filename="core/field/Opcode.cpp" line="7161"/>
+        <location filename="core/field/Opcode.cpp" line="2158"/>
+        <location filename="core/field/Opcode.cpp" line="2179"/>
+        <location filename="core/field/Opcode.cpp" line="2520"/>
+        <location filename="core/field/Opcode.cpp" line="7279"/>
         <source>ON</source>
         <translation>Autoriser</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2065"/>
-        <location filename="core/field/Opcode.cpp" line="2086"/>
-        <location filename="core/field/Opcode.cpp" line="2427"/>
-        <location filename="core/field/Opcode.cpp" line="7161"/>
+        <location filename="core/field/Opcode.cpp" line="2158"/>
+        <location filename="core/field/Opcode.cpp" line="2179"/>
+        <location filename="core/field/Opcode.cpp" line="2520"/>
+        <location filename="core/field/Opcode.cpp" line="7279"/>
         <source>OFF</source>
         <translation>Empêcher</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2085"/>
+        <location filename="core/field/Opcode.cpp" line="2178"/>
         <source>BGMOVIE : %1</source>
         <translation>BGMOVIE : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2115"/>
+        <location filename="core/field/Opcode.cpp" line="2208"/>
         <source>Change the state of the eye/mouth texture (eye 1=%1, eye 2=%2, mouth=%3, 3D object ID=%4)</source>
         <oldsource>Changer l&apos;état de la texture des yeux ou de la bouche (oeil 1=%1, oeil 2=%2, bouche=%3, ID objet 3D=%4)</oldsource>
         <translation>Changer l&apos;état de la texture des yeux ou de la bouche (oeil 1=%1, oeil 2=%2, bouche=%3, ID objet 3D=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2185"/>
+        <location filename="core/field/Opcode.cpp" line="2278"/>
         <source>Change the ambient color of the model: RGB(%1, %2, %3) RGB(%4, %5, %6) (flags=%7)</source>
         <oldsource>Change la couleur ambiante du modèle : RVB(%1, %2, %3) RVB(%4, %5, %6) (flags=%7)</oldsource>
         <translation>Change la couleur ambiante du modèle : RVB(%1, %2, %3) RVB(%4, %5, %6) (flags=%7)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2215"/>
+        <location filename="core/field/Opcode.cpp" line="2308"/>
         <source>UNKNOWN4</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2225"/>
+        <location filename="core/field/Opcode.cpp" line="2318"/>
         <source>LIGHT</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2235"/>
+        <location filename="core/field/Opcode.cpp" line="2328"/>
         <source>UNKNOWN7</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2245"/>
+        <location filename="core/field/Opcode.cpp" line="2338"/>
         <source>UNKNOWN8</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2255"/>
+        <location filename="core/field/Opcode.cpp" line="2348"/>
         <source>UNKNOWN9</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2265"/>
+        <location filename="core/field/Opcode.cpp" line="2358"/>
         <source>SBOBJ</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2275"/>
+        <location filename="core/field/Opcode.cpp" line="2368"/>
         <source>UNKNOWNB</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2285"/>
+        <location filename="core/field/Opcode.cpp" line="2378"/>
         <source>UNKNOWNC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2295"/>
+        <location filename="core/field/Opcode.cpp" line="2388"/>
         <source>SHINE</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2305"/>
+        <location filename="core/field/Opcode.cpp" line="2398"/>
         <source>RESET</source>
         <translation>RESET</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2333"/>
+        <location filename="core/field/Opcode.cpp" line="2426"/>
         <source>Field Model graphic filter - %1</source>
         <oldsource>Filtre graphique sur l&apos;objet 3D - %1</oldsource>
         <translation>Filtre graphique sur l&apos;objet 3D - %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2426"/>
+        <location filename="core/field/Opcode.cpp" line="2519"/>
         <source>SLIP : %1</source>
         <translation>SLIP : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2449"/>
+        <location filename="core/field/Opcode.cpp" line="2542"/>
         <source>Set Z-deph for the background layer #%1 (Z=%2)</source>
         <oldsource>Déplacer la couche %1 du décor (Z=%2)</oldsource>
         <translation>Déplacer la couche %1 du décor (Z=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2483"/>
+        <location filename="core/field/Opcode.cpp" line="2576"/>
         <source>Animate the background layer #%1 (Horizontally=%2, Vertically=%3)</source>
         <oldsource>Animer la couche %1 du décor (horizontalement=%2, verticalement=%3)</oldsource>
         <translation>Animer la couche %1 du décor (horizontalement=%2, verticalement=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2600"/>
+        <location filename="core/field/Opcode.cpp" line="2701"/>
         <source>Resizes/Repositions the window #%1 (X=%2, Y=%3, width=%4, height=%5)</source>
         <oldsource>Redimensionner fenêtre No%1 (X=%2, Y=%3, largeur=%4, hauteur=%5)</oldsource>
         <translation>Redimensionner fenêtre n°%1 (X=%2, Y=%3, largeur=%4, hauteur=%5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="445"/>
+        <location filename="core/field/Opcode.cpp" line="464"/>
         <source>Resumes only the music</source>
         <translation>Reprendre uniquement la musique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="446"/>
+        <location filename="core/field/Opcode.cpp" line="465"/>
         <source>Pauses only the music</source>
         <translation>Mettre en pause uniquement la musique</translation>
     </message>
@@ -2970,7 +3465,7 @@
         <translation type="vanished">Modifier le volume de la musique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="481"/>
+        <location filename="core/field/Opcode.cpp" line="500"/>
         <source>Fade music volume</source>
         <translation>Attenuation du volume de la musique</translation>
     </message>
@@ -2987,101 +3482,101 @@
         <translation type="vanished">Modifier le tempo de la musique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="487"/>
+        <location filename="core/field/Opcode.cpp" line="506"/>
         <source>Music tempo fade</source>
         <translation>Attenuation du tempo de la musique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="488"/>
+        <location filename="core/field/Opcode.cpp" line="508"/>
         <source>Stop music</source>
         <translation>Arrêter la musique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="489"/>
+        <location filename="core/field/Opcode.cpp" line="509"/>
         <source>Stop sound effects</source>
         <translation>Arrêter les effets sonores</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="541"/>
+        <location filename="core/field/Opcode.cpp" line="561"/>
         <source>(Empty)</source>
         <translation>(Vide)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="553"/>
+        <location filename="core/field/Opcode.cpp" line="573"/>
         <source>Top Left</source>
         <translation>haut gauche</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="554"/>
+        <location filename="core/field/Opcode.cpp" line="574"/>
         <source>Bottom Left</source>
         <translation>bas gauche</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="555"/>
+        <location filename="core/field/Opcode.cpp" line="575"/>
         <source>Top Right</source>
         <translation>haut droit</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="556"/>
+        <location filename="core/field/Opcode.cpp" line="576"/>
         <source>Bottom Right</source>
         <translation>bas droit</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="806"/>
+        <location filename="core/field/Opcode.cpp" line="826"/>
         <source>Join party field (speed=%1)</source>
         <translation>Rassembler les membres de l&apos;équipe dans le personnage jouable (vitesse=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="920"/>
+        <location filename="core/field/Opcode.cpp" line="940"/>
         <source>Set party from memory: %1 | %2 | %3</source>
         <translation>Affecter les membres de l&apos;équipe : %1 | %2 | %3</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="938"/>
+        <location filename="core/field/Opcode.cpp" line="958"/>
         <source>Get party from memory: %1 | %2 | %3</source>
         <oldsource>Get party to memory: %1 | %2 | %3</oldsource>
         <translation>Récupérer les membres de l&apos;équipe : %1 | %2 | %3</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="966"/>
+        <location filename="core/field/Opcode.cpp" line="986"/>
         <source>Ask for disc %1</source>
         <translation>Demander le CD %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="992"/>
+        <location filename="core/field/Opcode.cpp" line="1012"/>
         <source>%1 arrow</source>
         <translation>%1 le curseur main</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="993"/>
-        <location filename="core/field/Opcode.cpp" line="5760"/>
+        <location filename="core/field/Opcode.cpp" line="1013"/>
+        <location filename="core/field/Opcode.cpp" line="5878"/>
         <source>Display</source>
         <translation>Afficher</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="993"/>
-        <location filename="core/field/Opcode.cpp" line="5760"/>
+        <location filename="core/field/Opcode.cpp" line="1013"/>
+        <location filename="core/field/Opcode.cpp" line="5878"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1045"/>
+        <location filename="core/field/Opcode.cpp" line="1065"/>
         <source>Set game speed (%1)</source>
         <translation>Modifier la vitesse de jeu (%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1156"/>
+        <location filename="core/field/Opcode.cpp" line="1176"/>
         <source>%1 movies</source>
         <translation>%1 les cinématiques</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1230"/>
+        <location filename="core/field/Opcode.cpp" line="1250"/>
         <source>Remove all items</source>
         <translation>Supprimer tous les objets de l&apos;inventaire</translation>
     </message>
     <message numerus="yes">
-        <location filename="core/field/Opcode.cpp" line="1400"/>
-        <location filename="core/field/Opcode.cpp" line="1431"/>
+        <location filename="core/field/Opcode.cpp" line="1426"/>
+        <location filename="core/field/Opcode.cpp" line="1457"/>
         <source>Forward %n byte(s)</source>
         <comment>With plural</comment>
         <translation>
@@ -3090,8 +3585,8 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="core/field/Opcode.cpp" line="1460"/>
-        <location filename="core/field/Opcode.cpp" line="1491"/>
+        <location filename="core/field/Opcode.cpp" line="1486"/>
+        <location filename="core/field/Opcode.cpp" line="1517"/>
         <source>Back %n byte(s)</source>
         <comment>With plural</comment>
         <translation>
@@ -3100,17 +3595,18 @@
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="core/field/Opcode.cpp" line="1552"/>
-        <location filename="core/field/Opcode.cpp" line="1594"/>
-        <location filename="core/field/Opcode.cpp" line="1638"/>
-        <location filename="core/field/Opcode.cpp" line="1694"/>
-        <location filename="core/field/Opcode.cpp" line="1749"/>
-        <location filename="core/field/Opcode.cpp" line="1805"/>
-        <location filename="core/field/Opcode.cpp" line="2660"/>
-        <location filename="core/field/Opcode.cpp" line="2679"/>
-        <location filename="core/field/Opcode.cpp" line="2698"/>
-        <location filename="core/field/Opcode.cpp" line="6989"/>
-        <location filename="core/field/Opcode.cpp" line="7003"/>
+        <location filename="core/field/Opcode.cpp" line="1578"/>
+        <location filename="core/field/Opcode.cpp" line="1620"/>
+        <location filename="core/field/Opcode.cpp" line="1664"/>
+        <location filename="core/field/Opcode.cpp" line="1720"/>
+        <location filename="core/field/Opcode.cpp" line="1775"/>
+        <location filename="core/field/Opcode.cpp" line="1831"/>
+        <location filename="core/field/Opcode.cpp" line="1920"/>
+        <location filename="core/field/Opcode.cpp" line="2761"/>
+        <location filename="core/field/Opcode.cpp" line="2780"/>
+        <location filename="core/field/Opcode.cpp" line="2799"/>
+        <location filename="core/field/Opcode.cpp" line="7107"/>
+        <location filename="core/field/Opcode.cpp" line="7121"/>
         <source>else forward %n byte(s)</source>
         <comment>With plural</comment>
         <translation>
@@ -3119,348 +3615,348 @@
         </translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1892"/>
+        <location filename="core/field/Opcode.cpp" line="1985"/>
         <source>Tutorial #%1</source>
         <translation>Lancer le tutoriel n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1930"/>
-        <location filename="core/field/Opcode.cpp" line="4589"/>
+        <location filename="core/field/Opcode.cpp" line="2023"/>
+        <location filename="core/field/Opcode.cpp" line="4707"/>
         <source>Countdown</source>
         <translation>Compte à rebours</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1933"/>
-        <location filename="core/field/Opcode.cpp" line="4592"/>
+        <location filename="core/field/Opcode.cpp" line="2026"/>
+        <location filename="core/field/Opcode.cpp" line="4710"/>
         <source>Do not play the battle victory music</source>
         <translation>Ne pas jouer Fanfare</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1934"/>
-        <location filename="core/field/Opcode.cpp" line="4593"/>
+        <location filename="core/field/Opcode.cpp" line="2027"/>
+        <location filename="core/field/Opcode.cpp" line="4711"/>
         <source>Activates the battle arena</source>
         <translation>Active l&apos;arène de combat du Gold Saucer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1936"/>
+        <location filename="core/field/Opcode.cpp" line="2029"/>
         <source>The party members do not perform their victory celebrations at the end of battle</source>
         <translation>Les personnages ne font pas leur animation de victoire</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1943"/>
-        <location filename="core/field/Opcode.cpp" line="4601"/>
+        <location filename="core/field/Opcode.cpp" line="2036"/>
+        <location filename="core/field/Opcode.cpp" line="4719"/>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1993"/>
+        <location filename="core/field/Opcode.cpp" line="2086"/>
         <source>Wait %1 frame</source>
         <translation>Attendre %1 img</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2064"/>
+        <location filename="core/field/Opcode.cpp" line="2157"/>
         <source>Field Model blink : %1</source>
         <translation>L&apos;objet 3D cligne des yeux : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2150"/>
+        <location filename="core/field/Opcode.cpp" line="2243"/>
         <source>%1 blending</source>
         <translation>%1 transparence</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2390"/>
+        <location filename="core/field/Opcode.cpp" line="2483"/>
         <source>Wait for graphic filter</source>
         <translation>Attendre la fin de l&apos;exécution du filtre graphique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2405"/>
+        <location filename="core/field/Opcode.cpp" line="2498"/>
         <source>Move Field Model to Party Member #%1</source>
         <translation>Déplacer l&apos;objet 3D vers le membre n°%1 de l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2518"/>
+        <location filename="core/field/Opcode.cpp" line="2611"/>
         <source>Close the window #%1</source>
         <translation>Fermer la fenêtre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2640"/>
+        <location filename="core/field/Opcode.cpp" line="2741"/>
         <source>(no key)</source>
         <oldsource>(no key</oldsource>
         <translation>(aucune touche)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2642"/>
+        <location filename="core/field/Opcode.cpp" line="2743"/>
         <source> or </source>
         <oldsource> ou </oldsource>
         <translation> ou </translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2714"/>
+        <location filename="core/field/Opcode.cpp" line="2815"/>
         <source>%1 the movability of the playable character</source>
         <oldsource>%1 les déplacements du personnage jouable</oldsource>
         <translation>%1 les déplacements du personnage jouable</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2735"/>
+        <location filename="core/field/Opcode.cpp" line="2836"/>
         <source>Instantly turns the field model to face the party member #%1</source>
         <oldsource>Tourner instantanément l&apos;objet 3D vers le membre de l&apos;équipe No%1</oldsource>
         <translation>Tourner instantanément l&apos;objet 3D vers le membre de l&apos;équipe n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2758"/>
+        <location filename="core/field/Opcode.cpp" line="2859"/>
         <source>Turns the field model to face the party member #%1 (Speed=%2, Rotation=%3)</source>
         <oldsource>Tourner l&apos;objet 3D vers le membre de l&apos;équipe No%1 (vitesse=%2, sens de rotation=%3)</oldsource>
         <translation>Tourner l&apos;objet 3D vers le membre de l&apos;équipe n°%1 (vitesse=%2, sens de rotation=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2790"/>
+        <location filename="core/field/Opcode.cpp" line="2891"/>
         <source>(none)</source>
         <oldsource>(vide)</oldsource>
         <translation>(vide)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2792"/>
+        <location filename="core/field/Opcode.cpp" line="2893"/>
         <source>Numeric (000000)</source>
         <oldsource>Affichage numérique</oldsource>
         <translation>Affichage numérique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2796"/>
+        <location filename="core/field/Opcode.cpp" line="2897"/>
         <source>%2 in the window #%1 (left=%3, top=%4)</source>
         <oldsource>%2 dans fenêtre No%1 (gauche=%3, haut=%4)</oldsource>
         <translation>%2 dans fenêtre n°%1 (gauche=%3, haut=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2965"/>
+        <location filename="core/field/Opcode.cpp" line="3066"/>
         <source>Remove %1 gils from the party</source>
         <oldsource>Retirer %1 gils à l&apos;équipe</oldsource>
         <translation>Retirer %1 gils à l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2983"/>
+        <location filename="core/field/Opcode.cpp" line="3084"/>
         <source>Copies the amount of gil in %1 and %2</source>
         <oldsource>Copier le nombre de Gils dans %1 et %2</oldsource>
         <translation>Copier le nombre de Gils dans %1 et %2</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3010"/>
-        <location filename="core/field/Opcode.cpp" line="3019"/>
-        <location filename="core/field/Opcode.cpp" line="3037"/>
+        <location filename="core/field/Opcode.cpp" line="3111"/>
+        <location filename="core/field/Opcode.cpp" line="3120"/>
+        <location filename="core/field/Opcode.cpp" line="3138"/>
         <source>Restores full HP and MP of every party member</source>
         <oldsource>Redonne les HP/MP aux membres de l&apos;équipe</oldsource>
         <translation>Redonne les HP/MP aux membres de l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3189"/>
+        <location filename="core/field/Opcode.cpp" line="3300"/>
         <source>Display %1 in the main menu</source>
         <oldsource>Afficher %1 dans le menu</oldsource>
         <translation>Afficher %1 dans le menu</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3286"/>
+        <location filename="core/field/Opcode.cpp" line="3397"/>
         <source>Ask Question %2 in the window #%1 (and put selected answer in %5) first line=%3, last line=%4</source>
         <oldsource>Poser question %2 dans la fenêtre No%1 (et mettre la réponse sélectionnée dans %5) première ligne=%3, dernière ligne=%4</oldsource>
         <translation>Poser question %2 dans la fenêtre n°%1 (et mettre la réponse sélectionnée dans %5) première ligne=%3, dernière ligne=%4</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3347"/>
+        <location filename="core/field/Opcode.cpp" line="3458"/>
         <source>all magic materias are present and mastered</source>
         <translation>toutes les matérias magiques sont présentes et au niveau maître</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3348"/>
+        <location filename="core/field/Opcode.cpp" line="3459"/>
         <source>all summon materias are present and mastered</source>
         <translation>toutes les matérias d&apos;invocation sont présentes et au niveau maître</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3349"/>
+        <location filename="core/field/Opcode.cpp" line="3460"/>
         <source>necessary command materias are present and mastered</source>
         <translation>les matérias de commande nécessaires sont présentes et au niveau maître</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3350"/>
+        <location filename="core/field/Opcode.cpp" line="3461"/>
         <source>Bahamut and Neo Bahamut materias are present</source>
         <translation>Les matérias Bahamut et Néo Bahamut sont présentes</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3351"/>
+        <location filename="core/field/Opcode.cpp" line="3462"/>
         <source>22? (parameter %1)</source>
         <translation>22? (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3359"/>
+        <location filename="core/field/Opcode.cpp" line="3470"/>
         <source>Remove mastered magic materias and add Master Magic</source>
         <translation>Supprimer les matérias magiques au niveau maître et ajouter magie maîtresse</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3360"/>
+        <location filename="core/field/Opcode.cpp" line="3471"/>
         <source>Remove mastered summon materias and add Master Summon</source>
         <translation>Supprimer les matérias d&apos;invocation au niveau maître et ajouter invocation maître</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3361"/>
+        <location filename="core/field/Opcode.cpp" line="3472"/>
         <source>Remove mastered meaning command materias and add Master Command</source>
         <translation>Supprimer les matérias de commande niveau maître nécessaires à la fusion et ajouter commande maître</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3362"/>
+        <location filename="core/field/Opcode.cpp" line="3473"/>
         <source>Add Bahamut Zero to the inventory</source>
         <translation>Ajouter Bahamut ZÉRO à l&apos;inventaire</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3363"/>
+        <location filename="core/field/Opcode.cpp" line="3474"/>
         <source>23? (parameter %1)</source>
         <translation>23? (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3371"/>
+        <location filename="core/field/Opcode.cpp" line="3482"/>
         <source>Exit program (parameter %1)</source>
         <oldsource>Fermer le programme (paramètre %1)</oldsource>
         <translation>Fermer le programme (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3372"/>
+        <location filename="core/field/Opcode.cpp" line="3483"/>
         <source>Encount Error (parameter %1)</source>
         <oldsource>Encount Error (paramètre %1)</oldsource>
         <translation>Encount Error (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3373"/>
+        <location filename="core/field/Opcode.cpp" line="3484"/>
         <source>ff7 credits (parameter %1)</source>
         <oldsource>Crédits de ff7 (paramètre %1)</oldsource>
         <translation>Crédits de ff7 (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3374"/>
+        <location filename="core/field/Opcode.cpp" line="3485"/>
         <source>Change name of %1</source>
         <oldsource>Changer nom de %1</oldsource>
         <translation>Changer nom de %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3375"/>
+        <location filename="core/field/Opcode.cpp" line="3486"/>
         <source>Change party (parameter %1)</source>
         <oldsource>Changer l&apos;équipe (paramètre %1)</oldsource>
         <translation>Changer l&apos;équipe (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3376"/>
+        <location filename="core/field/Opcode.cpp" line="3487"/>
         <source>Shop No%1</source>
         <oldsource>magasin No%1</oldsource>
         <translation>magasin n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3377"/>
+        <location filename="core/field/Opcode.cpp" line="3488"/>
         <source>main (parameter %1)</source>
         <oldsource>principal (paramètre %1)</oldsource>
         <translation>principal (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2657"/>
+        <location filename="core/field/Opcode.cpp" line="2758"/>
         <source>If key %1 pressed (%2)</source>
         <translation>Si appuie sur la touche %1 (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2676"/>
+        <location filename="core/field/Opcode.cpp" line="2777"/>
         <source>If key %1 pressed once (%2)</source>
         <translation>Si appuie sur la touche %1 une fois (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2695"/>
+        <location filename="core/field/Opcode.cpp" line="2796"/>
         <source>If key %1 released once (%2)</source>
         <translation>Si relache la touche %1 pour la première fois (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2791"/>
+        <location filename="core/field/Opcode.cpp" line="2892"/>
         <source>Clock (00:00)</source>
         <translation>Horloge</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2837"/>
+        <location filename="core/field/Opcode.cpp" line="2938"/>
         <source>Sets %2 in window #%1 (show %3 digits)</source>
         <translation>Affecter %2 dans la fenêtre n°%1 et afficher %3 chiffres</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2886"/>
+        <location filename="core/field/Opcode.cpp" line="2987"/>
         <source>Set Timer (H=%1, M=%2, S=%3)</source>
         <translation>Affecter une valeur au compte à rebours (H=%1, M=%2, S=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2949"/>
+        <location filename="core/field/Opcode.cpp" line="3050"/>
         <source>Add %1 gil to the party </source>
         <translation>Ajouter %1 gils à l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3028"/>
+        <location filename="core/field/Opcode.cpp" line="3129"/>
         <source>Restores full HP and MP of every available character and removing status effects</source>
         <translation>Redonne les HP/MP à tous et soigne les troubles de statut</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3053"/>
+        <location filename="core/field/Opcode.cpp" line="3159"/>
         <source>Displays the dialog %2 in the window #%1</source>
         <translation>Afficher message %2 dans la fenêtre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3100"/>
-        <location filename="core/field/Opcode.cpp" line="3146"/>
+        <location filename="core/field/Opcode.cpp" line="3206"/>
+        <location filename="core/field/Opcode.cpp" line="3252"/>
         <source>Set %3 to the variable #%2 in the window #%1</source>
         <translation>Affecter %3 à la variable n°%2 dans la fenêtre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3247"/>
+        <location filename="core/field/Opcode.cpp" line="3358"/>
         <source>Add %2 MP to party member #%1</source>
         <translation>Augmenter de %2 MPs le membre n°%1 de l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3264"/>
+        <location filename="core/field/Opcode.cpp" line="3375"/>
         <source>Remove %2 MP to party member #%1</source>
         <translation>Diminuer de %2 MPs le membre n°%1 de l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3379"/>
+        <location filename="core/field/Opcode.cpp" line="3490"/>
         <source>Save (parameter %1)</source>
         <oldsource>Sauvegarde (paramètre %1)</oldsource>
         <translation>Sauvegarde (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3380"/>
+        <location filename="core/field/Opcode.cpp" line="3491"/>
         <source>Remove all materias (parameter %1)</source>
         <oldsource>Effacer toutes les matérias (paramètre %1)</oldsource>
         <translation>Effacer toutes les matérias (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3381"/>
+        <location filename="core/field/Opcode.cpp" line="3492"/>
         <source>Restore all materias (parameter %1)</source>
         <oldsource>Rétablir toutes les matérias (paramètre %1)</oldsource>
         <translation>Rétablir toutes les matérias (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3382"/>
+        <location filename="core/field/Opcode.cpp" line="3493"/>
         <source>Remove %1&apos;s Materia</source>
         <oldsource>Effacer la matéria de %1</oldsource>
         <translation>Effacer la matéria de %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3383"/>
+        <location filename="core/field/Opcode.cpp" line="3494"/>
         <source>Clear Cloud&apos;s materias (parameter %1)</source>
         <oldsource>Effacer les matérias de Clad (paramètre %1)</oldsource>
         <translation>Effacer les matérias de Clad (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3384"/>
+        <location filename="core/field/Opcode.cpp" line="3495"/>
         <source>Restore Cloud&apos;s materias (parameter %1)</source>
         <oldsource>Rétablir les matérias de Clad (paramètre %1)</oldsource>
         <translation>Rétablir les matérias de Clad (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3385"/>
-        <location filename="core/field/Opcode.cpp" line="3390"/>
-        <location filename="core/field/Opcode.cpp" line="3391"/>
+        <location filename="core/field/Opcode.cpp" line="3496"/>
+        <location filename="core/field/Opcode.cpp" line="3501"/>
+        <location filename="core/field/Opcode.cpp" line="3502"/>
         <source>? (parameter %1)</source>
         <oldsource>? (paramètre %1)</oldsource>
         <translation>? (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3386"/>
+        <location filename="core/field/Opcode.cpp" line="3497"/>
         <source>HP to 1 (parameter %1)</source>
         <oldsource>HPs à 1 (paramètre %1)</oldsource>
         <translation>HPs à 1 (paramètre %1)</translation>
@@ -3471,543 +3967,543 @@
         <translation type="vanished">maitre ? (paramètre %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3398"/>
+        <location filename="core/field/Opcode.cpp" line="3509"/>
         <source>Show menu %1</source>
         <oldsource>Afficher menu %1</oldsource>
         <translation>Afficher menu %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3428"/>
+        <location filename="core/field/Opcode.cpp" line="3539"/>
         <source>%1 access to the main menu</source>
         <oldsource>%1 l&apos;accès aux menus</oldsource>
         <translation>%1 l&apos;accès aux menus</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3449"/>
+        <location filename="core/field/Opcode.cpp" line="3560"/>
         <source>Set battle table: %1</source>
         <oldsource>Choisir la battle table : %1</oldsource>
         <translation>Choisir la battle table : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3504"/>
+        <location filename="core/field/Opcode.cpp" line="3622"/>
         <source>Create window #%1 (X=%2, Y=%3, Width=%4, Height=%5)</source>
         <oldsource>Créer la fenêtre No%1 (X=%2, Y=%3, largeur=%4, hauteur=%5)</oldsource>
         <translation>Créer la fenêtre n°%1 (X=%2, Y=%3, largeur=%4, hauteur=%5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3526"/>
+        <location filename="core/field/Opcode.cpp" line="3644"/>
         <source>Move the window #%1 (Move : X=%2, Y=%3)</source>
         <oldsource>Déplacer la fenêtre No%1 (déplacement : X=%2, Y=%3)</oldsource>
         <translation>Déplacer la fenêtre n°%1 (déplacement : X=%2, Y=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3567"/>
+        <location filename="core/field/Opcode.cpp" line="3685"/>
         <source>Normal</source>
         <oldsource>Normale</oldsource>
         <translation>Normale</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3569"/>
+        <location filename="core/field/Opcode.cpp" line="3687"/>
         <source>Transparent Background</source>
         <oldsource>Fond semi-transparent</oldsource>
         <translation>Fond semi-transparent</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3576"/>
+        <location filename="core/field/Opcode.cpp" line="3694"/>
         <source>Authorize</source>
         <oldsource>autoriser</oldsource>
         <translation>autoriser</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3836"/>
+        <location filename="core/field/Opcode.cpp" line="3954"/>
         <source>Add %2 item(s) %1 to the inventory</source>
         <oldsource>Ajouter %2 objet(s) %1 dans l&apos;inventaire</oldsource>
         <translation>Ajouter %2 objet(s) %1 dans l&apos;inventaire</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3853"/>
+        <location filename="core/field/Opcode.cpp" line="3971"/>
         <source>Remove %2 item(s) %1 from the inventory</source>
         <oldsource>Supprimer %2 objet(s) %1 dans l&apos;inventaire</oldsource>
         <translation>Supprimer %2 objet(s) %1 dans l&apos;inventaire</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3870"/>
+        <location filename="core/field/Opcode.cpp" line="3988"/>
         <source>%2 = amount of item %1 in the inventory</source>
         <oldsource>%2 = quantité d&apos;objets %1 dans l&apos;inventaire</oldsource>
         <translation>%2 = quantité d&apos;objets %1 dans l&apos;inventaire</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3899"/>
+        <location filename="core/field/Opcode.cpp" line="4017"/>
         <source>Add %1 materia to the inventory (AP=%2)</source>
         <oldsource>Ajouter la matéria %1 dans l&apos;inventaire (AP=%2)</oldsource>
         <translation>Ajouter la matéria %1 dans l&apos;inventaire (AP=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3941"/>
+        <location filename="core/field/Opcode.cpp" line="4059"/>
         <source>Remove %3 materia(s) %1 from the inventory (AP=%2)</source>
         <oldsource>Supprimer %3 matéria(s) %1 dans l&apos;inventaire (AP=%2)</oldsource>
         <translation>Supprimer %3 matéria(s) %1 dans l&apos;inventaire (AP=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3987"/>
+        <location filename="core/field/Opcode.cpp" line="4105"/>
         <source>%4 = amount of materia %1 in the inventory (AP=%2, ?=%3)</source>
         <oldsource>%4 = quantité de matéria %1 dans l&apos;inventaire (AP=%2, ?=%3)</oldsource>
         <translation>%4 = quantité de matéria %1 dans l&apos;inventaire (AP=%2, ?=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4036"/>
+        <location filename="core/field/Opcode.cpp" line="4154"/>
         <source>Shake (nbSwings=%1, Amplitude=%2, speed=%3)</source>
         <oldsource>Secouer l&apos;écran (nbOscillations=%1, Amplitude=%2, vitesse=%3)</oldsource>
         <translation>Secouer l&apos;écran (nbOscillations=%1, Amplitude=%2, vitesse=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4079"/>
+        <location filename="core/field/Opcode.cpp" line="4197"/>
         <source>Jump to map %1 (X=%2, Y=%3, triangle ID=%4, direction=%5)</source>
         <oldsource>Aller à l&apos;écran %1 (X=%2, Y=%3, triangle id=%4, direction=%5)</oldsource>
         <translation>Aller à l&apos;écran %1 (X=%2, Y=%3, triangle id=%4, direction=%5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4109"/>
+        <location filename="core/field/Opcode.cpp" line="4227"/>
         <source>SCRLO (?=%1)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4130"/>
+        <location filename="core/field/Opcode.cpp" line="4248"/>
         <source>SCRLC (?=%1)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4154"/>
+        <location filename="core/field/Opcode.cpp" line="4272"/>
         <source>Scroll to group %2 (speed=%1, type=%3)</source>
         <oldsource>Centrer sur le groupe %2 (vitesse=%1, type=%3)</oldsource>
         <translation>Centrer sur le groupe %2 (vitesse=%1, type=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4189"/>
+        <location filename="core/field/Opcode.cpp" line="4307"/>
         <source>Scroll to location (X=%1, Y=%2)</source>
         <oldsource>Centrer sur zone (X=%1, Y=%2)</oldsource>
         <translation>Centrer sur zone (X=%1, Y=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4235"/>
-        <location filename="core/field/Opcode.cpp" line="4285"/>
+        <location filename="core/field/Opcode.cpp" line="4353"/>
+        <location filename="core/field/Opcode.cpp" line="4403"/>
         <source>Scroll to location (X=%1, Y=%2, speed=%3)</source>
         <oldsource>Centrer sur zone (X=%1, Y=%2, vitesse=%3)</oldsource>
         <translation>Centrer sur zone (X=%1, Y=%2, vitesse=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4322"/>
+        <location filename="core/field/Opcode.cpp" line="4440"/>
         <source>MPDSP : %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4346"/>
+        <location filename="core/field/Opcode.cpp" line="4464"/>
         <source>Scroll to location (?=%1, ?=%2, ?=%3)</source>
         <oldsource>Centrer sur Zone (?=%1, ?=%2, ?=%3)</oldsource>
         <translation>Centrer sur Zone (?=%1, ?=%2, ?=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4388"/>
+        <location filename="core/field/Opcode.cpp" line="4506"/>
         <source>Fades the screen to the colour RGB(%1, %2, %3) (speed=%4, type=%5, adjust=%6)</source>
         <oldsource>Voiler l&apos;écran avec la couleur RVB(%1, %2, %3) (vitesse=%4, type=%5, adjust=%6)</oldsource>
         <translation>Voiler l&apos;écran avec la couleur RVB(%1, %2, %3) (vitesse=%4, type=%5, adjust=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4441"/>
+        <location filename="core/field/Opcode.cpp" line="4559"/>
         <source>%2 the triangle #%1</source>
         <oldsource>%2 le triangle No%1</oldsource>
         <translation>%2 le triangle n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4693"/>
+        <location filename="core/field/Opcode.cpp" line="4811"/>
         <source>Get coordinates of the party member #%1 (store : X in %2, Y in %3, Z in %4 and triangle ID in %5)</source>
         <oldsource>Obtenir les coordonnées du personnage No%1 de l&apos;équipe actuelle (stocker : X dans %2, Y dans %3, Z dans %4 et l&apos;id dans %5)</oldsource>
         <translation>Obtenir les coordonnées du personnage n°%1 de l&apos;équipe actuelle (stocker : X dans %2, Y dans %3, Z dans %4 et l&apos;id dans %5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4848"/>
-        <location filename="core/field/Opcode.cpp" line="5139"/>
+        <location filename="core/field/Opcode.cpp" line="4966"/>
+        <location filename="core/field/Opcode.cpp" line="5257"/>
         <source>%1 = %1 + %2 (8 bit)</source>
         <oldsource>%1 = %1 + %2 (8 bits)</oldsource>
         <translation>%1 = %1 + %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4865"/>
-        <location filename="core/field/Opcode.cpp" line="5156"/>
+        <location filename="core/field/Opcode.cpp" line="4983"/>
+        <location filename="core/field/Opcode.cpp" line="5274"/>
         <source>%1 = %1 + %2 (16 bit)</source>
         <oldsource>%1 = %1 + %2 (16 bits)</oldsource>
         <translation>%1 = %1 + %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4882"/>
-        <location filename="core/field/Opcode.cpp" line="5173"/>
+        <location filename="core/field/Opcode.cpp" line="5000"/>
+        <location filename="core/field/Opcode.cpp" line="5291"/>
         <source>%1 = %1 - %2 (8 bit)</source>
         <oldsource>%1 = %1 - %2 (8 bits)</oldsource>
         <translation>%1 = %1 - %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4899"/>
-        <location filename="core/field/Opcode.cpp" line="5190"/>
+        <location filename="core/field/Opcode.cpp" line="5017"/>
+        <location filename="core/field/Opcode.cpp" line="5308"/>
         <source>%1 = %1 - %2 (16 bit)</source>
         <oldsource>%1 = %1 - %2 (16 bits)</oldsource>
         <translation>%1 = %1 - %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4917"/>
-        <location filename="core/field/Opcode.cpp" line="5411"/>
+        <location filename="core/field/Opcode.cpp" line="5035"/>
+        <location filename="core/field/Opcode.cpp" line="5529"/>
         <source>%1 = %1 + 1 (8 bit)</source>
         <oldsource>%1 = %1 + 1 (8 bits)</oldsource>
         <translation>%1 = %1 + 1 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4933"/>
-        <location filename="core/field/Opcode.cpp" line="5427"/>
+        <location filename="core/field/Opcode.cpp" line="5051"/>
+        <location filename="core/field/Opcode.cpp" line="5545"/>
         <source>%1 = %1 + 1 (16 bit)</source>
         <oldsource>%1 = %1 + 1 (16 bits)</oldsource>
         <translation>%1 = %1 + 1 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4949"/>
-        <location filename="core/field/Opcode.cpp" line="5443"/>
+        <location filename="core/field/Opcode.cpp" line="5067"/>
+        <location filename="core/field/Opcode.cpp" line="5561"/>
         <source>%1 = %1 - 1 (8 bit)</source>
         <oldsource>%1 = %1 - 1 (8 bits)</oldsource>
         <translation>%1 = %1 - 1 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4965"/>
-        <location filename="core/field/Opcode.cpp" line="5459"/>
+        <location filename="core/field/Opcode.cpp" line="5083"/>
+        <location filename="core/field/Opcode.cpp" line="5577"/>
         <source>%1 = %1 - 1 (16 bit)</source>
         <oldsource>%1 = %1 - 1 (16 bits)</oldsource>
         <translation>%1 = %1 - 1 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5003"/>
+        <location filename="core/field/Opcode.cpp" line="5121"/>
         <source>Seed Random Generator : %1</source>
         <translation>Seed Random Generator : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5026"/>
+        <location filename="core/field/Opcode.cpp" line="5144"/>
         <source>%1 = %2 (8 bit)</source>
         <oldsource>%1 = %2 (8 bits)</oldsource>
         <translation>%1 = %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5043"/>
+        <location filename="core/field/Opcode.cpp" line="5161"/>
         <source>%1 = %2 (16 bit)</source>
         <oldsource>%1 = %2 (16 bits)</oldsource>
         <translation>%1 = %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5207"/>
+        <location filename="core/field/Opcode.cpp" line="5325"/>
         <source>%1 = %1 * %2 (8 bit)</source>
         <oldsource>%1 = %1 * %2 (8 bits)</oldsource>
         <translation>%1 = %1 * %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5224"/>
+        <location filename="core/field/Opcode.cpp" line="5342"/>
         <source>%1 = %1 * %2 (16 bit)</source>
         <oldsource>%1 = %1 * %2 (16 bits)</oldsource>
         <translation>%1 = %1 * %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5241"/>
+        <location filename="core/field/Opcode.cpp" line="5359"/>
         <source>%1 = %1 / %2 (8 bit)</source>
         <oldsource>%1 = %1 / %2 (8 bits)</oldsource>
         <translation>%1 = %1 / %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5258"/>
+        <location filename="core/field/Opcode.cpp" line="5376"/>
         <source>%1 = %1 / %2 (16 bit)</source>
         <oldsource>%1 = %1 / %2 (16 bits)</oldsource>
         <translation>%1 = %1 / %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5275"/>
+        <location filename="core/field/Opcode.cpp" line="5393"/>
         <source>%1 = %1 mod %2 (8 bit)</source>
         <oldsource>%1 = %1 mod %2 (8 bits)</oldsource>
         <translation>%1 = %1 mod %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5292"/>
+        <location filename="core/field/Opcode.cpp" line="5410"/>
         <source>%1 = %1 mod %2 (16 bit)</source>
         <oldsource>%1 = %1 mod %2 (16 bits)</oldsource>
         <translation>%1 = %1 mod %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5309"/>
+        <location filename="core/field/Opcode.cpp" line="5427"/>
         <source>%1 = %1 &amp; %2 (8 bit)</source>
         <oldsource>%1 = %1 &amp; %2 (8 bits)</oldsource>
         <translation>%1 = %1 &amp; %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5326"/>
+        <location filename="core/field/Opcode.cpp" line="5444"/>
         <source>%1 = %1 &amp; %2 (16 bit)</source>
         <oldsource>%1 = %1 &amp; %2 (16 bits)</oldsource>
         <translation>%1 = %1 &amp; %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5343"/>
+        <location filename="core/field/Opcode.cpp" line="5461"/>
         <source>%1 = %1 | %2 (8 bit)</source>
         <oldsource>%1 = %1 | %2 (8 bits)</oldsource>
         <translation>%1 = %1 | %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5360"/>
+        <location filename="core/field/Opcode.cpp" line="5478"/>
         <source>%1 = %1 | %2 (16 bit)</source>
         <oldsource>%1 = %1 | %2 (16 bits)</oldsource>
         <translation>%1 = %1 | %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5377"/>
+        <location filename="core/field/Opcode.cpp" line="5495"/>
         <source>%1 = %1 ^ %2 (8 bit)</source>
         <oldsource>%1 = %1 ^ %2 (8 bits)</oldsource>
         <translation>%1 = %1 ^ %2 (8 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5394"/>
+        <location filename="core/field/Opcode.cpp" line="5512"/>
         <source>%1 = %1 ^ %2 (16 bit)</source>
         <oldsource>%1 = %1 ^ %2 (16 bits)</oldsource>
         <translation>%1 = %1 ^ %2 (16 bits)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5491"/>
+        <location filename="core/field/Opcode.cpp" line="5609"/>
         <source>%1 = %2 &amp; 0xFF (low byte)</source>
         <translation>%1 = %2 &amp; 0xFF (low byte)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5508"/>
+        <location filename="core/field/Opcode.cpp" line="5626"/>
         <source>%1 = (%2 &gt;&gt; 8) &amp; 0xFF (high byte)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5529"/>
+        <location filename="core/field/Opcode.cpp" line="5647"/>
         <source>%1 = (%2 &amp; 0xFF) | ((%3 &amp; 0xFF) &lt;&lt; 8)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5566"/>
+        <location filename="core/field/Opcode.cpp" line="5684"/>
         <source>SETX %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5587"/>
+        <location filename="core/field/Opcode.cpp" line="5705"/>
         <source>GETX %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5613"/>
+        <location filename="core/field/Opcode.cpp" line="5731"/>
         <source>Search the value %5 in the memory (bank=%1, start=%2+%3, end=%2+%4) and put the position in %6</source>
         <oldsource>Rechercher la valeur %5 dans la mémoire (bank=%1, début=%2+%3, fin=%2+%4) et mettre la position dans %6</oldsource>
         <translation>Rechercher la valeur %5 dans la mémoire (bank=%1, début=%2+%3, fin=%2+%4) et mettre la position dans %6</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5662"/>
+        <location filename="core/field/Opcode.cpp" line="5780"/>
         <source>Field model is playable and it is %1</source>
         <oldsource>L&apos;objet 3D est jouable et c&apos;est %1</oldsource>
         <translation>L&apos;objet 3D est jouable et c&apos;est %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5688"/>
+        <location filename="core/field/Opcode.cpp" line="5806"/>
         <source>This group is a field model (ID=%1)</source>
         <oldsource>Ce groupe est un objet 3D (id=%1)</oldsource>
         <translation>Ce groupe est un objet 3D (id=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5710"/>
+        <location filename="core/field/Opcode.cpp" line="5828"/>
         <source>Play loop animation #%1 of the field model (speed=%2)</source>
         <oldsource>Play animation #%1 of the field model (speed=%2)</oldsource>
         <translation>Joue l&apos;animation %1 de l&apos;objet 3D en boucle (vitesse=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5735"/>
-        <location filename="core/field/Opcode.cpp" line="6105"/>
+        <location filename="core/field/Opcode.cpp" line="5853"/>
+        <location filename="core/field/Opcode.cpp" line="6223"/>
         <source>Play animation #%1 of the field model and reset to previous state (speed=%2)</source>
         <oldsource>Joue l&apos;animation %1 de l&apos;objet 3D et retourne à l&apos;état précédent (vitesse=%2)</oldsource>
         <translation>Joue l&apos;animation %1 de l&apos;objet 3D et retourne à l&apos;état précédent (vitesse=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5785"/>
+        <location filename="core/field/Opcode.cpp" line="5903"/>
         <source>Place field Model (X=%1, Y=%2, Z=%3, triangle ID=%4)</source>
         <oldsource>Place l&apos;objet 3D (X=%1, Y=%2, Z=%3, triangle id=%4)</oldsource>
         <translation>Place l&apos;objet 3D (X=%1, Y=%2, Z=%3, triangle id=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5841"/>
+        <location filename="core/field/Opcode.cpp" line="5959"/>
         <source>Place field Model (X=%1, Y=%2, triangle ID=%4)</source>
         <oldsource>Place l&apos;objet 3D (X=%1, Y=%2, triangle id=%4)</oldsource>
         <translation>Place l&apos;objet 3D (X=%1, Y=%2, triangle id=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5892"/>
+        <location filename="core/field/Opcode.cpp" line="6010"/>
         <source>Place field Model (X=%1, Y=%2, Z=%3)</source>
         <oldsource>Place l&apos;objet 3D (X=%1, Y=%2, Z=%3)</oldsource>
         <translation>Place l&apos;objet 3D (X=%1, Y=%2, Z=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5942"/>
+        <location filename="core/field/Opcode.cpp" line="6060"/>
         <source>Move field Model (X=%1, Y=%2)</source>
         <oldsource>Déplace l&apos;objet 3D (X=%1, Y=%2)</oldsource>
         <translation>Déplace l&apos;objet 3D (X=%1, Y=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5977"/>
-        <location filename="core/field/Opcode.cpp" line="6071"/>
+        <location filename="core/field/Opcode.cpp" line="6095"/>
+        <location filename="core/field/Opcode.cpp" line="6189"/>
         <source>Place field Model without animation (X=%1, Y=%2)</source>
         <oldsource>Déplace l&apos;objet 3D sans animation (X=%1, Y=%2)</oldsource>
         <translation>Déplace l&apos;objet 3D sans animation (X=%1, Y=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6010"/>
+        <location filename="core/field/Opcode.cpp" line="6128"/>
         <source>Move field Model to the group %1</source>
         <oldsource>Déplace l&apos;objet 3D vers le groupe %1</oldsource>
         <translation>Déplace l&apos;objet 3D vers le groupe %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6034"/>
+        <location filename="core/field/Opcode.cpp" line="6152"/>
         <source>Rotation of the field model to group %1 (Speed=%3, Rotation=%2)</source>
         <oldsource>Rotation de l&apos;objet 3D vers le groupe %1 (vitesse=%3, sens de rotation=%2)</oldsource>
         <translation>Rotation de l&apos;objet 3D vers le groupe %1 (vitesse=%3, sens de rotation=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6130"/>
+        <location filename="core/field/Opcode.cpp" line="6248"/>
         <source>Play animation #%1 of the field model (speed=%2, type=1)</source>
         <translation>Joue l&apos;animation %1 de l&apos;objet 3D (vitesse=%2, type=1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6157"/>
-        <location filename="core/field/Opcode.cpp" line="6508"/>
+        <location filename="core/field/Opcode.cpp" line="6275"/>
+        <location filename="core/field/Opcode.cpp" line="6626"/>
         <source>Play partially the animation #%1 of the field model and reset to initial state (first frame=%2, last frame=%3, speed=%4)</source>
         <oldsource>Joue partiellement l&apos;animation %1 de l&apos;objet 3D et retourne à l&apos;état précédent (première img=%2, dernière img=%3, vitesse=%4)</oldsource>
         <translation>Joue partiellement l&apos;animation %1 de l&apos;objet 3D et retourne à l&apos;état précédent (première img=%2, dernière img=%3, vitesse=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6188"/>
-        <location filename="core/field/Opcode.cpp" line="6539"/>
+        <location filename="core/field/Opcode.cpp" line="6306"/>
+        <location filename="core/field/Opcode.cpp" line="6657"/>
         <source>Play partially the animation #%1 of the field model (first frame=%2, last frame=%3, speed=%4)</source>
         <oldsource>Joue partiellement l&apos;animation %1 de l&apos;objet 3D (première img=%2, dernière img=%3, vitesse=%4)</oldsource>
         <translation>Joue partiellement l&apos;animation %1 de l&apos;objet 3D (première img=%2, dernière img=%3, vitesse=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6247"/>
+        <location filename="core/field/Opcode.cpp" line="6365"/>
         <source>Set field model direction: %1</source>
         <oldsource>Mettre l&apos;objet 3D dans la direction : %1</oldsource>
         <translation>Mettre l&apos;objet 3D dans la direction : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6280"/>
+        <location filename="core/field/Opcode.cpp" line="6398"/>
         <source>Rotation (direction=%1, nbRevolution=%2, speed=%3, ?=%4)</source>
         <oldsource>Rotation (direction=%1, nbTours=%2, vitesse=%3, ?=%4)</oldsource>
         <translation>Rotation (direction=%1, nbTours=%2, vitesse=%3, ?=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6319"/>
+        <location filename="core/field/Opcode.cpp" line="6437"/>
         <source>Inversed rotation (direction=%1, nbRevolution=%2, speed=%3, ?=%4)</source>
         <oldsource>Rotation inversée (direction=%1, nbTours=%2, vitesse=%3, ?=%4)</oldsource>
         <translation>Rotation inversée (direction=%1, nbTours=%2, vitesse=%3, ?=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6354"/>
+        <location filename="core/field/Opcode.cpp" line="6472"/>
         <source>Direct the field model towards the group %1</source>
         <oldsource>Mettre l&apos;objet 3D en direction du groupe %1</oldsource>
         <translation>Mettre l&apos;objet 3D en direction du groupe %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6378"/>
+        <location filename="core/field/Opcode.cpp" line="6496"/>
         <source>Store direction of the group %1 in %2</source>
         <oldsource>Stocker dans %2 la direction du groupe %1</oldsource>
         <translation>Stocker dans %2 la direction du groupe %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6412"/>
+        <location filename="core/field/Opcode.cpp" line="6530"/>
         <source>Store position of the group %1 in %2 (X) and %3 (Y)</source>
         <oldsource>Stocker dans %2 et %3 la position X et Y du groupe %1</oldsource>
         <translation>Stocker dans %2 et %3 la position X et Y du groupe %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6449"/>
+        <location filename="core/field/Opcode.cpp" line="6567"/>
         <source>Store triangle ID of the group %1 in %2</source>
         <oldsource>Stocker dans %2 le triangle id du groupe %1</oldsource>
         <translation>Stocker dans %2 le triangle id du groupe %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6481"/>
+        <location filename="core/field/Opcode.cpp" line="6599"/>
         <source>Play animation #%1 of the field model (speed=%2, type=2)</source>
         <translation>Joue l&apos;animation %1 de l&apos;objet 3D (vitesse=%2, type=2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6568"/>
+        <location filename="core/field/Opcode.cpp" line="6686"/>
         <source>Set the field model animations speed: %1</source>
         <oldsource>Configurer la vitesse des animations de l&apos;objet 3D : %1</oldsource>
         <translation>Configurer la vitesse des animations de l&apos;objet 3D : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6597"/>
+        <location filename="core/field/Opcode.cpp" line="6715"/>
         <source>Control the group %1</source>
         <oldsource>Prendre le contrôle du groupe %1</oldsource>
         <translation>Prendre le contrôle du groupe %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6623"/>
+        <location filename="core/field/Opcode.cpp" line="6741"/>
         <source>Field model jump (X=%1, Y=%2, triangle ID=%3, Steps=%4)</source>
         <oldsource>Faire sauter un personnage (X=%1, Y=%2, triangle id=%3, hauteur=%4)</oldsource>
         <translation>Faire sauter un personnage (X=%1, Y=%2, triangle id=%3, hauteur=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6669"/>
+        <location filename="core/field/Opcode.cpp" line="6787"/>
         <source>Store position of the group %1 in %2 (X), %3 (Y), %4 (Z) and %5 (triangle ID)</source>
         <oldsource>Stocker la position du groupe %1 dans des variables (%2=X, %3=Y, %4=Z, %5=triangle id)</oldsource>
         <translation>Stocker la position du groupe %1 dans des variables (%2=X, %3=Y, %4=Z, %5=triangle id)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6720"/>
+        <location filename="core/field/Opcode.cpp" line="6838"/>
         <source>Climb a ladder with the animation #%6 (X=%1, Y=%2, Z=%3, triangle ID=%4, direction1=%5, direction2=%7, speed=%8)</source>
         <oldsource>Monter une échelle avec l&apos;animation %6 (X=%1, Y=%2, Z=%3, triangle id=%4, sens=%5, direction=%7, vitesse=%8)</oldsource>
         <translation>Monter une échelle avec l&apos;animation %6 (X=%1, Y=%2, Z=%3, triangle id=%4, sens=%5, direction=%7, vitesse=%8)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6774"/>
+        <location filename="core/field/Opcode.cpp" line="6892"/>
         <source>Offset Object (movement=%1, X=%2, Y=%3, Z=%4, speed=%5)</source>
         <oldsource>Offset Object (mouvement=%1, X=%2, Y=%3, Z=%4, vitesse=%5)</oldsource>
         <translation>Offset Object (mouvement=%1, X=%2, Y=%3, Z=%4, vitesse=%5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6857"/>
-        <location filename="core/field/Opcode.cpp" line="7357"/>
+        <location filename="core/field/Opcode.cpp" line="6975"/>
+        <location filename="core/field/Opcode.cpp" line="7475"/>
         <source>Set range of the contact circle for the field model: %1</source>
         <oldsource>Modifier la distance nécessaire pour toucher l&apos;objet 3D : %1</oldsource>
         <translation>Modifier la distance nécessaire pour toucher l&apos;objet 3D : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6949"/>
+        <location filename="core/field/Opcode.cpp" line="7067"/>
         <source>New party: %1 | %2 | %3</source>
         <oldsource>Nouvelle équipe : %1 | %2 | %3</oldsource>
         <translation>Nouvelle équipe : %1 | %2 | %3</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7000"/>
+        <location filename="core/field/Opcode.cpp" line="7118"/>
         <source>If %1 exists (%2)</source>
         <oldsource>Si %1 existe (%2)</oldsource>
         <translation>Si %1 existe (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7020"/>
+        <location filename="core/field/Opcode.cpp" line="7138"/>
         <source>%2 %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7044"/>
+        <location filename="core/field/Opcode.cpp" line="7162"/>
         <source>Locks %1 in PHS menu</source>
         <oldsource>Bloque %1 dans le menu PHS</oldsource>
         <translation>Bloque %1 dans le menu PHS</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7065"/>
+        <location filename="core/field/Opcode.cpp" line="7183"/>
         <source>Unlock %1 in PHS menu</source>
         <oldsource>Débloque %1 dans le menu PHS</oldsource>
         <translation>Débloque %1 dans le menu PHS</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7091"/>
+        <location filename="core/field/Opcode.cpp" line="7209"/>
         <source>Create line (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</source>
         <translation>Créer ligne (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</translation>
     </message>
@@ -4017,17 +4513,17 @@
         <translation type="vanished">Définit la zone (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7139"/>
+        <location filename="core/field/Opcode.cpp" line="7257"/>
         <source>%1 line</source>
         <translation>%1 la ligne</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7140"/>
+        <location filename="core/field/Opcode.cpp" line="7258"/>
         <source>Enable</source>
         <translation>Activer</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7140"/>
+        <location filename="core/field/Opcode.cpp" line="7258"/>
         <source>Disable</source>
         <translation>Désactiver</translation>
     </message>
@@ -4046,221 +4542,225 @@
         <translation type="vanished">Redimensionner la zone (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7240"/>
+        <location filename="core/field/Opcode.cpp" line="7358"/>
         <source>%4 = ((Sinus(%1) * %2) + %3) &gt;&gt; 12</source>
         <translation>%4 = ((Sinus(%1) * %2) + %3) &gt;&gt; 12</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7285"/>
+        <location filename="core/field/Opcode.cpp" line="7403"/>
         <source>%4 = ((Cosinus(%1) * %2) + %3) &gt;&gt; 12</source>
         <translation>%4 = ((Cosinus(%1) * %2) + %3) &gt;&gt; 12</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7401"/>
+        <location filename="core/field/Opcode.cpp" line="7519"/>
         <source>PMJMP2</source>
         <translation>PMJMP2</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7469"/>
+        <location filename="core/field/Opcode.cpp" line="7604"/>
         <source>%1 rotation</source>
         <translation>%1 rotation</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7492"/>
+        <location filename="core/field/Opcode.cpp" line="7627"/>
         <source>Play animation #%1 for &apos;%3&apos; (speed=%2)</source>
         <oldsource>Jouer animation No%1 pour &apos;%3&apos; (vitesse=%2)</oldsource>
         <translation>Jouer animation n°%1 pour &apos;%3&apos; (vitesse=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7545"/>
+        <location filename="core/field/Opcode.cpp" line="7680"/>
         <source>Multiply RGB(%6, %5, %4) on the colors in a palette (sourcePal=%1, targetPal=%2, first color=%3, color count=%7+1)</source>
         <oldsource>Multiplier RVB(%6, %5, %4) sur les couleurs d&apos;une palette (sourcePal=%1, ciblePal=%2, première couleur=%3, nombre de couleurs=%7+1)</oldsource>
         <translation>Multiplier RVB(%6, %5, %4) sur les couleurs d&apos;une palette (sourcePal=%1, ciblePal=%2, première couleur=%3, nombre de couleurs=%7+1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7631"/>
+        <location filename="core/field/Opcode.cpp" line="7766"/>
         <source>Hide the state #%2 of the background parameter #%1</source>
         <oldsource>Cacher l&apos;état n°%2 du paramètre No%1</oldsource>
         <translation>Cacher l&apos;état n°%2 du paramètre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7665"/>
+        <location filename="core/field/Opcode.cpp" line="7800"/>
         <source>Show next state of the background parameter #%1</source>
         <oldsource>Afficher l&apos;état suivant du paramètre No%1</oldsource>
         <translation>Afficher l&apos;état suivant du paramètre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7725"/>
+        <location filename="core/field/Opcode.cpp" line="7860"/>
         <source>Hide background parameter #%1</source>
         <oldsource>Cacher paramètre No%1</oldsource>
         <translation>Cacher paramètre n°%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7757"/>
+        <location filename="core/field/Opcode.cpp" line="7892"/>
         <source>Load the palette #%1 in the position %2 (color count=%3)</source>
         <oldsource>Charger la palette No%1 à la position %2 (nombre de couleurs=%3)</oldsource>
         <translation>Charger la palette n°%1 à la position %2 (nombre de couleurs=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7795"/>
+        <location filename="core/field/Opcode.cpp" line="7930"/>
         <source>Load the position %1 in the palette #%2 (color count=%3)</source>
         <oldsource>Charger la position %1 dans la palette n°%2 (nombre de couleurs=%3)</oldsource>
         <translation>Charger la position %1 dans la palette n°%2 (nombre de couleurs=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7833"/>
+        <location filename="core/field/Opcode.cpp" line="7968"/>
         <source>Copy palette (sourcePal=%1, targetPal=%2, color count=%3)</source>
         <oldsource>Copier palette (sourcePal=%1, ciblePal=%2, nombre de couleurs=%3)</oldsource>
         <translation>Copier palette (sourcePal=%1, ciblePal=%2, nombre de couleurs=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7872"/>
+        <location filename="core/field/Opcode.cpp" line="8007"/>
         <source>Copy partially palette (sourcePal=%1, targetPal=%2, first color=%3, color count=%4)</source>
         <oldsource>Copier un morceau de palette (sourcePal=%1, ciblePal=%2, première couleur=%3, nombre de couleurs=%4)</oldsource>
         <translation>Copier un morceau de palette (sourcePal=%1, ciblePal=%2, première couleur=%3, nombre de couleurs=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7917"/>
+        <location filename="core/field/Opcode.cpp" line="8052"/>
         <source>Add RGB(%5, %4, %3) on the colors in a palette (sourcePal=%1, targetPal=%2, color count=%6)</source>
         <oldsource>Additionner RVB(%5, %4, %3) sur les couleurs d&apos;une palette (sourcePal=%1, ciblePal=%2, nombre de couleurs=%6)</oldsource>
         <translation>Additionner RVB(%5, %4, %3) sur les couleurs d&apos;une palette (sourcePal=%1, ciblePal=%2, nombre de couleurs=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7970"/>
+        <location filename="core/field/Opcode.cpp" line="8105"/>
         <source>Multiply RGB(%5, %4, %3) on the colors in a palette (sourcePal=%1, targetPal=%2, color count=%6)</source>
         <oldsource>Multiplier RVB(%5, %4, %3) sur les couleurs d&apos;une palette (sourcePal=%1, ciblePal=%2, nombre de couleurs=%6)</oldsource>
         <translation>Multiplier RVB(%5, %4, %3) sur les couleurs d&apos;une palette (sourcePal=%1, ciblePal=%2, nombre de couleurs=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8020"/>
+        <location filename="core/field/Opcode.cpp" line="8155"/>
         <source>Load the palette #%1 in the position %2 (first color=%3, color count=%4)</source>
         <oldsource>Charger la palette No%1 à la position %2 (première couleur=%3, nombre de couleurs=%4)</oldsource>
         <translation>Charger la palette n°%1 à la position %2 (première couleur=%3, nombre de couleurs=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8051"/>
+        <location filename="core/field/Opcode.cpp" line="8186"/>
         <source>Load the position %1 in the palette #%2 (first color=%3, color count=%4)</source>
         <oldsource>Charger la position %1 dans la palette n°%2 (première couleur=%3, nombre de couleurs=%4)</oldsource>
         <translation>Charger la position %1 dans la palette n°%2 (première couleur=%3, nombre de couleurs=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8079"/>
+        <location filename="core/field/Opcode.cpp" line="8214"/>
         <source>CPPAL2 %1</source>
         <translation>CPPAL2 %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8100"/>
+        <location filename="core/field/Opcode.cpp" line="8235"/>
         <source>RTPAL2 %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8121"/>
+        <location filename="core/field/Opcode.cpp" line="8256"/>
         <source>ADPAL2 %1</source>
         <translation>ADPAL2 %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8165"/>
+        <location filename="core/field/Opcode.cpp" line="8300"/>
         <source>Play sound #%1 (position=%2/127)</source>
         <oldsource>Jouer son No%1 (position=%2/127)</oldsource>
         <translation>Jouer son n°%1 (position=%2/127)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8251"/>
+        <location filename="core/field/Opcode.cpp" line="8403"/>
         <source>MUSVT (music #%1)</source>
         <oldsource>MUSVT (musique No%1)</oldsource>
         <translation>MUSVT (musique n°%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8272"/>
+        <location filename="core/field/Opcode.cpp" line="8424"/>
         <source>MUSVM (music #%1)</source>
         <oldsource>MUSVM (musique No%1)</oldsource>
         <translation>MUSVM (musique n°%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8293"/>
+        <location filename="core/field/Opcode.cpp" line="8445"/>
         <source>%1 music</source>
         <oldsource>%1 musique</oldsource>
         <translation>%1 musique</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8337"/>
+        <location filename="core/field/Opcode.cpp" line="8489"/>
         <source>CHMPH: Save (unknown) in %1 and (unknown) in %2</source>
         <oldsource>CHMPH : Sauvegarder (inconnu) dans %1 et (inconnu) dans %2</oldsource>
         <translation>CHMPH : Sauvegarder (inconnu) dans %1 et (inconnu) dans %2</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8401"/>
+        <location filename="core/field/Opcode.cpp" line="8553"/>
         <source>Save Movie frame in %1</source>
         <oldsource>Stocker Movie frame dans %1</oldsource>
         <translation>Stocker Movie frame dans %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8430"/>
+        <location filename="core/field/Opcode.cpp" line="8582"/>
         <source>Camera Movie: %1</source>
         <oldsource>Camera Movie : %1</oldsource>
         <translation>Camera Movie : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8451"/>
+        <location filename="core/field/Opcode.cpp" line="8603"/>
         <source>FMUSC (?=%1)</source>
         <translation>FMUSC (?=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8478"/>
+        <location filename="core/field/Opcode.cpp" line="8630"/>
         <source>CMUSC (music #%1, unknown1=%2, unknown2=%3, unknown2=%4, unknown4=%5, unknown5=%6, unknown6=%7)</source>
         <oldsource>CMUSC (musique No%1, inconnu1=%2, inconnu2=%3, inconnu2=%4, inconnu4=%5, inconnu5=%6, inconnu6=%7)</oldsource>
         <translation>CMUSC (musique n°%1, inconnu1=%2, inconnu2=%3, inconnu2=%4, inconnu4=%5, inconnu5=%6, inconnu6=%7)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8513"/>
+        <location filename="core/field/Opcode.cpp" line="8665"/>
         <source>If music is currently playing set %1 to 1</source>
         <oldsource>Si la musique est jouée mettre %1 à 1</oldsource>
         <translation>Si la musique est jouée mettre %1 à 1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8536"/>
+        <location filename="core/field/Opcode.cpp" line="8688"/>
         <source>Game Over</source>
         <translation>Fin de partie</translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="839"/>
+        <location filename="core/field/Script.cpp" line="882"/>
         <source>Label %1 is declared several times.</source>
         <oldsource>Le label %1 est déclaré plusieurs fois.</oldsource>
         <translation>Le label %1 est déclaré plusieurs fois.</translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="863"/>
         <source>Label %1 is unreachable, please use a long jump.</source>
         <oldsource>Le label %1 est inaccessible, veuillez utiliser un saut long.</oldsource>
-        <translation>Le label %1 est inaccessible, veuillez utiliser un saut long.</translation>
+        <translation type="vanished">Le label %1 est inaccessible, veuillez utiliser un saut long.</translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="867"/>
+        <location filename="core/field/Script.cpp" line="907"/>
+        <source>Label %1 is unreachable, please bring this instruction closer.</source>
+        <translation>Le label %1 est inaccessible, rapprochez cette instruction du label.</translation>
+    </message>
+    <message>
+        <location filename="core/field/Script.cpp" line="912"/>
         <source>Label %1 is unreachable because your script exceeds 65535 bytes, please reduce the size of the script.</source>
         <oldsource>Le label %1 est inaccessible car votre script dépasse 65535 octets, veuillez réduire la taille du script.</oldsource>
         <translation>Le label %1 est inaccessible car votre script dépasse 65535 octets, veuillez réduire la taille du script.</translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="875"/>
+        <location filename="core/field/Script.cpp" line="920"/>
         <source>The label %1 is unreachable because it is located before the opcode.</source>
         <oldsource>Le label %1 est inaccessible car il se trouve avant la commande.</oldsource>
         <translation>Le label %1 est inaccessible car il se trouve avant la commande.</translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="885"/>
+        <location filename="core/field/Script.cpp" line="930"/>
         <source>Script too big, it should not exceed 65535 bytes. Actual size: %1.</source>
         <oldsource>Script trop grand, il ne doit pas dépasser les 65535 octets. Taille actuelle : %1.</oldsource>
         <translation>Script too big, it should not exceed 65535 bytes. Actual size: %1.</translation>
     </message>
     <message>
         <location filename="core/field/TutFileStandard.cpp" line="163"/>
-        <location filename="main.cpp" line="50"/>
+        <location filename="main.cpp" line="84"/>
         <source>Error</source>
         <oldsource>Erreur</oldsource>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="50"/>
+        <location filename="main.cpp" line="84"/>
         <source>The file &apos;var.cfg&apos; could not be loaded.
 Make sure it is valid or delete it.</source>
         <translation>Le fichier &apos;var.cfg&apos; n&apos;a pas pu être chargé.
@@ -4288,1090 +4788,1122 @@
 </translation>
     </message>
     <message>
-        <location filename="core/IsoArchiveFF7.cpp" line="447"/>
+        <location filename="core/IsoArchiveFF7.cpp" line="525"/>
         <source>Cannot update game binaries.</source>
         <translation>Impossible de mettre à jour les binaires du jeu.</translation>
     </message>
+    <message>
+        <location filename="core/field/Section1File.cpp" line="157"/>
+        <source>Map name</source>
+        <translation>Nom de l&apos;écran</translation>
+    </message>
+    <message>
+        <location filename="core/field/Section1File.cpp" line="158"/>
+        <source>Hello world!</source>
+        <translation>Salut tout le monde !</translation>
+    </message>
+    <message>
+        <location filename="core/Lgp.cpp" line="862"/>
+        <location filename="core/field/FieldArchiveIOPS.cpp" line="360"/>
+        <source>Cannot remove destination archive</source>
+        <translation>Impossible de supprimer l&apos;archive de destination</translation>
+    </message>
+    <message>
+        <location filename="core/Lgp.cpp" line="880"/>
+        <location filename="core/field/FieldArchiveIOPS.cpp" line="376"/>
+        <source>Cannot rename temporary file to destination path</source>
+        <translation>Impossible de renommer les fichiers temporaires vers le chemin de destination</translation>
+    </message>
 </context>
 <context>
     <name>ScriptEditor</name>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="51"/>
+        <location filename="widgets/ScriptEditor.cpp" line="53"/>
         <source>Script Editor%1</source>
         <oldsource>Éditeur de script%1</oldsource>
         <translation>Éditeur de script%1</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="51"/>
+        <location filename="widgets/ScriptEditor.cpp" line="53"/>
         <source> (init mode)</source>
         <translation> (init mode)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="55"/>
+        <location filename="widgets/ScriptEditor.cpp" line="57"/>
         <source>Control Structures</source>
         <oldsource>Structures de contrôle</oldsource>
         <translation>Structures de contrôle</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="57"/>
+        <location filename="widgets/ScriptEditor.cpp" line="59"/>
         <source>Windowing and messages</source>
         <oldsource>Fenêtres et messages</oldsource>
         <translation>Fenêtres et messages</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="58"/>
+        <location filename="widgets/ScriptEditor.cpp" line="60"/>
         <source>Party and inventory</source>
         <oldsource>Équipe et inventaire</oldsource>
         <translation>Équipe et inventaire</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="59"/>
+        <location filename="widgets/ScriptEditor.cpp" line="61"/>
         <source>Field Models and animations</source>
         <oldsource>Objets 3D et animations</oldsource>
         <translation>Objets 3D et animations</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="61"/>
+        <location filename="widgets/ScriptEditor.cpp" line="63"/>
         <source>Background</source>
         <translation>Décor</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="63"/>
+        <location filename="widgets/ScriptEditor.cpp" line="65"/>
         <source>Audio and video</source>
         <oldsource>Audio et vidéo</oldsource>
         <translation>Audio et vidéo</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="64"/>
+        <location filename="widgets/ScriptEditor.cpp" line="66"/>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="98"/>
+        <location filename="widgets/ScriptEditor.cpp" line="102"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="377"/>
+        <location filename="widgets/ScriptEditor.cpp" line="388"/>
         <source>Return</source>
         <oldsource>Retourner</oldsource>
         <translation>Retourner</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="378"/>
+        <location filename="widgets/ScriptEditor.cpp" line="389"/>
         <source>Return to</source>
         <oldsource>Retourner à</oldsource>
         <translation>Retourner à</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="380"/>
+        <location filename="widgets/ScriptEditor.cpp" line="391"/>
         <source>Execute a script</source>
         <oldsource>Exécuter un script</oldsource>
         <translation>Exécuter un script</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="382"/>
+        <location filename="widgets/ScriptEditor.cpp" line="393"/>
         <source>Execute a script from a party member</source>
         <oldsource>Exécuter un script d&apos;un équipier</oldsource>
         <translation>Exécuter un script d&apos;un équipier</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="385"/>
+        <location filename="widgets/ScriptEditor.cpp" line="396"/>
         <source>Label</source>
         <translation>Label</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="386"/>
+        <location filename="widgets/ScriptEditor.cpp" line="397"/>
         <source>Goto label</source>
         <oldsource>Aller au label</oldsource>
         <translation>Aller au label</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="392"/>
+        <location filename="widgets/ScriptEditor.cpp" line="403"/>
         <source>If character exsists</source>
         <oldsource>Si personnage existe</oldsource>
         <translation>Si personnage existe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="398"/>
+        <location filename="widgets/ScriptEditor.cpp" line="410"/>
         <source>Binary operation</source>
         <oldsource>Opération binaire</oldsource>
         <translation>Opération binaire</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="403"/>
+        <location filename="widgets/ScriptEditor.cpp" line="415"/>
         <source>Unary operation</source>
         <oldsource>Opération unaire</oldsource>
         <translation>Opération unaire</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="406"/>
+        <location filename="widgets/ScriptEditor.cpp" line="418"/>
         <source>Bitwise operation</source>
         <oldsource>Opération bit à bit</oldsource>
         <translation>Opération bit à bit</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="409"/>
+        <location filename="widgets/ScriptEditor.cpp" line="421"/>
         <source>Seed Random Generator</source>
         <translation>Seed Random Generator</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="411"/>
+        <location filename="widgets/ScriptEditor.cpp" line="423"/>
         <source>Sinus</source>
         <translation>Sinus</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="412"/>
+        <location filename="widgets/ScriptEditor.cpp" line="424"/>
         <source>Cosinus</source>
         <translation>Cosinus</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="431"/>
+        <location filename="widgets/ScriptEditor.cpp" line="443"/>
         <source>Ask Question</source>
         <oldsource>Poser une question</oldsource>
         <translation>Poser une question</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="434"/>
+        <location filename="widgets/ScriptEditor.cpp" line="446"/>
         <source>Enable/Disable menu</source>
         <oldsource>Activer/Désactiver menu</oldsource>
         <translation>Activer/Désactiver menu</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="439"/>
+        <location filename="widgets/ScriptEditor.cpp" line="451"/>
         <source>HP/MP Maximum (1)</source>
         <oldsource>HP/MP restaurés (1)</oldsource>
         <translation>HP/MP restaurés (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="440"/>
+        <location filename="widgets/ScriptEditor.cpp" line="452"/>
         <source>HP/MP Maximum (2)</source>
         <oldsource>HP/MP restaurés (2)</oldsource>
         <translation>HP/MP restaurés (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="441"/>
+        <location filename="widgets/ScriptEditor.cpp" line="453"/>
         <source>HP/MP Maximum with Status Clear</source>
         <oldsource>HP/MP/statut restaurés</oldsource>
         <translation>HP/MP/statut restaurés</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="442"/>
+        <location filename="widgets/ScriptEditor.cpp" line="454"/>
         <source>HP/MP Maximum (3)</source>
         <oldsource>HP/MP restaurés (3)</oldsource>
         <translation>HP/MP restaurés (3)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="454"/>
+        <location filename="widgets/ScriptEditor.cpp" line="466"/>
         <source>Add Materia</source>
         <oldsource>Ajouter Matéria</oldsource>
         <translation>Ajouter Matéria</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="455"/>
+        <location filename="widgets/ScriptEditor.cpp" line="467"/>
         <source>Remove Materia</source>
         <oldsource>Retirer Matéria</oldsource>
         <translation>Retirer Matéria</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="456"/>
+        <location filename="widgets/ScriptEditor.cpp" line="468"/>
         <source>Amount of Materia</source>
         <oldsource>Quantité de Matérias</oldsource>
         <translation>Quantité de Matérias</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="472"/>
+        <location filename="widgets/ScriptEditor.cpp" line="484"/>
         <source>Get Group Direction (Dir)</source>
         <oldsource>Obtenir la direction d&apos;un groupe (Dir)</oldsource>
         <translation>Obtenir la direction d&apos;un groupe (Dir)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="473"/>
+        <location filename="widgets/ScriptEditor.cpp" line="485"/>
         <source>Get Party Member Direction (Dir)</source>
         <oldsource>Obtenir la direction d&apos;un équipier (Dir)</oldsource>
         <translation>Obtenir la direction d&apos;un équipier (Dir)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="474"/>
+        <location filename="widgets/ScriptEditor.cpp" line="486"/>
         <source>Get Group Triangle ID (I)</source>
         <oldsource>Obtenir le triangle id d&apos;un groupe (I)</oldsource>
         <translation>Obtenir le triangle id d&apos;un groupe (I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="475"/>
+        <location filename="widgets/ScriptEditor.cpp" line="487"/>
         <source>Get Party Member Triangle ID (I)</source>
         <oldsource>Obtenir le triangle id d&apos;un équipier (I)</oldsource>
         <translation>Obtenir le triangle id d&apos;un équipier (I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="476"/>
+        <location filename="widgets/ScriptEditor.cpp" line="488"/>
         <source>Get Group coordinates (X,Y)</source>
         <oldsource>Obtenir les coordonnées d&apos;un groupe (X,Y)</oldsource>
         <translation>Obtenir les coordonnées d&apos;un groupe (X,Y)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="477"/>
+        <location filename="widgets/ScriptEditor.cpp" line="489"/>
         <source>Get Group coordinates (X,Y,Z,I)</source>
         <oldsource>Obtenir les coordonnées d&apos;un groupe (X,Y,Z,I)</oldsource>
         <translation>Obtenir les coordonnées d&apos;un groupe (X,Y,Z,I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="478"/>
+        <location filename="widgets/ScriptEditor.cpp" line="490"/>
         <source>Get Party coordinates (X,Y,Z,I)</source>
         <oldsource>Obtenir les coordonnées d&apos;un équipier (X,Y,Z,I)</oldsource>
         <translation>Obtenir les coordonnées d&apos;un équipier (X,Y,Z,I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="480"/>
+        <location filename="widgets/ScriptEditor.cpp" line="492"/>
         <source>Place (X,Y,Z)</source>
         <oldsource>Placer (X,Y,Z)</oldsource>
         <translation>Placer (X,Y,Z)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="481"/>
+        <location filename="widgets/ScriptEditor.cpp" line="493"/>
         <source>Place (X,Y,I)</source>
         <oldsource>Placer (X,Y,I)</oldsource>
         <translation>Placer (X,Y,I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="482"/>
+        <location filename="widgets/ScriptEditor.cpp" line="494"/>
         <source>Place (X,Y,Z,I)</source>
         <oldsource>Placer (X,Y,Z,I)</oldsource>
         <translation>Placer (X,Y,Z,I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="483"/>
+        <location filename="widgets/ScriptEditor.cpp" line="495"/>
         <source>Place (Dir)</source>
         <oldsource>Placer (Dir)</oldsource>
         <translation>Placer (Dir)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="486"/>
+        <location filename="widgets/ScriptEditor.cpp" line="498"/>
         <source>Move without animation</source>
         <oldsource>Déplacer sans animation</oldsource>
         <translation>Déplacer sans animation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="487"/>
+        <location filename="widgets/ScriptEditor.cpp" line="499"/>
         <source>Move without animation or rotation</source>
         <oldsource>Déplacer sans animation ni rotation</oldsource>
         <translation>Déplacer sans animation ni rotation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="492"/>
+        <location filename="widgets/ScriptEditor.cpp" line="504"/>
         <source>Direction to Group</source>
         <oldsource>Rotation vers un groupe</oldsource>
         <translation>Rotation vers un groupe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="494"/>
+        <location filename="widgets/ScriptEditor.cpp" line="506"/>
         <source>Inversed Turn</source>
         <oldsource>Rotation inversée</oldsource>
         <translation>Rotation inversée</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="495"/>
+        <location filename="widgets/ScriptEditor.cpp" line="507"/>
         <source>Direction (inversed) to Group</source>
         <oldsource>Rotation inversée vers un groupe</oldsource>
         <translation>Rotation inversée vers un groupe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="496"/>
+        <location filename="widgets/ScriptEditor.cpp" line="508"/>
         <source>Direction (inversed) to Party Member</source>
         <oldsource>Rotation inversée vers un équipier</oldsource>
         <translation>Rotation inversée vers un équipier</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="499"/>
+        <location filename="widgets/ScriptEditor.cpp" line="511"/>
         <source>Play animation (loop)</source>
         <oldsource>Jouer animation en boucle</oldsource>
         <translation>Jouer animation en boucle</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="500"/>
+        <location filename="widgets/ScriptEditor.cpp" line="512"/>
         <source>Play animation (1)</source>
         <oldsource>Jouer animation (1)</oldsource>
         <translation>Jouer animation (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="501"/>
+        <location filename="widgets/ScriptEditor.cpp" line="513"/>
         <source>Play animation (2)</source>
         <oldsource>Jouer animation (2)</oldsource>
         <translation>Jouer animation (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="502"/>
+        <location filename="widgets/ScriptEditor.cpp" line="514"/>
         <source>Play animation and return (1)</source>
         <oldsource>Jouer animation et revenir (1)</oldsource>
         <translation>Jouer animation et revenir (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="503"/>
+        <location filename="widgets/ScriptEditor.cpp" line="515"/>
         <source>Play animation and return (2)</source>
         <oldsource>Jouer animation et revenir (2)</oldsource>
         <translation>Jouer animation et revenir (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="504"/>
+        <location filename="widgets/ScriptEditor.cpp" line="516"/>
         <source>Play partial animation (1)</source>
         <oldsource>Jouer partiellement animation (1)</oldsource>
         <translation>Jouer partiellement animation (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="505"/>
+        <location filename="widgets/ScriptEditor.cpp" line="517"/>
         <source>Play partial animation (2)</source>
         <oldsource>Jouer partiellement animation (2)</oldsource>
         <translation>Jouer partiellement animation (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="506"/>
+        <location filename="widgets/ScriptEditor.cpp" line="518"/>
         <source>Play partial animation and return (1)</source>
         <oldsource>Jouer partiellement animation et revenir (1)</oldsource>
         <translation>Jouer partiellement animation et revenir (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="507"/>
+        <location filename="widgets/ScriptEditor.cpp" line="519"/>
         <source>Play partial animation and return (2)</source>
         <oldsource>Jouer partiellement animation et revenir (2)</oldsource>
         <translation>Jouer partiellement animation et revenir (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="508"/>
+        <location filename="widgets/ScriptEditor.cpp" line="520"/>
         <source>Play Stand/Walk/Run animation</source>
         <oldsource>Jouer animation Stand/Walk/Run</oldsource>
         <translation>Jouer animation Stand/Walk/Run</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="509"/>
+        <location filename="widgets/ScriptEditor.cpp" line="521"/>
         <source>Play jump animation</source>
         <oldsource>Jouer animation du saut</oldsource>
         <translation>Jouer animation du saut</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="56"/>
+        <location filename="widgets/ScriptEditor.cpp" line="58"/>
         <source>Mathematics</source>
         <translation>Opérations mathématiques</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="60"/>
+        <location filename="widgets/ScriptEditor.cpp" line="62"/>
         <source>Walkmesh and locations</source>
         <translation>Zones</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="62"/>
+        <location filename="widgets/ScriptEditor.cpp" line="64"/>
         <source>Fade and camera</source>
         <translation>Transitions et caméra</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="65"/>
+        <location filename="widgets/ScriptEditor.cpp" line="67"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="100"/>
+        <location filename="widgets/ScriptEditor.cpp" line="104"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="388"/>
+        <location filename="widgets/ScriptEditor.cpp" line="399"/>
         <source>If...then</source>
         <translation>Si...alors</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="390"/>
+        <location filename="widgets/ScriptEditor.cpp" line="401"/>
         <source>If key pressed</source>
         <translation>Si touche pressée</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="391"/>
+        <location filename="widgets/ScriptEditor.cpp" line="402"/>
         <source>If Party Member</source>
         <translation>Si personnage membre de l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="394"/>
+        <location filename="widgets/ScriptEditor.cpp" line="404"/>
+        <source>[DLPB&apos;s custom opcode] If Red XIII is named Nanaki</source>
+        <translation>[DLPB&apos;s custom opcode] Si Rouge XIII est nommé Nanaki</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditor.cpp" line="406"/>
         <source>Wait</source>
         <translation>Attendre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="395"/>
+        <location filename="widgets/ScriptEditor.cpp" line="407"/>
         <source>No Operation</source>
         <translation>Ne rien faire</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="410"/>
+        <location filename="widgets/ScriptEditor.cpp" line="422"/>
         <source>Two Byte from two one-byte</source>
         <translation>Créer un mot de deux octets</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="415"/>
+        <location filename="widgets/ScriptEditor.cpp" line="427"/>
         <source>Window creation</source>
         <translation>Créer une fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="416"/>
+        <location filename="widgets/ScriptEditor.cpp" line="428"/>
         <source>Resizes/Repositions a window</source>
         <translation>Redimensionner une fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="417"/>
+        <location filename="widgets/ScriptEditor.cpp" line="429"/>
         <source>Set line count in window</source>
         <translation>Modifier le nombre de lignes dans fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="418"/>
+        <location filename="widgets/ScriptEditor.cpp" line="430"/>
         <source>Move a window</source>
         <translation>Déplacer une fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="419"/>
+        <location filename="widgets/ScriptEditor.cpp" line="431"/>
         <source>Set window type</source>
         <translation>Modifier type de fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="420"/>
+        <location filename="widgets/ScriptEditor.cpp" line="432"/>
         <source>Reset a window</source>
         <translation>Remettre une fenêtre à zéro</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="421"/>
+        <location filename="widgets/ScriptEditor.cpp" line="433"/>
         <source>Close a window (1)</source>
         <translation>Fermer une fenêtre (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="422"/>
+        <location filename="widgets/ScriptEditor.cpp" line="434"/>
         <source>Close a window (2)</source>
         <translation>Fermer une fenêtre (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="424"/>
+        <location filename="widgets/ScriptEditor.cpp" line="436"/>
         <source>Numerical Display</source>
         <translation>Mettre un compteur dans fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="425"/>
-        <location filename="widgets/ScriptEditor.cpp" line="428"/>
+        <location filename="widgets/ScriptEditor.cpp" line="437"/>
+        <location filename="widgets/ScriptEditor.cpp" line="440"/>
         <source>Set window variable (16-bit)</source>
         <translation>Modifier variable dans fenêtre (16 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="426"/>
+        <location filename="widgets/ScriptEditor.cpp" line="438"/>
         <source>Countdown</source>
         <translation>Compte à rebours</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="427"/>
+        <location filename="widgets/ScriptEditor.cpp" line="439"/>
         <source>Set window variable (8-bit)</source>
         <translation>Modifier variable dans fenêtre (8 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="430"/>
+        <location filename="widgets/ScriptEditor.cpp" line="442"/>
         <source>Set window Text</source>
         <translation>Afficher texte</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="433"/>
+        <location filename="widgets/ScriptEditor.cpp" line="445"/>
         <source>Set map name</source>
         <translation>Modifier le nom du lieu</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="435"/>
+        <location filename="widgets/ScriptEditor.cpp" line="447"/>
         <source>Get window color</source>
         <translation>Obtenir la couleur d&apos;une fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="436"/>
+        <location filename="widgets/ScriptEditor.cpp" line="448"/>
         <source>Set window color</source>
         <translation>Changer la couleur d&apos;une fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="444"/>
+        <location filename="widgets/ScriptEditor.cpp" line="456"/>
         <source>Increase MP</source>
         <translation>Augmenter les MPs</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="445"/>
+        <location filename="widgets/ScriptEditor.cpp" line="457"/>
         <source>Decrease MP</source>
         <translation>Diminuer les MPs</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="446"/>
+        <location filename="widgets/ScriptEditor.cpp" line="458"/>
         <source>Increase HP</source>
         <translation>Augmenter les HPs</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="447"/>
+        <location filename="widgets/ScriptEditor.cpp" line="459"/>
         <source>Decrease HP</source>
         <translation>Diminuer les HPs</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="448"/>
+        <location filename="widgets/ScriptEditor.cpp" line="460"/>
         <source>Add gil</source>
         <translation>Ajouter des gils</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="449"/>
+        <location filename="widgets/ScriptEditor.cpp" line="461"/>
         <source>Remove gil</source>
         <translation>Retirer des gils</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="450"/>
+        <location filename="widgets/ScriptEditor.cpp" line="462"/>
         <source>Amount of gil</source>
         <translation>Quantité d&apos;argent</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="451"/>
+        <location filename="widgets/ScriptEditor.cpp" line="463"/>
         <source>Add Item</source>
         <translation>Ajouter objet</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="452"/>
+        <location filename="widgets/ScriptEditor.cpp" line="464"/>
         <source>Remove item</source>
         <translation>Retirer objet</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="453"/>
+        <location filename="widgets/ScriptEditor.cpp" line="465"/>
         <source>Amount of item</source>
         <translation>Quantité d&apos;objets</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="458"/>
+        <location filename="widgets/ScriptEditor.cpp" line="470"/>
         <source>Party Change</source>
         <translation>Nouvelle équipe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="459"/>
+        <location filename="widgets/ScriptEditor.cpp" line="471"/>
         <source>Add Character to the party</source>
         <translation>Ajouter un personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="460"/>
+        <location filename="widgets/ScriptEditor.cpp" line="472"/>
         <source>Remove Character from the party</source>
         <translation>Retirer un personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="461"/>
+        <location filename="widgets/ScriptEditor.cpp" line="473"/>
         <source>Save party</source>
         <translation>Sauvegarder l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="462"/>
+        <location filename="widgets/ScriptEditor.cpp" line="474"/>
         <source>Load party</source>
         <translation>Restaurer l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="463"/>
+        <location filename="widgets/ScriptEditor.cpp" line="475"/>
         <source>Create/Delete character</source>
         <translation>Créer/effacer personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="464"/>
+        <location filename="widgets/ScriptEditor.cpp" line="476"/>
         <source>Lock character</source>
         <translation>Bloquer personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="465"/>
+        <location filename="widgets/ScriptEditor.cpp" line="477"/>
         <source>Unlock character</source>
         <translation>Débloquer personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="468"/>
+        <location filename="widgets/ScriptEditor.cpp" line="480"/>
         <source>Set Field Model</source>
         <translation>Définir objet 3D</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="469"/>
+        <location filename="widgets/ScriptEditor.cpp" line="481"/>
         <source>Set character to Field Model</source>
         <translation>Affecter personnage à objet 3D</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="470"/>
+        <location filename="widgets/ScriptEditor.cpp" line="482"/>
         <source>Group control</source>
         <translation>Prendre le contrôle d&apos;un groupe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="485"/>
+        <location filename="widgets/ScriptEditor.cpp" line="497"/>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="488"/>
+        <location filename="widgets/ScriptEditor.cpp" line="500"/>
         <source>Move to Group</source>
         <translation>Déplacer vers un groupe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="489"/>
+        <location filename="widgets/ScriptEditor.cpp" line="501"/>
         <source>Move to Party Member</source>
         <translation>Déplacer vers un équipier</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="491"/>
+        <location filename="widgets/ScriptEditor.cpp" line="503"/>
         <source>Turn</source>
         <translation>Rotation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="493"/>
+        <location filename="widgets/ScriptEditor.cpp" line="505"/>
         <source>Direction to Party Member</source>
         <translation>Rotation vers un équipier</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="497"/>
+        <location filename="widgets/ScriptEditor.cpp" line="509"/>
         <source>Wait for Turn</source>
         <translation>Attendre fin rotation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="510"/>
+        <location filename="widgets/ScriptEditor.cpp" line="522"/>
         <source>Play climb animation</source>
         <translation>Jouer animation de l&apos;échelle</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="511"/>
+        <location filename="widgets/ScriptEditor.cpp" line="523"/>
         <source>Party field join</source>
         <translation>Rejoindre le leader</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="512"/>
+        <location filename="widgets/ScriptEditor.cpp" line="524"/>
         <source>Party field split</source>
         <translation>Séparer les membres de l&apos;équipe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="513"/>
+        <location filename="widgets/ScriptEditor.cpp" line="525"/>
         <source>Stop animation</source>
         <oldsource>Arrêter animation</oldsource>
         <translation>Arrêter animation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="514"/>
+        <location filename="widgets/ScriptEditor.cpp" line="526"/>
         <source>Wait for animation</source>
         <oldsource>Attendre fin animation</oldsource>
         <translation>Attendre fin animation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="516"/>
+        <location filename="widgets/ScriptEditor.cpp" line="528"/>
         <source>Character Graphics - Eye open/close</source>
         <oldsource>Filtre graphique - OEil ouvert/fermé</oldsource>
         <translation>Filtre graphique - OEil ouvert/fermé</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="517"/>
+        <location filename="widgets/ScriptEditor.cpp" line="529"/>
         <source>Character Graphics - Activate/Deactivate blending</source>
         <oldsource>Filtre graphique - Activer/Désactiver transparence</oldsource>
         <translation>Filtre graphique - Activer/Désactiver transparence</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="518"/>
+        <location filename="widgets/ScriptEditor.cpp" line="530"/>
         <source>Character Graphics - ??? - AMBNT</source>
         <oldsource>Filtre graphique - AMBNT</oldsource>
         <translation>Filtre graphique - ??? - AMBNT</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="519"/>
+        <location filename="widgets/ScriptEditor.cpp" line="531"/>
         <source>Character Graphics - ??? (1)</source>
         <oldsource>Filtre graphique - ??? (1)</oldsource>
         <translation>Filtre graphique - ??? (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="520"/>
+        <location filename="widgets/ScriptEditor.cpp" line="532"/>
         <source>Character Graphics - ??? (2)</source>
         <oldsource>Filtre graphique - ??? (2)</oldsource>
         <translation>Filtre graphique - ??? (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="521"/>
+        <location filename="widgets/ScriptEditor.cpp" line="533"/>
         <source>Character Graphics - ??? (3)</source>
         <oldsource>Filtre graphique - ??? (3)</oldsource>
         <translation>Filtre graphique - ??? (3)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="522"/>
+        <location filename="widgets/ScriptEditor.cpp" line="534"/>
         <source>Character Graphics - LIGHT</source>
         <oldsource>Filtre graphique - LIGHT</oldsource>
         <translation>Filtre graphique - LIGHT</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="523"/>
+        <location filename="widgets/ScriptEditor.cpp" line="535"/>
         <source>Character Graphics - ??? (4)</source>
         <oldsource>Filtre graphique - ??? (4)</oldsource>
         <translation>Filtre graphique - ??? (4)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="524"/>
+        <location filename="widgets/ScriptEditor.cpp" line="536"/>
         <source>Character Graphics - ??? (5)</source>
         <oldsource>Filtre graphique - ??? (5)</oldsource>
         <translation>Filtre graphique - ??? (5)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="525"/>
+        <location filename="widgets/ScriptEditor.cpp" line="537"/>
         <source>Character Graphics - ??? (6)</source>
         <oldsource>Filtre graphique - ??? (6)</oldsource>
         <translation>Filtre graphique - ??? (6)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="526"/>
+        <location filename="widgets/ScriptEditor.cpp" line="538"/>
         <source>Character Graphics - SBOBJ</source>
         <oldsource>Filtre graphique - SBOBJ</oldsource>
         <translation>Filtre graphique - SBOBJ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="527"/>
+        <location filename="widgets/ScriptEditor.cpp" line="539"/>
         <source>Character Graphics - ??? (7)</source>
         <oldsource>Filtre graphique - ??? (7)</oldsource>
         <translation>Filtre graphique - ??? (7)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="528"/>
+        <location filename="widgets/ScriptEditor.cpp" line="540"/>
         <source>Character Graphics - ??? (8)</source>
         <oldsource>Filtre graphique - ??? (8)</oldsource>
         <translation>Filtre graphique - ??? (8)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="529"/>
+        <location filename="widgets/ScriptEditor.cpp" line="541"/>
         <source>Character Graphics - SHINE</source>
         <oldsource>Filtre graphique - SHINE</oldsource>
         <translation>Filtre graphique - SHINE</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="530"/>
+        <location filename="widgets/ScriptEditor.cpp" line="542"/>
         <source>Character Graphics - RESET</source>
         <oldsource>Filtre graphique - RESET</oldsource>
         <translation>Filtre graphique - RESET</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="531"/>
+        <location filename="widgets/ScriptEditor.cpp" line="543"/>
         <source>Wait For Character Graphics</source>
         <oldsource>Attendre fin filtre graphique</oldsource>
         <translation>Attendre fin filtre graphique</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="533"/>
+        <location filename="widgets/ScriptEditor.cpp" line="545"/>
         <source>OFST</source>
         <translation>OFST</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="534"/>
+        <location filename="widgets/ScriptEditor.cpp" line="546"/>
         <source>OFSTW</source>
         <translation>OFSTW</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="536"/>
+        <location filename="widgets/ScriptEditor.cpp" line="548"/>
         <source>Movement Speed</source>
         <translation>Vitesse déplacements</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="538"/>
+        <location filename="widgets/ScriptEditor.cpp" line="550"/>
         <source>Hide/Display Field Model</source>
         <translation>Cacher/Afficher objet 3D</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="540"/>
+        <location filename="widgets/ScriptEditor.cpp" line="552"/>
         <source>Character Blink</source>
         <translation>Cligner des yeux</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="541"/>
+        <location filename="widgets/ScriptEditor.cpp" line="553"/>
         <source>Talk On/Off</source>
         <translation>Activer/désactiver parler</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="542"/>
+        <location filename="widgets/ScriptEditor.cpp" line="554"/>
         <source>Contact On/Off</source>
         <translatorcomment>\</translatorcomment>
         <translation>Activer/désactiver toucher</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="543"/>
+        <location filename="widgets/ScriptEditor.cpp" line="555"/>
         <source>Talk Range (8-bit)</source>
         <translation>Distance pour parler (8 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="544"/>
+        <location filename="widgets/ScriptEditor.cpp" line="556"/>
         <source>Contact range (8-bit)</source>
         <translation>Distance pour toucher (8 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="545"/>
+        <location filename="widgets/ScriptEditor.cpp" line="557"/>
         <source>Talk Range (16-bit)</source>
         <translation>Distance pour parler (16 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="546"/>
+        <location filename="widgets/ScriptEditor.cpp" line="558"/>
         <source>Contact range (16-bit)</source>
         <translation>Distance pour toucher (16 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="549"/>
+        <location filename="widgets/ScriptEditor.cpp" line="561"/>
         <source>Create line</source>
         <oldsource>Create location</oldsource>
         <translation>Créer ligne</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="550"/>
+        <location filename="widgets/ScriptEditor.cpp" line="562"/>
         <source>Set line</source>
         <oldsource>Set location</oldsource>
         <translation>Modifier ligne</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="551"/>
+        <location filename="widgets/ScriptEditor.cpp" line="563"/>
         <source>Line On/Off</source>
         <oldsource>Location On/Off</oldsource>
         <translation>Activer/Désactiver ligne</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="552"/>
+        <location filename="widgets/ScriptEditor.cpp" line="564"/>
         <source>Triangle On/Off</source>
         <translation>Activer/Désactiver triangle</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="557"/>
+        <location filename="widgets/ScriptEditor.cpp" line="569"/>
         <source>Move background Z layer</source>
         <translation>Déplacer une couche du décor (Z)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="559"/>
+        <location filename="widgets/ScriptEditor.cpp" line="571"/>
         <source>Show a background state</source>
         <translation>Afficher un état d&apos;un paramètre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="560"/>
+        <location filename="widgets/ScriptEditor.cpp" line="572"/>
         <source>Hide background state</source>
         <translation>Cacher un état d&apos;un paramètre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="561"/>
+        <location filename="widgets/ScriptEditor.cpp" line="573"/>
         <source>Show next background state</source>
         <translation>Afficher l&apos;état suivant d&apos;un paramètre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="562"/>
+        <location filename="widgets/ScriptEditor.cpp" line="574"/>
         <source>Show previous background state</source>
         <translation>Afficher l&apos;état précédent d&apos;un paramètre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="563"/>
+        <location filename="widgets/ScriptEditor.cpp" line="575"/>
         <source>Hide background parameters</source>
         <translation>Cacher un paramètre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="579"/>
+        <location filename="widgets/ScriptEditor.cpp" line="591"/>
         <source>Scroll to playable character</source>
         <translation>Centrer sur le personnage jouable</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="580"/>
+        <location filename="widgets/ScriptEditor.cpp" line="592"/>
         <source>Scroll to party member</source>
         <translation>Centrer sur personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="584"/>
+        <location filename="widgets/ScriptEditor.cpp" line="596"/>
         <source>Scroll (X,Y,Smooth)</source>
         <translation>Centrer (X,Y,Vitesse amortie)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="585"/>
+        <location filename="widgets/ScriptEditor.cpp" line="597"/>
         <source>Scroll (X,Y,Linear)</source>
         <translation>Centrer (X,Y,Vitesse linéaire)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="589"/>
+        <location filename="widgets/ScriptEditor.cpp" line="601"/>
         <source>Shake</source>
         <translation>Secouer l&apos;écran</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="590"/>
+        <location filename="widgets/ScriptEditor.cpp" line="602"/>
         <source>Wait for scroll</source>
         <translation>Attendre fin centrage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="599"/>
+        <location filename="widgets/ScriptEditor.cpp" line="611"/>
         <source>Alter sound (8-bit)</source>
         <translation>Modifier son (8 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="600"/>
+        <location filename="widgets/ScriptEditor.cpp" line="612"/>
         <source>Alter sound (16-bit)</source>
         <translation>Modifier son (16 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="605"/>
+        <location filename="widgets/ScriptEditor.cpp" line="617"/>
         <source>Music Unlock/Lock</source>
         <oldsource>Music On/Off</oldsource>
         <translation>Déverrouiller/Verrouiller musique</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="612"/>
+        <location filename="widgets/ScriptEditor.cpp" line="624"/>
         <source>Set next movie</source>
         <translation>Prochaine cinématique</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="613"/>
+        <location filename="widgets/ScriptEditor.cpp" line="625"/>
         <source>Play movie</source>
         <translation>Jouer la cinématique choisie</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="623"/>
+        <location filename="widgets/ScriptEditor.cpp" line="635"/>
         <source>Battle result load</source>
         <translation>Résultat du dernier combat</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="626"/>
+        <location filename="widgets/ScriptEditor.cpp" line="637"/>
+        <source>Change Map</source>
+        <translation>Changer d&apos;écran</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditor.cpp" line="638"/>
         <source>Last Map ID</source>
         <translation>ID de l&apos;écran précédent</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="627"/>
+        <location filename="widgets/ScriptEditor.cpp" line="639"/>
         <source>Start Battle</source>
         <translation>Combattre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="628"/>
+        <location filename="widgets/ScriptEditor.cpp" line="640"/>
         <source>Battle On/Off</source>
         <translation>Activer/désactiver les combats</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="631"/>
+        <location filename="widgets/ScriptEditor.cpp" line="643"/>
         <source>Map Jump On/Off</source>
         <translation>Activer/désactiver les changements d&apos;écran</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="632"/>
+        <location filename="widgets/ScriptEditor.cpp" line="644"/>
         <source>Character movability On/Off</source>
         <translation>Activer/Désactiver déplacements</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="633"/>
+        <location filename="widgets/ScriptEditor.cpp" line="645"/>
         <source>Preload field Map</source>
         <translation>Précharger un écran</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="537"/>
+        <location filename="widgets/ScriptEditor.cpp" line="549"/>
         <source>Animation Speed</source>
         <oldsource>Vitesse animations</oldsource>
         <translation>Vitesse animations</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="539"/>
+        <location filename="widgets/ScriptEditor.cpp" line="551"/>
         <source>Enable/Disable rotation</source>
         <oldsource>Activer/Désactiver rotation</oldsource>
         <translation>Activer/Désactiver rotation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="554"/>
+        <location filename="widgets/ScriptEditor.cpp" line="566"/>
         <source>SLIP</source>
         <translation>SLIP</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="558"/>
+        <location filename="widgets/ScriptEditor.cpp" line="570"/>
         <source>Animate background layer</source>
         <oldsource>Animer une couche du décor</oldsource>
         <translation>Animer une couche du décor</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="565"/>
+        <location filename="widgets/ScriptEditor.cpp" line="577"/>
         <source>Store Palette</source>
         <translation>Enregistrer palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="566"/>
+        <location filename="widgets/ScriptEditor.cpp" line="578"/>
         <source>Store Palette (S)</source>
         <translation>Enregistrer palette (S)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="567"/>
+        <location filename="widgets/ScriptEditor.cpp" line="579"/>
         <source>Load Palette</source>
         <translation>Charger palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="568"/>
+        <location filename="widgets/ScriptEditor.cpp" line="580"/>
         <source>Load Palette (S)</source>
         <translation>Charger palette (S)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="569"/>
+        <location filename="widgets/ScriptEditor.cpp" line="581"/>
         <source>Copy Palette</source>
         <translation>Copier palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="570"/>
+        <location filename="widgets/ScriptEditor.cpp" line="582"/>
         <source>Copy Palette (2)</source>
         <translation>Copier palette (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="571"/>
+        <location filename="widgets/ScriptEditor.cpp" line="583"/>
         <source>Partial Copy Palette</source>
         <translation>Copier partiellement palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="572"/>
+        <location filename="widgets/ScriptEditor.cpp" line="584"/>
         <source>Partial Copy Palette (2)</source>
         <translation>Copier partiellement palette (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="573"/>
+        <location filename="widgets/ScriptEditor.cpp" line="585"/>
         <source>Multiply Palette</source>
         <oldsource>Multiplier Palette</oldsource>
         <translation>Multiplier Palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="574"/>
+        <location filename="widgets/ScriptEditor.cpp" line="586"/>
         <source>Multiply Palette (2)</source>
         <oldsource>Multiplier Palette (2)</oldsource>
         <translation>Multiplier Palette (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="575"/>
+        <location filename="widgets/ScriptEditor.cpp" line="587"/>
         <source>Add Palette</source>
         <oldsource>Additionner Palette</oldsource>
         <translation>Additionner Palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="576"/>
+        <location filename="widgets/ScriptEditor.cpp" line="588"/>
         <source>Add Palette (2)</source>
         <oldsource>Additionner Palette (2)</oldsource>
         <translation>Additionner Palette (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="581"/>
+        <location filename="widgets/ScriptEditor.cpp" line="593"/>
         <source>Scroll to group</source>
         <oldsource>Centrer sur groupe</oldsource>
         <translation>Centrer sur groupe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="583"/>
+        <location filename="widgets/ScriptEditor.cpp" line="595"/>
         <source>Scroll (X,Y)</source>
         <oldsource>Centrer (X,Y)</oldsource>
         <translation>Centrer (X,Y)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="586"/>
+        <location filename="widgets/ScriptEditor.cpp" line="598"/>
         <source>SCRLO</source>
         <translation>SCRLO</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="587"/>
+        <location filename="widgets/ScriptEditor.cpp" line="599"/>
         <source>SCRLC</source>
         <translation>SCRLC</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="592"/>
+        <location filename="widgets/ScriptEditor.cpp" line="604"/>
         <source>VWOFT</source>
         <translation>VWOFT</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="593"/>
+        <location filename="widgets/ScriptEditor.cpp" line="605"/>
         <source>FADE</source>
         <translation>FADE</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="594"/>
+        <location filename="widgets/ScriptEditor.cpp" line="606"/>
         <source>FADEW</source>
         <translation>FADEW</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="595"/>
+        <location filename="widgets/ScriptEditor.cpp" line="607"/>
         <source>NFADE</source>
         <translation>NFADE</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="598"/>
+        <location filename="widgets/ScriptEditor.cpp" line="610"/>
         <source>Play sound</source>
         <oldsource>Jouer son</oldsource>
         <translation>Jouer son</translation>
@@ -5385,198 +5917,202 @@
         <translation type="vanished">AKAO2</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="602"/>
+        <location filename="widgets/ScriptEditor.cpp" line="614"/>
         <source>Play music</source>
         <oldsource>Jouer musique</oldsource>
         <translation>Jouer musique</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="603"/>
+        <location filename="widgets/ScriptEditor.cpp" line="615"/>
         <source>MUSVT</source>
         <translation>MUSVT</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="604"/>
+        <location filename="widgets/ScriptEditor.cpp" line="616"/>
         <source>MUSVM</source>
         <translation>MUSVM</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="606"/>
+        <location filename="widgets/ScriptEditor.cpp" line="618"/>
         <source>Battle music</source>
         <oldsource>Musique de combat</oldsource>
         <translation>Musique de combat</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="607"/>
+        <location filename="widgets/ScriptEditor.cpp" line="619"/>
         <source>CHMPH</source>
         <translation>CHMPH</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="608"/>
+        <location filename="widgets/ScriptEditor.cpp" line="620"/>
         <source>CHMST</source>
         <translation>CHMST</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="609"/>
+        <location filename="widgets/ScriptEditor.cpp" line="621"/>
         <source>FMUSC</source>
         <translation>FMUSC</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="610"/>
+        <location filename="widgets/ScriptEditor.cpp" line="622"/>
         <source>CMUSC</source>
         <translation>CMUSC</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="614"/>
+        <location filename="widgets/ScriptEditor.cpp" line="626"/>
         <source>MVIEF</source>
         <translation>MVIEF</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="615"/>
+        <location filename="widgets/ScriptEditor.cpp" line="627"/>
         <source>MVCAM</source>
         <translation>MVCAM</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="616"/>
+        <location filename="widgets/ScriptEditor.cpp" line="628"/>
         <source>BGMOVIE</source>
         <translation>BGMOVIE</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="619"/>
+        <location filename="widgets/ScriptEditor.cpp" line="631"/>
         <source>Play tutorial</source>
         <oldsource>Lancer un tutoriel</oldsource>
         <translation>Lancer un tutoriel</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="620"/>
+        <location filename="widgets/ScriptEditor.cpp" line="632"/>
         <source>Display a menu</source>
         <oldsource>Afficher menu</oldsource>
         <translation>Afficher menu</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="621"/>
+        <location filename="widgets/ScriptEditor.cpp" line="633"/>
         <source>Disc change screen</source>
         <oldsource>Changer de disque</oldsource>
         <translation>Changer de disque</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="622"/>
+        <location filename="widgets/ScriptEditor.cpp" line="634"/>
         <source>Minigame</source>
         <oldsource>Mini-jeu</oldsource>
         <translation>Mini-jeu</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="624"/>
+        <location filename="widgets/ScriptEditor.cpp" line="636"/>
         <source>Battle Table</source>
         <oldsource>Table de combat</oldsource>
         <translation>Table de combat</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="625"/>
         <source>Change Field</source>
         <oldsource>Changer d&apos;écran</oldsource>
-        <translation>Changer d&apos;écran</translation>
+        <translation type="vanished">Changer d&apos;écran</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="629"/>
+        <location filename="widgets/ScriptEditor.cpp" line="641"/>
         <source>Battle mode</source>
         <oldsource>Mode de combat</oldsource>
         <translation>Mode de combat</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="630"/>
+        <location filename="widgets/ScriptEditor.cpp" line="642"/>
         <source>Battle mode (2)</source>
         <oldsource>Mode de combat (2)</oldsource>
         <translation>Mode de combat (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="634"/>
+        <location filename="widgets/ScriptEditor.cpp" line="646"/>
         <source>PMJMP2</source>
         <translation>PMJMP2</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="635"/>
+        <location filename="widgets/ScriptEditor.cpp" line="647"/>
         <source>Game Over</source>
         <translation>Fin de partie</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="636"/>
+        <location filename="widgets/ScriptEditor.cpp" line="648"/>
+        <source>[DLPB&apos;s custom opcode] Write/Read to entire Savemap</source>
+        <translation>[DLPB&apos;s custom opcode] Écrire/Lire vers la savemap</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditor.cpp" line="649"/>
         <source>SPECIAL - Cursor On/Off</source>
         <oldsource>SPECIAL - Activer/Désactiver curseur</oldsource>
         <translation>SPECIAL - Curseur Affiché/Caché</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="637"/>
+        <location filename="widgets/ScriptEditor.cpp" line="650"/>
         <source>SPECIAL - PNAME</source>
         <translation>SPECIAL - PNAME</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="638"/>
+        <location filename="widgets/ScriptEditor.cpp" line="651"/>
         <source>SPECIAL - Game Speed</source>
         <oldsource>SPECIAL - Vitesse du jeu</oldsource>
         <translation>SPECIAL - Vitesse du jeu</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="639"/>
+        <location filename="widgets/ScriptEditor.cpp" line="652"/>
         <source>SPECIAL - Messages Speed</source>
         <oldsource>SPECIAL - Vitesse des message</oldsource>
         <translation>SPECIAL - Vitesse des message</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="640"/>
+        <location filename="widgets/ScriptEditor.cpp" line="653"/>
         <source>SPECIAL - Full Materia</source>
         <translation>SPECIAL - Toutes les matérias</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="641"/>
+        <location filename="widgets/ScriptEditor.cpp" line="654"/>
         <source>SPECIAL - Full Item</source>
         <translation>SPECIAL - Tous les objets</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="642"/>
+        <location filename="widgets/ScriptEditor.cpp" line="655"/>
         <source>SPECIAL - Battle On/Off</source>
         <oldsource>SPECIAL - Activer/Désactiver combats</oldsource>
         <translation>SPECIAL - Activer/Désactiver combats</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="643"/>
+        <location filename="widgets/ScriptEditor.cpp" line="656"/>
         <source>SPECIAL - Character movability On/Off</source>
         <oldsource>SPECIAL - Activer/Désactiver mouvements</oldsource>
         <translation>SPECIAL - Activer/Désactiver mouvements</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="644"/>
+        <location filename="widgets/ScriptEditor.cpp" line="657"/>
         <source>SPECIAL - Rename character</source>
         <oldsource>SPECIAL - Renommer personnage</oldsource>
         <translation>SPECIAL - Renommer personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="645"/>
+        <location filename="widgets/ScriptEditor.cpp" line="658"/>
         <source>SPECIAL - Clear Game</source>
         <translation>SPECIAL - Remettre à zéro le jeu</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="646"/>
+        <location filename="widgets/ScriptEditor.cpp" line="659"/>
         <source>SPECIAL - Clear Items</source>
         <translation>SPECIAL - Supprimertous  les objets</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="649"/>
+        <location filename="widgets/ScriptEditor.cpp" line="662"/>
         <source>MPDSP</source>
         <translation>MPDSP</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="650"/>
+        <location filename="widgets/ScriptEditor.cpp" line="663"/>
         <source>SETX</source>
         <translation>SETX</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="651"/>
+        <location filename="widgets/ScriptEditor.cpp" line="664"/>
         <source>GETX</source>
         <translation>GETX</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="652"/>
+        <location filename="widgets/ScriptEditor.cpp" line="665"/>
         <source>SEARCHX</source>
         <translation>SEARCHX</translation>
     </message>
@@ -5704,6 +6240,59 @@
     </message>
 </context>
 <context>
+    <name>ScriptEditorDLPBSavemap</name>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="39"/>
+        <source>8 bit</source>
+        <translation>8 bits</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="40"/>
+        <source>16 bit</source>
+        <translation>16 bits</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="41"/>
+        <source>24 bit</source>
+        <translation>24 bits</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="42"/>
+        <source>32 bit</source>
+        <translation>32 bits</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="44"/>
+        <source>From is a pointer</source>
+        <translation>&quot;De&quot; est un pointeur</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="45"/>
+        <source>To is a pointer</source>
+        <translation>&quot;Vers&quot; est un pointeur</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="48"/>
+        <source>From</source>
+        <translation>De</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="50"/>
+        <source>To</source>
+        <translation>Vers</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="52"/>
+        <source>Abs Value</source>
+        <translation>Valeur absolue</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="54"/>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+</context>
+<context>
     <name>ScriptEditorExecCharPage</name>
     <message>
         <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="226"/>
@@ -5796,151 +6385,151 @@
 <context>
     <name>ScriptEditorGenericList</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="593"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="599"/>
         <source>Long</source>
         <oldsource>Entier long</oldsource>
         <translation>Entier long</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="594"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="600"/>
         <source>Signed long</source>
         <oldsource>Entier long signé</oldsource>
         <translation>Entier long signé</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="595"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="601"/>
         <source>X coordinate</source>
         <oldsource>Coordonnée X</oldsource>
         <translation>Coordonnée X</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="596"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="602"/>
         <source>Y coordinate</source>
         <oldsource>Coordonnée Y</oldsource>
         <translation>Coordonnée Y</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="597"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="603"/>
         <source>Z coordinate</source>
         <oldsource>Coordonnée Z</oldsource>
         <translation>Coordonnée Z</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="599"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="605"/>
         <source>Tutorial</source>
         <oldsource>Tutoriel</oldsource>
         <translation>Tutoriel</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="601"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="607"/>
         <source>Disc</source>
         <oldsource>Disque</oldsource>
         <translation>Disque</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="602"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="608"/>
         <source>Minigame</source>
         <oldsource>Mini-jeu</oldsource>
         <translation>Mini-jeu</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="605"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="611"/>
         <source>Speed (16-bit)</source>
         <oldsource>Vitesse (16 bits)</oldsource>
         <translation>Vitesse (16 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="606"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="612"/>
         <source>Direction</source>
         <translation>Direction</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="607"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="613"/>
         <source>Triangle</source>
         <translation>Triangle</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="608"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="614"/>
         <source>Group</source>
         <oldsource>Groupe</oldsource>
         <translation>Groupe</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="609"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="615"/>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="611"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="617"/>
         <source>Bank</source>
         <translation>Bank</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="612"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="618"/>
         <source>Address</source>
         <oldsource>Adresse</oldsource>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="613"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="619"/>
         <source>Priority</source>
         <oldsource>Priorité</oldsource>
         <translation>Priorité</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="614"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="620"/>
         <source>Flag</source>
         <translation>Flag</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="617"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="623"/>
         <source>Operator</source>
         <oldsource>Opérateur</oldsource>
         <translation>Opérateur</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="618"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="624"/>
         <source>Boolean</source>
         <oldsource>Booléen</oldsource>
         <translation>Booléen</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="620"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="626"/>
         <source>Parameter</source>
         <oldsource>Paramètre</oldsource>
         <translation>Paramètre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="621"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="627"/>
         <source>State</source>
         <oldsource>État</oldsource>
         <translation>État</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="625"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="631"/>
         <source>Variable</source>
         <translation>Variable</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="627"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="633"/>
         <source>Rotation</source>
         <oldsource>Sens de rotation</oldsource>
         <translation>Sens de rotation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="628"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="634"/>
         <source>Display Type</source>
         <oldsource>Type d&apos;affichage</oldsource>
         <translation>Type d&apos;affichage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="629"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="635"/>
         <source>Text</source>
         <oldsource>Texte</oldsource>
         <translation>Texte</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="630"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="636"/>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
@@ -5961,128 +6550,133 @@
     </message>
     <message>
         <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="598"/>
+        <source>Double long</source>
+        <translation>Entier double long</translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="604"/>
         <source>Map</source>
         <translation>Écran</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="600"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="606"/>
         <source>Character</source>
         <translation>Personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="603"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="609"/>
         <source>Short</source>
         <translation>Entier court</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="604"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="610"/>
         <source>Speed (8-bit)</source>
         <translation>Vitesse (8 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="610"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="616"/>
         <source>Team member</source>
         <translation>Équipier</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="615"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="621"/>
         <source>Jump (short)</source>
         <translation>Saut court</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="616"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="622"/>
         <source>Jump (long)</source>
         <oldsource>Jumb (long)</oldsource>
         <translation>Saut long</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="619"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="625"/>
         <source>Layer</source>
         <translation>Couche</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="622"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="628"/>
         <source>Window</source>
         <translation>Fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="623"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="629"/>
         <source>Width</source>
         <translation>Largeur</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="624"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="630"/>
         <source>Height</source>
         <translation>Hauteur</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="626"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="632"/>
         <source>Key(s)</source>
         <translation>Touche(s)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="631"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="637"/>
         <source>Window Type</source>
         <translation>Type de fenêtre</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="632"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="638"/>
         <source>Item</source>
         <translation>Objet</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="633"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="639"/>
         <source>Materia</source>
         <oldsource>Matéria</oldsource>
         <translation>Matéria</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="634"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="640"/>
         <source>Quantity</source>
         <oldsource>Quantité</oldsource>
         <translation>Quantité</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="635"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="641"/>
         <source>Color</source>
         <oldsource>Couleur</oldsource>
         <translation>Couleur</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="636"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="642"/>
         <source>Animation</source>
         <translation>Animation</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="637"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="643"/>
         <source>Music</source>
         <oldsource>Musique</oldsource>
         <translation>Musique</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="638"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="644"/>
         <source>Sound</source>
         <oldsource>Son</oldsource>
         <translation>Son</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="639"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="645"/>
         <source>Video</source>
         <oldsource>Vidéo</oldsource>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="640"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="646"/>
         <source>Label</source>
         <translation>Label</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="641"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="647"/>
         <source>Sound operation</source>
         <translation>Opération sur le son</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="643"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="649"/>
         <source>???</source>
         <translation>???</translation>
     </message>
@@ -6090,33 +6684,33 @@
 <context>
     <name>ScriptEditorIfKeyPage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="830"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="877"/>
         <source>Key pressed</source>
         <oldsource>Touche pressée</oldsource>
         <translation>Touche pressée</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="805"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="852"/>
         <source>Keys</source>
         <translation>Touches</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="831"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="878"/>
         <source>Key pressed once</source>
         <translation>Touche pressée une fois</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="832"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="879"/>
         <source>Key released once</source>
         <translation>Touche lâchée une fois</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="834"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="881"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="836"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="883"/>
         <source>Label</source>
         <translation>Label</translation>
     </message>
@@ -6124,71 +6718,79 @@
 <context>
     <name>ScriptEditorIfPage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="560"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="607"/>
         <source>16-bit signed</source>
         <oldsource>Sur 16 bits signés</oldsource>
         <translation>Sur 16 bits signés</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="566"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="613"/>
         <source>Short (8-bit)</source>
         <oldsource>Court (8 bits)</oldsource>
         <translation>Court (8 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="567"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="614"/>
         <source>Long (16-bit)</source>
         <oldsource>Long (16 bits)</oldsource>
         <translation>Long (16 bits)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="559"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="606"/>
         <source>8-bit unsigned</source>
         <translation>Sur 8 bits non signés</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="561"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="608"/>
         <source>16-bit unsigned</source>
         <translation>Sur 16 bits non signés</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="570"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="617"/>
         <source>Test to be performed</source>
         <translation>Test à effectuer</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="574"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="621"/>
         <source>Compare type</source>
         <oldsource>Type de comparaison</oldsource>
         <translation>Type de comparaison</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="576"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="623"/>
         <source>Label</source>
         <translation>Label</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="578"/>
-        <source>Jump type</source>
-        <oldsource>Type de saut</oldsource>
-        <translation>Type de saut</translation>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="625"/>
+        <source>Jump type (expert)</source>
+        <oldsource>Jump type</oldsource>
+        <translation>Type de saut (expert)</translation>
     </message>
 </context>
 <context>
     <name>ScriptEditorIfQPage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="943"/>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="944"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="990"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="991"/>
         <source>(Empty)</source>
         <translation>(Vide)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="949"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="996"/>
         <source>Character</source>
         <translation>Personnage</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="951"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="998"/>
+        <source>Label</source>
+        <translation>Label</translation>
+    </message>
+</context>
+<context>
+    <name>ScriptEditorJumpNanakiPage</name>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="554"/>
         <source>Label</source>
         <translation>Label</translation>
     </message>
@@ -6214,8 +6816,12 @@
     </message>
     <message>
         <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="429"/>
+        <source>Type (expert)</source>
+        <translation>Type (expert)</translation>
+    </message>
+    <message>
         <source>Type</source>
-        <translation>Type</translation>
+        <translation type="vanished">Type</translation>
     </message>
 </context>
 <context>
@@ -6243,19 +6849,19 @@
 <context>
     <name>ScriptEditorMoviePage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="18"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="35"/>
         <source>Disc</source>
         <oldsource>Disque</oldsource>
         <translation>Disque</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="20"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="37"/>
         <source>Video</source>
         <oldsource>Vidéo</oldsource>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="32"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="49"/>
         <source>Disc %1</source>
         <oldsource>Disque %1</oldsource>
         <translation>Disque %1</translation>
@@ -6323,7 +6929,7 @@
 <context>
     <name>ScriptEditorWaitPage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="1005"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="1052"/>
         <source>Images</source>
         <translation>Images</translation>
     </message>
@@ -6458,7 +7064,7 @@
 <context>
     <name>ScriptManager</name>
     <message>
-        <location filename="widgets/ScriptManager.cpp" line="170"/>
+        <location filename="widgets/ScriptManager.cpp" line="183"/>
         <source>Error on line %1 : %2</source>
         <oldsource>Erreur ligne %1 : %2</oldsource>
         <translation>Erreur ligne %1 : %2</translation>
@@ -6495,41 +7101,41 @@
     </message>
     <message>
         <location filename="widgets/Search.cpp" line="122"/>
-        <location filename="widgets/Search.cpp" line="280"/>
+        <location filename="widgets/Search.cpp" line="285"/>
         <source>Regular expression</source>
         <oldsource>Utiliser les expressions régulières</oldsource>
         <translation>Utiliser les expressions régulières</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="147"/>
+        <location filename="widgets/Search.cpp" line="151"/>
         <source>Var</source>
         <translation>Var</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="159"/>
-        <location filename="widgets/Search.cpp" line="418"/>
+        <location filename="widgets/Search.cpp" line="163"/>
+        <location filename="widgets/Search.cpp" line="428"/>
         <source>Value</source>
         <oldsource>Valeur</oldsource>
         <translation>Valeur</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="163"/>
+        <location filename="widgets/Search.cpp" line="167"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="164"/>
+        <location filename="widgets/Search.cpp" line="168"/>
         <source>Bit test</source>
         <oldsource>Test bit</oldsource>
         <translation>Test bit</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="194"/>
+        <location filename="widgets/Search.cpp" line="198"/>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="196"/>
+        <location filename="widgets/Search.cpp" line="200"/>
         <source>Group</source>
         <oldsource>Groupe</oldsource>
         <translation>Groupe</translation>
@@ -6537,7 +7143,7 @@
     <message>
         <location filename="widgets/Search.cpp" line="30"/>
         <location filename="widgets/Search.cpp" line="119"/>
-        <location filename="widgets/Search.cpp" line="270"/>
+        <location filename="widgets/Search.cpp" line="275"/>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
@@ -6568,169 +7174,169 @@
     </message>
     <message>
         <location filename="widgets/Search.cpp" line="121"/>
-        <location filename="widgets/Search.cpp" line="279"/>
+        <location filename="widgets/Search.cpp" line="284"/>
         <source>Match case</source>
         <translation>Sensible à la casse</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="160"/>
+        <location filename="widgets/Search.cpp" line="164"/>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="161"/>
+        <location filename="widgets/Search.cpp" line="165"/>
         <source>Assignment</source>
         <translation>Affectation</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="162"/>
+        <location filename="widgets/Search.cpp" line="166"/>
         <source>Bit Assignment</source>
         <translation>Affectation Bit</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="165"/>
+        <location filename="widgets/Search.cpp" line="169"/>
         <source>Assignment ≠</source>
         <translation>Affectation ≠</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="166"/>
+        <location filename="widgets/Search.cpp" line="170"/>
         <source>Assignment &lt;</source>
         <translation>Affectation &lt;</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="167"/>
+        <location filename="widgets/Search.cpp" line="171"/>
         <source>Assignment ≤</source>
         <translation>Affectation ≤</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="168"/>
+        <location filename="widgets/Search.cpp" line="172"/>
         <source>Assignment &gt;</source>
         <translation>Affectation &gt;</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="169"/>
+        <location filename="widgets/Search.cpp" line="173"/>
         <source>Assignment ≥</source>
         <translation>Affectation ≥</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="215"/>
-        <location filename="widgets/Search.cpp" line="283"/>
+        <location filename="widgets/Search.cpp" line="219"/>
+        <location filename="widgets/Search.cpp" line="288"/>
         <source>Scope</source>
         <translation>Contexte</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="216"/>
-        <location filename="widgets/Search.cpp" line="284"/>
+        <location filename="widgets/Search.cpp" line="220"/>
+        <location filename="widgets/Search.cpp" line="289"/>
         <source>All fields</source>
         <translation>Sur tous les écrans</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="217"/>
-        <location filename="widgets/Search.cpp" line="285"/>
+        <location filename="widgets/Search.cpp" line="221"/>
+        <location filename="widgets/Search.cpp" line="290"/>
         <source>Current field</source>
         <translation>Uniquement l&apos;écran courant</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="218"/>
+        <location filename="widgets/Search.cpp" line="222"/>
         <source>Current group script</source>
         <oldsource>Uniquement le groupe courant</oldsource>
         <translation>Uniquement le groupe courant</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="219"/>
+        <location filename="widgets/Search.cpp" line="223"/>
         <source>Current script</source>
         <oldsource>Uniquement le script courant</oldsource>
         <translation>Uniquement le script courant</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="275"/>
-        <location filename="widgets/Search.cpp" line="276"/>
+        <location filename="widgets/Search.cpp" line="280"/>
+        <location filename="widgets/Search.cpp" line="281"/>
         <source>Replace</source>
         <oldsource>Remplacer</oldsource>
         <translation>Remplacer</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="277"/>
+        <location filename="widgets/Search.cpp" line="282"/>
         <source>Replace all</source>
         <oldsource>Remplacer tout</oldsource>
         <translation>Remplacer tout</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="286"/>
+        <location filename="widgets/Search.cpp" line="291"/>
         <source>Current text</source>
         <translation>Uniquement le texte courant</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="455"/>
+        <location filename="widgets/Search.cpp" line="489"/>
         <source>Last field</source>
         <translation>Dernier écran</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="458"/>
+        <location filename="widgets/Search.cpp" line="492"/>
         <source>Last opcode</source>
         <translation>Dernière instruction</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="467"/>
+        <location filename="widgets/Search.cpp" line="501"/>
         <source>First field</source>
         <translation>Premier écran</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="470"/>
+        <location filename="widgets/Search.cpp" line="504"/>
         <source>First opcode</source>
         <translation>Première instruction</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="529"/>
+        <location filename="widgets/Search.cpp" line="570"/>
         <source>%1,
 continued from top.</source>
         <translation>%1,
 poursuite au début.</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="677"/>
+        <location filename="widgets/Search.cpp" line="688"/>
         <source>%1,
 chase at the end.</source>
         <translation>%1,
 poursuite à la fin.</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="418"/>
+        <location filename="widgets/Search.cpp" line="428"/>
         <source>Position</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="456"/>
+        <location filename="widgets/Search.cpp" line="490"/>
         <source>Last group</source>
         <oldsource>Dernier groupe</oldsource>
         <translation>Dernier groupe</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="457"/>
+        <location filename="widgets/Search.cpp" line="491"/>
         <source>Last script</source>
         <oldsource>Dernier script</oldsource>
         <translation>Dernier script</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="459"/>
+        <location filename="widgets/Search.cpp" line="493"/>
         <source>Last text</source>
         <oldsource>Dernier texte</oldsource>
         <translation>Dernier texte</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="468"/>
+        <location filename="widgets/Search.cpp" line="502"/>
         <source>First group</source>
         <oldsource>Premier groupe</oldsource>
         <translation>Premier groupe</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="469"/>
+        <location filename="widgets/Search.cpp" line="503"/>
         <source>First script</source>
         <oldsource>Premier script</oldsource>
         <translation>Premier script</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="471"/>
+        <location filename="widgets/Search.cpp" line="505"/>
         <source>First text</source>
         <oldsource>Premier texte</oldsource>
         <translation>Premier texte</translation>
@@ -6776,6 +7382,11 @@
         <oldsource>Texte n°</oldsource>
         <translation>Texte n°</translation>
     </message>
+    <message>
+        <location filename="widgets/SearchAll.cpp" line="56"/>
+        <source>Text</source>
+        <translation>Texte</translation>
+    </message>
 </context>
 <context>
     <name>SpinBoxDelegate</name>
@@ -6794,213 +7405,219 @@
 <context>
     <name>TextManager</name>
     <message>
-        <location filename="widgets/TextManager.cpp" line="28"/>
+        <location filename="widgets/TextManager.cpp" line="31"/>
         <source>Texts</source>
         <oldsource>Textes</oldsource>
         <translation>Textes</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="34"/>
+        <location filename="widgets/TextManager.cpp" line="37"/>
         <source>Add text</source>
         <oldsource>Ajouter texte</oldsource>
         <translation>Ajouter texte</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="60"/>
+        <location filename="widgets/TextManager.cpp" line="63"/>
         <source>Member 1</source>
         <oldsource>Membre 1</oldsource>
         <translation>Membre 1</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="62"/>
+        <location filename="widgets/TextManager.cpp" line="65"/>
         <source>Member 2</source>
         <oldsource>Membre 2</oldsource>
         <translation>Membre 2</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="64"/>
+        <location filename="widgets/TextManager.cpp" line="67"/>
         <source>Member 3</source>
         <oldsource>Membre 3</oldsource>
         <translation>Membre 3</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="67"/>
+        <location filename="widgets/TextManager.cpp" line="70"/>
         <source>New Page</source>
         <oldsource>Nouvelle page</oldsource>
         <translation>Nouvelle page</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="69"/>
+        <location filename="widgets/TextManager.cpp" line="72"/>
         <source>Choice</source>
         <oldsource>Choix</oldsource>
         <translation>Choix</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="74"/>
+        <location filename="widgets/TextManager.cpp" line="77"/>
         <source>Grey</source>
         <oldsource>Gris</oldsource>
         <translation>Gris</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="76"/>
+        <location filename="widgets/TextManager.cpp" line="79"/>
         <source>Blue</source>
         <oldsource>Bleu</oldsource>
         <translation>Bleu</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="84"/>
+        <location filename="widgets/TextManager.cpp" line="87"/>
         <source>Cyan</source>
         <translation>Cyan</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="30"/>
+        <location filename="widgets/TextManager.cpp" line="33"/>
         <source>Show unused texts</source>
         <translation>Afficher les textes non utilisés</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="35"/>
+        <location filename="widgets/TextManager.cpp" line="38"/>
         <source>Remove text</source>
         <translation>Supprimer texte</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="78"/>
+        <location filename="widgets/TextManager.cpp" line="81"/>
         <source>Red</source>
         <translation>Rouge</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="80"/>
+        <location filename="widgets/TextManager.cpp" line="83"/>
         <source>Purple</source>
         <translation>Violet</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="82"/>
+        <location filename="widgets/TextManager.cpp" line="85"/>
         <source>Green</source>
         <translation>Vert</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="86"/>
+        <location filename="widgets/TextManager.cpp" line="89"/>
         <source>Yellow</source>
         <translation>Jaune</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="88"/>
+        <location filename="widgets/TextManager.cpp" line="91"/>
         <source>White</source>
         <translation>Blanc</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="90"/>
+        <location filename="widgets/TextManager.cpp" line="93"/>
         <source>Blink</source>
         <translation>Clignotant</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="92"/>
+        <location filename="widgets/TextManager.cpp" line="95"/>
         <source>Multicolor</source>
         <oldsource>Multicolore</oldsource>
         <translation>Multicolore</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="97"/>
+        <location filename="widgets/TextManager.cpp" line="100"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="99"/>
+        <location filename="widgets/TextManager.cpp" line="102"/>
         <source>Pause 0</source>
         <translation>Pause 0</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="101"/>
+        <location filename="widgets/TextManager.cpp" line="104"/>
         <source>Pause 5</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="103"/>
+        <location filename="widgets/TextManager.cpp" line="106"/>
         <source>Pause 10</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="105"/>
+        <location filename="widgets/TextManager.cpp" line="108"/>
         <source>Pause 15</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="107"/>
+        <location filename="widgets/TextManager.cpp" line="110"/>
         <source>Pause 20</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="109"/>
+        <location filename="widgets/TextManager.cpp" line="112"/>
         <source>Pause 30</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="111"/>
+        <location filename="widgets/TextManager.cpp" line="114"/>
         <source>Pause 40</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="113"/>
+        <location filename="widgets/TextManager.cpp" line="116"/>
         <source>Pause 50</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="115"/>
+        <location filename="widgets/TextManager.cpp" line="118"/>
         <source>Pause 60</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="117"/>
+        <location filename="widgets/TextManager.cpp" line="120"/>
         <source>Pauses</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="123"/>
+        <location filename="widgets/TextManager.cpp" line="126"/>
         <source>Var10</source>
         <translation>Var10</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="125"/>
+        <location filename="widgets/TextManager.cpp" line="128"/>
         <source>Var16</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="127"/>
+        <location filename="widgets/TextManager.cpp" line="130"/>
         <source>Var10r</source>
         <oldsource>Var10d</oldsource>
         <translation>Var10d</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="129"/>
+        <location filename="widgets/TextManager.cpp" line="132"/>
         <source>Vars</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="135"/>
+        <location filename="widgets/TextManager.cpp" line="138"/>
         <source>Circle</source>
         <oldsource>Cercle</oldsource>
         <translation>Cercle</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="137"/>
+        <location filename="widgets/TextManager.cpp" line="140"/>
         <source>Triangle</source>
         <translation>Triangle</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="139"/>
+        <location filename="widgets/TextManager.cpp" line="142"/>
         <source>Square</source>
         <translation>Carré</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="143"/>
+        <location filename="widgets/TextManager.cpp" line="146"/>
         <source>Keys</source>
         <translation>Touches</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="156"/>
+        <location filename="widgets/TextManager.cpp" line="159"/>
         <source>Others</source>
         <translation>Autres</translation>
     </message>
     <message>
+        <location filename="widgets/TextManager.cpp" line="544"/>
+        <source>Window %1/%2</source>
+        <oldsource>Fenêtre %1/%2</oldsource>
+        <translation>Fenêtre %1/%2</translation>
+    </message>
+    <message>
         <source>This text is used by one or more scripts on this field..
 Remove will replace calls to this text with calls to the text that follows.
 Are you sure you want to continue?</source>
@@ -7009,48 +7626,83 @@
 Êtes-vous sûr de vouloir continuer ?</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="141"/>
+        <location filename="widgets/TextManager.cpp" line="144"/>
         <source>Cross</source>
         <oldsource>Croix</oldsource>
         <translation>Croix</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="148"/>
+        <location filename="widgets/TextManager.cpp" line="151"/>
         <source>Scrolling</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="150"/>
+        <location filename="widgets/TextManager.cpp" line="153"/>
         <source>Spaced characters</source>
         <oldsource>Caractères espacés</oldsource>
         <translation>Caractères espacés</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="152"/>
+        <location filename="widgets/TextManager.cpp" line="155"/>
         <source>Memory access</source>
         <oldsource>Accès mémoire</oldsource>
         <translation>Accès mémoire</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="154"/>
+        <location filename="widgets/TextManager.cpp" line="157"/>
         <source>New Page²</source>
         <oldsource>Nouvelle page²</oldsource>
         <translation>Nouvelle page²</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="349"/>
+        <location filename="widgets/TextManager.cpp" line="204"/>
+        <source>Align horizontally</source>
+        <translation>Aligner horizontalement</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="205"/>
+        <source>Align vertically</source>
+        <translation>Aligner verticalement</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="206"/>
+        <source>Autosize</source>
+        <translation>Taille automatique</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="215"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="216"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="217"/>
+        <source>W</source>
+        <translation>L</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="218"/>
+        <source>H</source>
+        <translation>H</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="382"/>
         <source>Text %1</source>
         <oldsource>Texte %1</oldsource>
         <translation>Texte %1</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="448"/>
+        <location filename="widgets/TextManager.cpp" line="491"/>
         <source>Text used in scripts</source>
         <oldsource>Texte utilisé dans les script</oldsource>
         <translation>Texte utilisé dans les script</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="448"/>
+        <location filename="widgets/TextManager.cpp" line="491"/>
         <source>This text is used by one or more scripts on this field.
 Removing this text may break scripts that reference it.
 Are you sure you want to continue?</source>
@@ -7059,7 +7711,7 @@
 Êtes-vous sûr de vouloir continuer ?</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="479"/>
+        <location filename="widgets/TextManager.cpp" line="522"/>
         <source>Page %1/%2</source>
         <translation>Page %1/%2</translation>
     </message>
@@ -7088,132 +7740,131 @@
 <context>
     <name>TutWidget</name>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="26"/>
+        <location filename="widgets/TutWidget.cpp" line="28"/>
         <source>Tutorials/Sounds</source>
         <oldsource>Tutoriels/Musiques</oldsource>
         <translation>Tutoriels/Musiques</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="29"/>
+        <location filename="widgets/TutWidget.cpp" line="31"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="30"/>
+        <location filename="widgets/TutWidget.cpp" line="32"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="44"/>
+        <location filename="widgets/TutWidget.cpp" line="46"/>
         <source>Export...</source>
         <oldsource>Exporter...</oldsource>
         <translation>Exporter...</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="45"/>
+        <location filename="widgets/TutWidget.cpp" line="47"/>
         <source>Import...</source>
         <oldsource>Importer...</oldsource>
         <translation>Importer...</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="52"/>
+        <location filename="widgets/TutWidget.cpp" line="54"/>
         <source>PlayStation</source>
         <translation>PlayStation</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="53"/>
+        <location filename="widgets/TutWidget.cpp" line="55"/>
         <source>PC</source>
         <translation>PC</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="130"/>
+        <location filename="widgets/TutWidget.cpp" line="132"/>
         <source>%1 - %2 : %3</source>
         <translation>%1 - %2 : %3</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="143"/>
+        <location filename="widgets/TutWidget.cpp" line="145"/>
         <source>Music ID:</source>
         <oldsource>ID musique :</oldsource>
         <translation>ID musique :</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="156"/>
+        <location filename="widgets/TutWidget.cpp" line="158"/>
         <source>Repair</source>
         <translation>Réparer</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="157"/>
+        <location filename="widgets/TutWidget.cpp" line="159"/>
         <source>Replace by empty AKAO</source>
         <translation>Remplacer par un AKAO vide</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="158"/>
+        <location filename="widgets/TutWidget.cpp" line="160"/>
         <source>Replace by empty tuto</source>
         <translation>Remplacer par un tuto vide</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="161"/>
+        <location filename="widgets/TutWidget.cpp" line="163"/>
         <source>There is an error</source>
         <translation>Quelque chose ne tourne pas rond</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="215"/>
+        <location filename="widgets/TutWidget.cpp" line="217"/>
         <source>Broken %1</source>
         <translation>Cassé %1</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="217"/>
+        <location filename="widgets/TutWidget.cpp" line="219"/>
         <source>Tuto %1</source>
         <translation>Tuto %1</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="219"/>
+        <location filename="widgets/TutWidget.cpp" line="221"/>
         <source>Music %1</source>
         <oldsource>Musique %1</oldsource>
         <translation>Musique %1</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="330"/>
+        <location filename="widgets/TutWidget.cpp" line="332"/>
         <source>Tutorial</source>
         <oldsource>Tutoriel</oldsource>
         <translation>Tutoriel</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="331"/>
+        <location filename="widgets/TutWidget.cpp" line="333"/>
         <source>Music</source>
         <oldsource>Musique</oldsource>
         <translation>Musique</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="348"/>
-        <location filename="widgets/TutWidget.cpp" line="534"/>
+        <location filename="widgets/TutWidget.cpp" line="350"/>
+        <location filename="widgets/TutWidget.cpp" line="546"/>
         <source>Import</source>
         <oldsource>Importer</oldsource>
         <translation>Importer</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="348"/>
-        <location filename="widgets/TutWidget.cpp" line="492"/>
-        <location filename="widgets/TutWidget.cpp" line="530"/>
+        <location filename="widgets/TutWidget.cpp" line="350"/>
+        <location filename="widgets/TutWidget.cpp" line="542"/>
         <source>sound_%1.akao</source>
         <translation>son_%1.akao</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="348"/>
-        <location filename="widgets/TutWidget.cpp" line="493"/>
-        <location filename="widgets/TutWidget.cpp" line="531"/>
+        <location filename="widgets/TutWidget.cpp" line="350"/>
+        <location filename="widgets/TutWidget.cpp" line="489"/>
+        <location filename="widgets/TutWidget.cpp" line="543"/>
         <source>Final Fantasy Sound (*.akao)</source>
         <translation>Son Final Fantasy (*.akao)</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="355"/>
+        <location filename="widgets/TutWidget.cpp" line="357"/>
         <source>Insert a tutorial here will shift the IDs of the tutorials that follows, this may be a problem.
 Are you sure you want to continue?</source>
         <translation>Insérer un tutoriel ici va décaler les identifiants des tutoriels qui suit, cela risque de poser problème.
 Êtes-vous sûr de vouloir continuer ?</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="382"/>
+        <location filename="widgets/TutWidget.cpp" line="384"/>
         <source>This tutorial may be used by one or more scripts on this field.
 Delete can cause errors.
 Are you sure you want to continue?</source>
@@ -7222,7 +7873,7 @@
 Êtes-vous sûr de vouloir continuer ?</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="382"/>
+        <location filename="widgets/TutWidget.cpp" line="384"/>
         <source>This tutorial is used by one or more scripts on this field.
 Remove will replace calls to this tutorial with calls to the tutorial that follows.
 Are you sure you want to continue?</source>
@@ -7231,49 +7882,59 @@
 Êtes-vous sûr de vouloir continuer ?</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="506"/>
-        <location filename="widgets/TutWidget.cpp" line="544"/>
-        <location filename="widgets/TutWidget.cpp" line="549"/>
+        <location filename="widgets/TutWidget.cpp" line="490"/>
+        <source>PSF MIDI file (*.minipsf)</source>
+        <translation>PSF MIDI file (*.minipsf)</translation>
+    </message>
+    <message>
+        <location filename="widgets/TutWidget.cpp" line="496"/>
+        <source>%1.akao</source>
+        <translation>%1.akao</translation>
+    </message>
+    <message>
+        <location filename="widgets/TutWidget.cpp" line="511"/>
+        <location filename="widgets/TutWidget.cpp" line="556"/>
+        <location filename="widgets/TutWidget.cpp" line="561"/>
         <source>Error</source>
         <oldsource>Opening error</oldsource>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="506"/>
+        <location filename="widgets/TutWidget.cpp" line="511"/>
         <source>Opening error file</source>
         <translation>Erreur d&apos;ouverture du fichier</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="544"/>
+        <location filename="widgets/TutWidget.cpp" line="556"/>
         <source>Opening Error File</source>
         <translation>Erreur d&apos;ouverture du fichier</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="549"/>
+        <location filename="widgets/TutWidget.cpp" line="561"/>
         <source>File too large</source>
         <translation>Fichier trop gros</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="355"/>
-        <location filename="widgets/TutWidget.cpp" line="382"/>
+        <location filename="widgets/TutWidget.cpp" line="357"/>
+        <location filename="widgets/TutWidget.cpp" line="384"/>
         <source>Tutorial used in scripts</source>
         <oldsource>Tutoriel utilisé dans les script</oldsource>
         <translation>Tutoriel utilisé dans les script</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="489"/>
-        <location filename="widgets/TutWidget.cpp" line="527"/>
+        <location filename="widgets/TutWidget.cpp" line="493"/>
+        <location filename="widgets/TutWidget.cpp" line="539"/>
         <source>tuto_%1.tutps</source>
         <translation>tuto_%1.tutps</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="490"/>
-        <location filename="widgets/TutWidget.cpp" line="528"/>
+        <location filename="widgets/TutWidget.cpp" line="494"/>
+        <location filename="widgets/TutWidget.cpp" line="540"/>
         <source>Tuto Final Fantasy VII PS (*.tutps)</source>
         <translation>Tuto Final Fantasy VII PS (*.tutps)</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="496"/>
+        <location filename="widgets/TutWidget.cpp" line="500"/>
         <source>Export</source>
         <oldsource>Exporter</oldsource>
         <translation>Exporter</translation>
@@ -7282,13 +7943,13 @@
 <context>
     <name>VarManager</name>
     <message>
-        <location filename="widgets/VarManager.cpp" line="24"/>
+        <location filename="widgets/VarManager.cpp" line="25"/>
         <source>Variable manager</source>
         <oldsource>Gestionnaire de variables</oldsource>
         <translation>Gestionnaire de variables</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="36"/>
+        <location filename="widgets/VarManager.cpp" line="35"/>
         <source>Rename</source>
         <oldsource>Renommer</oldsource>
         <translation>Renommer</translation>
@@ -7300,19 +7961,19 @@
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="75"/>
+        <location filename="widgets/VarManager.cpp" line="74"/>
         <source>Addresses Used</source>
         <oldsource>Adresses utilisées</oldsource>
         <translation>Adresses utilisées</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="265"/>
+        <location filename="widgets/VarManager.cpp" line="264"/>
         <source>Error</source>
         <oldsource>Erreur</oldsource>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="273"/>
+        <location filename="widgets/VarManager.cpp" line="272"/>
         <source>Searching</source>
         <oldsource>Recherche</oldsource>
         <translation>Recherche</translation>
@@ -7333,61 +7994,61 @@
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="62"/>
+        <location filename="widgets/VarManager.cpp" line="61"/>
         <source>Var banks 08, 09 and 10 are temporary and do not appear in the game save. &lt;br/&gt;Other banks are stored in pair: for example 01-02 is in the same memory location, but the first is used to store 8-bit values and the second is used to store 16-bit values.</source>
         <translation>Les banks de variable 08, 09 et 10 sont temporaires et n&apos;apparaissent pas dans les sauvegardes du jeu. &lt;br/&gt;Les autres banks sont stockés par paires : par exemple 01-02 représentent le même emplacement mémoire, mais le premier est utilisé pour stocker des valeurs sur 8 bits et le second est utilisé pour stocker des valeurs sur 16 bits.</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="76"/>
+        <location filename="widgets/VarManager.cpp" line="75"/>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="265"/>
+        <location filename="widgets/VarManager.cpp" line="264"/>
         <source>Save Failed</source>
         <translation>Fichier vars.cfg inaccessible.
 Échec de l&apos;enregistrement.</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="273"/>
+        <location filename="widgets/VarManager.cpp" line="272"/>
         <source>Searching, it may take a minute...</source>
         <translation>Recherche des variables en cours, cela peut prendre une minute...</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="327"/>
+        <location filename="widgets/VarManager.cpp" line="333"/>
         <source>rw</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="329"/>
+        <location filename="widgets/VarManager.cpp" line="335"/>
         <source>r</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="331"/>
+        <location filename="widgets/VarManager.cpp" line="337"/>
         <source>w</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="334"/>
+        <location filename="widgets/VarManager.cpp" line="340"/>
         <source>bitfield</source>
         <oldsource>bits</oldsource>
         <translation>bits</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="337"/>
+        <location filename="widgets/VarManager.cpp" line="343"/>
         <source>1 Byte</source>
         <oldsource>1 octet</oldsource>
         <translation>1 octet</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="340"/>
+        <location filename="widgets/VarManager.cpp" line="346"/>
         <source>2 Bytes</source>
         <oldsource>2 octets</oldsource>
         <translation>2 octets</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="343"/>
+        <location filename="widgets/VarManager.cpp" line="349"/>
         <source>2 Signed Bytes</source>
         <oldsource>2 octets signés</oldsource>
         <translation>2 octets signés</translation>
@@ -7458,7 +8119,8 @@
     </message>
     <message>
         <location filename="widgets/WalkmeshManager.cpp" line="47"/>
-        <source>Reset</source>
+        <source>Reset Camera</source>
+        <oldsource>Reset</oldsource>
         <translation>Remettre à 0</translation>
     </message>
     <message>
@@ -7619,14 +8281,12 @@
         <translation>Vert</translation>
     </message>
     <message>
-        <location filename="widgets/WalkmeshManager.cpp" line="394"/>
         <source>Up</source>
-        <translation>Haut</translation>
+        <translation type="vanished">Haut</translation>
     </message>
     <message>
-        <location filename="widgets/WalkmeshManager.cpp" line="396"/>
         <source>Down</source>
-        <translation>Bas</translation>
+        <translation type="vanished">Bas</translation>
     </message>
     <message>
         <location filename="widgets/WalkmeshManager.cpp" line="398"/>
@@ -7680,7 +8340,8 @@
     </message>
     <message>
         <location filename="widgets/WalkmeshManager.cpp" line="473"/>
-        <source>Field scale:</source>
+        <source>Field map scale:</source>
+        <oldsource>Field scale:</oldsource>
         <translation>Zoom écran :</translation>
     </message>
     <message>
@@ -7753,6 +8414,16 @@
         <translation>Flags couches</translation>
     </message>
     <message>
+        <location filename="widgets/WalkmeshManager.cpp" line="394"/>
+        <source>Top</source>
+        <translation>Haut</translation>
+    </message>
+    <message>
+        <location filename="widgets/WalkmeshManager.cpp" line="396"/>
+        <source>Bottom</source>
+        <translation>Bas</translation>
+    </message>
+    <message>
         <location filename="widgets/WalkmeshManager.cpp" line="408"/>
         <source>Background layer 3 width</source>
         <oldsource>Largeur couche 3 décor</oldsource>
@@ -7819,221 +8490,253 @@
 <context>
     <name>Window</name>
     <message>
-        <location filename="Window.cpp" line="60"/>
+        <location filename="Window.cpp" line="62"/>
         <source>&amp;File</source>
         <oldsource>&amp;Fichier</oldsource>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="62"/>
+        <location filename="Window.cpp" line="64"/>
         <source>&amp;Open...</source>
         <oldsource>&amp;Ouvrir...</oldsource>
         <translation>&amp;Ouvrir...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="70"/>
         <source>&amp;Export the current field...</source>
         <oldsource>&amp;Exporter l&apos;écran courant...</oldsource>
-        <translation>&amp;Exporter l&apos;écran courant...</translation>
+        <translation type="vanished">&amp;Exporter l&apos;écran courant...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="71"/>
+        <location filename="Window.cpp" line="73"/>
         <source>&amp;Mass Export...</source>
         <oldsource>Exporter en &amp;masse...</oldsource>
         <translation>Exporter en &amp;masse...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="72"/>
         <source>&amp;Import the current field...</source>
         <oldsource>&amp;Importer dans l&apos;écran courant...</oldsource>
-        <translation>&amp;Importer dans l&apos;écran courant...</translation>
+        <translation type="vanished">&amp;Importer dans l&apos;écran courant...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="74"/>
+        <location filename="Window.cpp" line="76"/>
+        <location filename="Window.cpp" line="406"/>
+        <location filename="Window.cpp" line="1567"/>
         <source>Archive Mana&amp;ger...</source>
         <oldsource>Ges&amp;tionnaire d&apos;archive...</oldsource>
         <translation>Ges&amp;tionnaire d&apos;archive...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="76"/>
+        <location filename="Window.cpp" line="78"/>
         <source>R&amp;un FF7</source>
         <oldsource>Run FF7</oldsource>
         <translation>&amp;Lancer FF7</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="85"/>
+        <location filename="Window.cpp" line="87"/>
         <source>T&amp;ools</source>
         <oldsource>&amp;Outils</oldsource>
         <translation>&amp;Outils</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="86"/>
+        <location filename="Window.cpp" line="88"/>
         <source>&amp;Texts...</source>
         <oldsource>&amp;Textes...</oldsource>
         <translation>&amp;Textes...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="87"/>
         <source>Field &amp;Models...</source>
         <oldsource>&amp;Modèles 3D...</oldsource>
-        <translation>&amp;Modèles 3D...</translation>
+        <translation type="vanished">&amp;Modèles 3D...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="89"/>
+        <location filename="Window.cpp" line="91"/>
         <source>Tutorials/&amp;Sounds...</source>
         <oldsource>T&amp;utoriels/Musiques...</oldsource>
         <translation>T&amp;utoriels/Musiques...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="91"/>
+        <location filename="Window.cpp" line="93"/>
         <source>&amp;Background...</source>
         <translation>&amp;Background...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="94"/>
+        <location filename="Window.cpp" line="96"/>
         <source>Variable Mana&amp;ger...</source>
         <oldsource>&amp;Gestionnaire de variables...</oldsource>
         <translation>&amp;Gestionnaire de variables...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="96"/>
         <source>Miscellaneous Oper&amp;ations...</source>
         <oldsource>Opér&amp;ations diverses...</oldsource>
-        <translation>Opér&amp;ations diverses...</translation>
+        <translation type="vanished">Opér&amp;ations diverses...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="102"/>
+        <location filename="Window.cpp" line="103"/>
         <source>&amp;Japanese Characters</source>
         <oldsource>Caractères &amp;japonais</oldsource>
         <translation>Caractères &amp;japonais</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="106"/>
+        <location filename="Window.cpp" line="107"/>
         <source>&amp;Language</source>
         <oldsource>&amp;Langues</oldsource>
         <translation>&amp;Langues</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="109"/>
+        <location filename="Window.cpp" line="110"/>
         <source>English (default)</source>
         <oldsource>Français (défaut)</oldsource>
         <translation>English (défaut)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="126"/>
+        <location filename="Window.cpp" line="127"/>
         <source>&amp;Configuration...</source>
         <translation>&amp;Configuration...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="327"/>
+        <location filename="Window.cpp" line="355"/>
         <source>Restart the program for the settings to take effect.</source>
         <oldsource>Relancez le programme pour que les paramètres prennent effet.</oldsource>
         <translation>Relancez le programme pour que les paramètres prennent effet.</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="63"/>
+        <location filename="Window.cpp" line="65"/>
         <source>Open &amp;Directory...</source>
         <translation>Ouvrir un &amp;dossier...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="64"/>
+        <location filename="Window.cpp" line="66"/>
         <source>&amp;Recent files</source>
         <translation>Fichiers ré&amp;cents</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="68"/>
+        <location filename="Window.cpp" line="70"/>
         <source>&amp;Save</source>
         <translation>Enregi&amp;strer</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="69"/>
+        <location filename="Window.cpp" line="71"/>
         <source>Save &amp;As...</source>
         <translation>Enre&amp;gistrer Sous...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="81"/>
+        <location filename="Window.cpp" line="72"/>
+        <source>&amp;Export the current map...</source>
+        <translation>&amp;Exporter l&apos;écran courant...</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="74"/>
+        <source>&amp;Import to current map...</source>
+        <translation>&amp;Importer dans l&apos;écran courant...</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="83"/>
         <source>C&amp;lose</source>
         <translation>Fe&amp;rmer</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="82"/>
+        <location filename="Window.cpp" line="84"/>
         <source>E&amp;xit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="88"/>
+        <location filename="Window.cpp" line="89"/>
+        <source>Map &amp;Models...</source>
+        <translation>&amp;Modèles 3D...</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="90"/>
         <source>Encounte&amp;rs...</source>
         <translation>&amp;Rencontres aléatoires...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="90"/>
+        <location filename="Window.cpp" line="92"/>
         <source>&amp;Walkmesh...</source>
         <translation>&amp;Zones...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="92"/>
+        <location filename="Window.cpp" line="94"/>
         <source>M&amp;iscellaneous...</source>
         <translation>&amp;Divers...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="95"/>
+        <location filename="Window.cpp" line="97"/>
         <source>&amp;Find...</source>
         <translation>Rec&amp;hercher...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="100"/>
+        <location filename="Window.cpp" line="98"/>
+        <source>B&amp;atch processing...</source>
+        <translation>Tr&amp;aitement par lot...</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="101"/>
         <source>&amp;Settings</source>
         <translation>&amp;Paramètres</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="118"/>
+        <location filename="Window.cpp" line="119"/>
         <source>English</source>
         <translation>Français</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="129"/>
+        <location filename="Window.cpp" line="130"/>
         <source>Main &amp;toolbar</source>
         <translation>Barre d&apos;outils &amp;principale</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="134"/>
-        <location filename="Window.cpp" line="438"/>
+        <location filename="Window.cpp" line="135"/>
+        <location filename="Window.cpp" line="480"/>
         <source>Open a file</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="136"/>
-        <location filename="Window.cpp" line="358"/>
+        <location filename="Window.cpp" line="137"/>
+        <location filename="Window.cpp" line="389"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="139"/>
+        <location filename="Window.cpp" line="140"/>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="256"/>
+        <location filename="Window.cpp" line="144"/>
+        <source>Text editor</source>
+        <translation>Editeur de texte</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="146"/>
+        <source>Model loader editor</source>
+        <translation>Liste des modèles 3D</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="150"/>
+        <source>Walkmesh editor</source>
+        <translation>Walkmesh</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="284"/>
         <source>&amp;View</source>
         <translation>&amp;Affichage</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="259"/>
         <source>Field List</source>
-        <translation>Liste des écrans</translation>
+        <translation type="vanished">Liste des écrans</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="262"/>
+        <location filename="Window.cpp" line="290"/>
         <source>Background Preview</source>
         <translation>Aperçu décor</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="326"/>
+        <location filename="Window.cpp" line="354"/>
         <source>Settings changed</source>
         <translation>Paramètres modifiés</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="356"/>
+        <location filename="Window.cpp" line="387"/>
         <source>
 
 Edited files:</source>
@@ -8042,57 +8745,55 @@
 Fichiers modifiés :</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="358"/>
+        <location filename="Window.cpp" line="389"/>
         <source>Would you like to save changes of %1?%2</source>
         <translation>Voulez-vous enregistrer les changements de %1 ?%2</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="430"/>
+        <location filename="Window.cpp" line="472"/>
         <source>Compatible Files (*.lgp *.DAT *.bin *.iso *.img)</source>
         <oldsource>Fichiers compatibles (*.lgp *.DAT *.bin *.iso *.img)</oldsource>
         <translation>Fichiers compatibles (*.lgp *.DAT *.bin *.iso *.img)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="431"/>
+        <location filename="Window.cpp" line="473"/>
         <source>Lgp Files (*.lgp)</source>
         <oldsource>Fichiers Lgp (*.lgp)</oldsource>
         <translation>Fichiers Lgp (*.lgp)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="432"/>
-        <location filename="Window.cpp" line="946"/>
-        <location filename="Window.cpp" line="1077"/>
-        <location filename="Window.cpp" line="1188"/>
+        <location filename="Window.cpp" line="474"/>
+        <location filename="Window.cpp" line="1015"/>
+        <location filename="Window.cpp" line="1292"/>
         <source>DAT File (*.DAT)</source>
         <oldsource>Fichier DAT (*.DAT)</oldsource>
         <translation>Fichier DAT (*.DAT)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="433"/>
         <source>PC Field File (*)</source>
         <oldsource>Fichier Field PC (*)</oldsource>
-        <translation>Fichier Field PC (*)</translation>
+        <translation type="vanished">Fichier Field PC (*)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="434"/>
+        <location filename="Window.cpp" line="476"/>
         <source>Disc Image (*.bin *.iso *.img)</source>
         <oldsource>Image disque (*.bin *.iso *.img)</oldsource>
         <translation>Image disque (*.bin *.iso *.img)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="486"/>
+        <location filename="Window.cpp" line="528"/>
         <source>Select a folder containing the Final Fantasy VII field files</source>
         <oldsource>Sélectionnez un dossier contenant des fichiers field issus de Final Fantasy VII</oldsource>
         <translation>Sélectionnez un dossier contenant des fichiers field issus de Final Fantasy VII</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="494"/>
+        <location filename="Window.cpp" line="536"/>
         <source>File Type</source>
         <oldsource>Type de fichiers</oldsource>
         <translation>Type de fichiers</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="495"/>
+        <location filename="Window.cpp" line="537"/>
         <source>What type of file to look for?
  - Playstation field files (&quot;EXAMPLE.DAT&quot;)
  - PC Field File (&quot;example&quot;)
@@ -8106,288 +8807,334 @@
  - Les fichiers field PC (&quot;exemple&quot;)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="499"/>
+        <location filename="Window.cpp" line="541"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="500"/>
+        <location filename="Window.cpp" line="542"/>
         <source>PC</source>
         <translation>PC</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="535"/>
+        <location filename="Window.cpp" line="584"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="535"/>
+        <location filename="Window.cpp" line="584"/>
         <source>Stop</source>
         <translation>Arrêter</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="558"/>
+        <location filename="Window.cpp" line="613"/>
         <source>Opening...</source>
         <translation>Ouverture...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="577"/>
-        <location filename="Window.cpp" line="975"/>
+        <location filename="Window.cpp" line="632"/>
         <source>Nothing found!</source>
         <translation>Rien trouvé !</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="581"/>
+        <location filename="Window.cpp" line="636"/>
         <source>The file already exists</source>
         <translation>Le fichier existe déjà</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="590"/>
         <source>Unable to remove the file</source>
-        <translation>Impossible de supprimer le fichier</translation>
+        <translation type="vanished">Impossible de supprimer le fichier</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="593"/>
         <source>Failed to rename file.</source>
-        <translation>Impossible de renommer le fichier.</translation>
+        <translation type="vanished">Impossible de renommer le fichier.</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="596"/>
         <source>Failed to copy file</source>
-        <translation>Impossible de copier le fichier</translation>
+        <translation type="vanished">Impossible de copier le fichier</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="602"/>
+        <location filename="Window.cpp" line="657"/>
         <source>This error should not appear, thank you for reporting it</source>
         <translation>Cette erreur ne devrais pas s&apos;afficher, merci de le signaler</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="923"/>
+        <location filename="Window.cpp" line="992"/>
         <source>Error Compiling Scripts:
 scene %1 (%2), group %3 (%4), script %5, line %6: %7</source>
         <translation>Erreur de compilation des scripts :
 écran %1 (%2), groupe %3 (%4), script %5, ligne %6 : %7</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="923"/>
+        <location filename="Window.cpp" line="992"/>
         <source>Compilation Error</source>
         <translation>Erreur de compilation</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="939"/>
+        <location filename="Window.cpp" line="1008"/>
         <source>Save Directory As</source>
         <translation>Enregistrer dossier sous</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="952"/>
+        <location filename="Window.cpp" line="1021"/>
         <source>Save As</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="957"/>
+        <location filename="Window.cpp" line="1026"/>
         <source>Saving...</source>
         <translation>Sauvegarde...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="984"/>
+        <location filename="Window.cpp" line="645"/>
+        <location filename="Window.cpp" line="1053"/>
         <source>Unable to remove the file, check write permissions.</source>
         <translation>Impossible de supprimer le fichier, vérifiez les droits d&apos;écriture.</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="987"/>
+        <location filename="Window.cpp" line="287"/>
+        <source>Map List</source>
+        <translation>Liste des écrans</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="475"/>
+        <source>PC field File (*)</source>
+        <translation>Fichier Field PC (*)</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="648"/>
+        <source>Failed to rename the file, check write permissions.</source>
+        <translation>Impossible de renommer le fichier, vérifiez les droits d&apos;écriture.</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="651"/>
+        <source>Failed to copy the file, check write permissions.</source>
+        <translation>Impossible de copier le fichier, vérifiez les droits d&apos;écriture.</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1044"/>
+        <source>No maps found</source>
+        <translation>Aucun écran trouvé</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1056"/>
         <source>Unable to rename the file, check write permissions.</source>
         <translation>Impossible de renommer le fichier, vérifiez les droits d&apos;écriture.</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="990"/>
+        <location filename="Window.cpp" line="1059"/>
         <source>Unable to copy the file, check write permissions.</source>
         <translation>Impossible de copier le fichier, vérifiez les droits d&apos;écriture.</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="996"/>
+        <location filename="Window.cpp" line="1065"/>
         <source>This feature is not complete</source>
         <translation>Cette fonctionnalité n&apos;est pas terminée</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1109"/>
-        <location filename="Window.cpp" line="1237"/>
+        <location filename="Window.cpp" line="1149"/>
+        <location filename="Window.cpp" line="1291"/>
+        <source>PC Field Map (*)</source>
+        <translation>Fichier Field PC (*)</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1150"/>
+        <source>Data DAT File (*.DAT)</source>
+        <translation>Fichier DAT (*.DAT)</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1151"/>
+        <source>Textures MIM File (*.MIM)</source>
+        <translation>Fichier MIM (*.MIM)</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1152"/>
+        <location filename="Window.cpp" line="1293"/>
+        <source>Uncompressed PC Field Map (*)</source>
+        <translation>Écran PC décompressé (*)</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1188"/>
+        <source>Archive is inaccessible</source>
+        <translation>L&apos;archive est inaccessible</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1189"/>
+        <location filename="Window.cpp" line="1334"/>
         <source>Error reopening file</source>
         <translation>Erreur lors de l&apos;ouverture du fichier</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1110"/>
+        <location filename="Window.cpp" line="1190"/>
         <source>Unable to create the new file</source>
         <translation>Impossible de créer le nouveau fichier</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1145"/>
+        <location filename="Window.cpp" line="1237"/>
         <source>An error occured when exporting</source>
         <translation>Une erreur s&apos;est produite lors de l&apos;exportation</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1173"/>
+        <location filename="Window.cpp" line="1265"/>
         <source>An error occurred when importing</source>
         <translation>Une erreur s&apos;est produite lors de l&apos;importation</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1217"/>
         <source>Warning</source>
-        <translation>Attention</translation>
+        <translation type="vanished">Attention</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1217"/>
         <source>The background importation algorithm give bad results in-game, you have been warned!</source>
-        <translation>L&apos;algorithme d&apos;importation des décors donne de mauvais résultats en jeu, vous êtes prévenus !</translation>
+        <translation type="vanished">L&apos;algorithme d&apos;importation des décors donne de mauvais résultats en jeu, vous êtes prévenus !</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1268"/>
+        <location filename="Window.cpp" line="1365"/>
         <source>Final Fantasy VII couldn&apos;t be launched
 %1</source>
         <translation>Final Fantasy VII n&apos;a pas pu être lancé.
 %1</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1362"/>
-        <location filename="Window.cpp" line="1440"/>
+        <location filename="Window.cpp" line="1481"/>
+        <location filename="Window.cpp" line="1559"/>
         <source>Opening error</source>
         <translation>Erreur d&apos;ouverture</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1362"/>
+        <location filename="Window.cpp" line="1481"/>
         <source>Can not open encounters!</source>
         <translation>Impossible d&apos;ouvrir les combats aléatoires !</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1440"/>
+        <location filename="Window.cpp" line="1559"/>
         <source>Can not open miscellaneous informations!</source>
         <translation>Impossible d&apos;ouvrir les infos diverses !</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1464"/>
+        <location filename="Window.cpp" line="1570"/>
+        <source>Go back to field map editor...</source>
+        <translation>Revenir sur l&apos;éditeur d&apos;écrans de jeu...</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1590"/>
         <source>Applying...</source>
         <translation>Application en cours...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1529"/>
         <source>By myst6re&lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Thanks to:&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;/ul&gt;</source>
         <oldsource>By myst6re&lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Thanks to :&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;/ul&gt;</oldsource>
-        <translation>Par myst6re&lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Merci à :&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;/ul&gt;</translation>
+        <translation type="vanished">Par myst6re&lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Merci à :&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1536"/>
         <source>Close</source>
-        <translation>Fermer</translation>
+        <translation type="vanished">Fermer</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="584"/>
-        <location filename="Window.cpp" line="978"/>
+        <location filename="Window.cpp" line="639"/>
+        <location filename="Window.cpp" line="1047"/>
         <source>The file is inaccessible</source>
         <oldsource>Le fichier est inaccessible</oldsource>
         <translation>Le fichier est inaccessible</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="587"/>
-        <location filename="Window.cpp" line="981"/>
+        <location filename="Window.cpp" line="642"/>
+        <location filename="Window.cpp" line="1050"/>
         <source>Can not create temporary file</source>
         <oldsource>Impossible de créer un fichier temporaire</oldsource>
         <translation>Impossible de créer un fichier temporaire</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="599"/>
-        <location filename="Window.cpp" line="1238"/>
+        <location filename="Window.cpp" line="654"/>
+        <location filename="Window.cpp" line="1335"/>
         <source>Invalid file</source>
         <oldsource>Le fichier est invalide</oldsource>
         <translation>Fichier invalide</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="606"/>
-        <location filename="Window.cpp" line="999"/>
-        <location filename="Window.cpp" line="1113"/>
-        <location filename="Window.cpp" line="1145"/>
-        <location filename="Window.cpp" line="1173"/>
-        <location filename="Window.cpp" line="1240"/>
-        <location filename="Window.cpp" line="1268"/>
+        <location filename="Window.cpp" line="566"/>
+        <location filename="Window.cpp" line="661"/>
+        <location filename="Window.cpp" line="1068"/>
+        <location filename="Window.cpp" line="1193"/>
+        <location filename="Window.cpp" line="1237"/>
+        <location filename="Window.cpp" line="1265"/>
+        <location filename="Window.cpp" line="1337"/>
+        <location filename="Window.cpp" line="1365"/>
         <source>Error</source>
         <oldsource>Erreur</oldsource>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="844"/>
-        <location filename="Window.cpp" line="1436"/>
+        <location filename="Window.cpp" line="902"/>
+        <location filename="Window.cpp" line="1555"/>
         <source>Author: %1</source>
         <oldsource>Auteur : %1</oldsource>
         <translation>Auteur : %1</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="944"/>
+        <location filename="Window.cpp" line="1013"/>
         <source>Lgp File (*.lgp)</source>
         <oldsource>Fichier Lgp (*.lgp)</oldsource>
         <translation>Fichier Lgp (*.lgp)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="948"/>
+        <location filename="Window.cpp" line="1017"/>
         <source>Iso File (*.iso *.bin *.img)</source>
         <oldsource>Fichier Iso (*.iso *.bin *.img)</oldsource>
         <translation>Fichier Iso (*.iso *.bin *.img)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="993"/>
+        <location filename="Window.cpp" line="1062"/>
         <source>Invalid archive</source>
         <oldsource>L&apos;archive est invalide</oldsource>
         <translation>Invalid archive</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1076"/>
-        <location filename="Window.cpp" line="1189"/>
         <source>PC Field (*)</source>
         <oldsource>Écran PC (*)</oldsource>
-        <translation>Écran PC (*)</translation>
+        <translation type="vanished">Écran PC (*)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1078"/>
-        <location filename="Window.cpp" line="1191"/>
         <source>Uncompressed PC Field (*)</source>
         <oldsource>Écran PC décompressé (*)</oldsource>
-        <translation>Écran PC décompressé (*)</translation>
+        <translation type="vanished">Écran PC décompressé (*)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1090"/>
+        <location filename="Window.cpp" line="1164"/>
         <source>Export the current file</source>
         <oldsource>Exporter le fichier courant</oldsource>
         <translation>Exporter le fichier courant</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1108"/>
         <source>Lgp archive is inaccessible</source>
         <oldsource>lgp archive is inaccessible</oldsource>
-        <translation>L&apos;archive Lgp est inaccessible</translation>
+        <translation type="vanished">L&apos;archive Lgp est inaccessible</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1111"/>
+        <location filename="Window.cpp" line="1191"/>
         <source>Not yet implemented!</source>
         <oldsource>Pas encore implémenté !</oldsource>
         <translation>Pas encore implémenté !</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1127"/>
+        <location filename="Window.cpp" line="1207"/>
         <source>Export...</source>
         <oldsource>Exportation...</oldsource>
         <translation>Exporter...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1164"/>
+        <location filename="Window.cpp" line="1256"/>
         <source>Import...</source>
         <oldsource>Importation...</oldsource>
         <translation>Importer...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1190"/>
+        <location filename="Window.cpp" line="1294"/>
         <source>Uncompressed DAT File (*)</source>
         <oldsource>Fichier DAT décompressé (*)</oldsource>
         <translation>Fichier DAT décompressé (*)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1198"/>
+        <location filename="Window.cpp" line="1303"/>
         <source>Import a file</source>
         <oldsource>Importer un fichier</oldsource>
         <translation>Importer un fichier</translation>
diff -Nru makoureactor-1.7.2/Makou_Reactor_ja.ts makoureactor-1.8.0/Makou_Reactor_ja.ts
--- makoureactor-1.7.2/Makou_Reactor_ja.ts	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Makou_Reactor_ja.ts	2020-08-08 18:46:56.000000000 +0000
@@ -2,6 +2,19 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="ja_JP">
 <context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="widgets/AboutDialog.cpp" line="11"/>
+        <source>By Jérôme &amp;lt;myst6re&amp;gt; Arzel &lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/AboutDialog.cpp" line="17"/>
+        <source>Thanks to:&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;TrueOdin&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;li&gt;DLPB&lt;/li&gt;&lt;/ul&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AnimEditorDialog</name>
     <message>
         <location filename="widgets/AnimEditorDialog.cpp" line="25"/>
@@ -14,7 +27,7 @@
 <context>
     <name>ApercuBG</name>
     <message>
-        <location filename="widgets/ApercuBG.cpp" line="77"/>
+        <location filename="widgets/ApercuBG.cpp" line="82"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
@@ -33,6 +46,29 @@
     </message>
 </context>
 <context>
+    <name>ArchivePreview</name>
+    <message>
+        <location filename="widgets/ArchivePreview.cpp" line="103"/>
+        <source>Image %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ArchivePreview.cpp" line="116"/>
+        <source>Palette %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ArchivePreview.cpp" line="131"/>
+        <source>Save Background</source>
+        <translation>背景を保存</translation>
+    </message>
+    <message>
+        <location filename="widgets/ArchivePreview.cpp" line="133"/>
+        <source>PNG image (*.png);;JPG image (*.jpg);;BMP image (*.bmp);;Portable Pixmap (*.ppm)</source>
+        <translation>PNG 画像 (*.png);;JPG 画像 (*.jpg);;BMP 画像 (*.bmp);;Portable Pixmap (*.ppm)</translation>
+    </message>
+</context>
+<context>
     <name>BGDialog</name>
     <message>
         <location filename="widgets/BGDialog.cpp" line="24"/>
@@ -127,162 +163,191 @@
 <context>
     <name>ConfigWindow</name>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="26"/>
+        <location filename="widgets/ConfigWindow.cpp" line="27"/>
         <source>Configuration</source>
         <translation>構成設定</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="28"/>
+        <location filename="widgets/ConfigWindow.cpp" line="29"/>
         <source>Dependencies</source>
         <oldsource>Dépendances</oldsource>
         <translatorcomment>Dependencies</translatorcomment>
         <translation>依存関係</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="33"/>
+        <location filename="widgets/ConfigWindow.cpp" line="34"/>
         <source>Final Fantasy VII Installs</source>
         <oldsource>Final Fantasy VII installés</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="37"/>
+        <location filename="widgets/ConfigWindow.cpp" line="38"/>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="41"/>
-        <location filename="widgets/ConfigWindow.cpp" line="44"/>
-        <location filename="widgets/ConfigWindow.cpp" line="47"/>
+        <location filename="widgets/ConfigWindow.cpp" line="42"/>
+        <location filename="widgets/ConfigWindow.cpp" line="45"/>
+        <location filename="widgets/ConfigWindow.cpp" line="48"/>
         <source>Change</source>
         <translation>変更</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="67"/>
+        <location filename="widgets/ConfigWindow.cpp" line="70"/>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="72"/>
+        <source>Dark mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="79"/>
         <source>Disable OpenGL</source>
         <translation>OpenGL を無効化</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="72"/>
+        <location filename="widgets/ConfigWindow.cpp" line="84"/>
         <source>Text Editor</source>
         <translation>テキスト エディター</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="79"/>
+        <location filename="widgets/ConfigWindow.cpp" line="91"/>
         <source>Defaults</source>
         <translation>デフォルト</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="84"/>
         <source>Japanese Characters</source>
-        <translation>日本語版文字コード</translation>
+        <translation type="vanished">日本語版文字コード</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="115"/>
+        <location filename="widgets/ConfigWindow.cpp" line="131"/>
         <source>Autosize: margin right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="117"/>
+        <location filename="widgets/ConfigWindow.cpp" line="133"/>
         <source>{SPACED CHARACTERS} width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="121"/>
+        <location filename="widgets/ConfigWindow.cpp" line="137"/>
         <source>Script Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="123"/>
+        <location filename="widgets/ConfigWindow.cpp" line="139"/>
         <source>Expand lines by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="129"/>
+        <location filename="widgets/ConfigWindow.cpp" line="145"/>
         <source>Miscellaneous</source>
         <translation>各種情報</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="131"/>
+        <location filename="widgets/ConfigWindow.cpp" line="147"/>
         <source>Don&apos;t strictly verify the file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="258"/>
+        <location filename="widgets/ConfigWindow.cpp" line="283"/>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="261"/>
-        <location filename="widgets/ConfigWindow.cpp" line="265"/>
+        <location filename="widgets/ConfigWindow.cpp" line="286"/>
+        <location filename="widgets/ConfigWindow.cpp" line="290"/>
         <source>Add</source>
         <translation>追加</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="285"/>
-        <location filename="widgets/ConfigWindow.cpp" line="295"/>
+        <location filename="widgets/ConfigWindow.cpp" line="310"/>
+        <location filename="widgets/ConfigWindow.cpp" line="320"/>
         <source>Find ff7.exe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="285"/>
-        <location filename="widgets/ConfigWindow.cpp" line="295"/>
+        <location filename="widgets/ConfigWindow.cpp" line="310"/>
+        <location filename="widgets/ConfigWindow.cpp" line="320"/>
         <source>EXE files (*.exe)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="340"/>
+        <location filename="widgets/ConfigWindow.cpp" line="365"/>
         <source>Find kernel2.bin</source>
         <translation>kernel2.bin の選択</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="340"/>
-        <location filename="widgets/ConfigWindow.cpp" line="347"/>
+        <location filename="widgets/ConfigWindow.cpp" line="365"/>
+        <location filename="widgets/ConfigWindow.cpp" line="372"/>
         <source>Bin Files (*.bin);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="347"/>
+        <location filename="widgets/ConfigWindow.cpp" line="372"/>
         <source>Find window.bin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="354"/>
+        <location filename="widgets/ConfigWindow.cpp" line="381"/>
         <source>Find char.lgp</source>
         <translation>char.lgp の検出</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="354"/>
-        <source>Lgp Archives (*.lgp);;All Files(*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="widgets/ConfigWindow.cpp" line="452"/>
+        <location filename="widgets/ConfigWindow.cpp" line="514"/>
         <source>You must restart Makou Reactor to apply all changes.</source>
         <translation>変更を適用するために Makou Reactor を再起動してください。</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="39"/>
+        <location filename="widgets/ConfigWindow.cpp" line="40"/>
         <source>kernel2.bin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="42"/>
+        <location filename="widgets/ConfigWindow.cpp" line="43"/>
         <source>window.bin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="45"/>
+        <location filename="widgets/ConfigWindow.cpp" line="46"/>
         <source>char.lgp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="65"/>
+        <location filename="widgets/ConfigWindow.cpp" line="77"/>
         <source>OpenGL</source>
         <translatorcomment>OpenGL</translatorcomment>
         <translation>OpenGL</translation>
     </message>
     <message>
-        <location filename="widgets/ConfigWindow.cpp" line="452"/>
+        <location filename="widgets/ConfigWindow.cpp" line="97"/>
+        <source>Latin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="98"/>
+        <source>Japanese</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="50"/>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="124"/>
+        <source>Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="381"/>
+        <source>Lgp Archives (*.lgp);;All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ConfigWindow.cpp" line="514"/>
         <source>Information</source>
         <translatorcomment>Information</translatorcomment>
         <translation>インフォメーション</translation>
@@ -394,7 +459,7 @@
     <message>
         <location filename="widgets/FieldList.cpp" line="13"/>
         <source>File</source>
-        <translation type="unfinished">ファイル</translation>
+        <translation>ファイル</translation>
     </message>
     <message>
         <location filename="widgets/FieldList.cpp" line="13"/>
@@ -412,86 +477,177 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="143"/>
-        <source>PC Field File (*)</source>
+        <source>DAT File (*.DAT)</source>
+        <translation type="obsolete">DAT ファイル (*.DAT)</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="30"/>
+        <source>Rename field</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="33"/>
+        <source>Add field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="145"/>
-        <source>DAT File (*.DAT)</source>
-        <translation type="unfinished">DAT ファイル (*.DAT)</translation>
+        <location filename="widgets/FieldList.cpp" line="36"/>
+        <source>Delete field</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="148"/>
+        <location filename="widgets/FieldList.cpp" line="51"/>
+        <source>&amp;Field List Toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="54"/>
         <source>Add a field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="169"/>
+        <location filename="widgets/FieldList.cpp" line="56"/>
+        <source>Remove a field</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="220"/>
+        <location filename="widgets/FieldList.cpp" line="263"/>
+        <source>Not implemented for PS.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="229"/>
         <source>Choose a name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="170"/>
+        <location filename="widgets/FieldList.cpp" line="230"/>
         <source>Field name:</source>
         <translation type="unfinished">フィールド名 :</translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="177"/>
+        <location filename="widgets/FieldList.cpp" line="189"/>
+        <location filename="widgets/FieldList.cpp" line="237"/>
         <source>Name not filled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="178"/>
+        <location filename="widgets/FieldList.cpp" line="190"/>
+        <location filename="widgets/FieldList.cpp" line="238"/>
         <source>Please set a new field name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="180"/>
+        <location filename="widgets/FieldList.cpp" line="194"/>
+        <location filename="widgets/FieldList.cpp" line="241"/>
         <source>Name already present in archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="181"/>
+        <location filename="widgets/FieldList.cpp" line="195"/>
+        <location filename="widgets/FieldList.cpp" line="242"/>
         <source>Please choose another name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="192"/>
-        <location filename="widgets/FieldList.cpp" line="195"/>
-        <location filename="widgets/FieldList.cpp" line="200"/>
-        <location filename="widgets/FieldList.cpp" line="207"/>
-        <source>Error</source>
-        <translation type="unfinished">エラー</translation>
+        <location filename="widgets/FieldList.cpp" line="277"/>
+        <source>Are you sure you want to remove %1?
+Other maps can refer to it!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="192"/>
-        <source>Not implemented.</source>
+        <location filename="widgets/FieldList.cpp" line="280"/>
+        <source>the selected field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="195"/>
-        <source>Field with this name already exist.</source>
+        <location filename="widgets/FieldList.cpp" line="281"/>
+        <source>the selected fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FieldList.cpp" line="200"/>
-        <source>Unknown error.</source>
-        <translation type="unfinished"></translation>
+        <location filename="widgets/FieldList.cpp" line="283"/>
+        <source>Delete</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <location filename="widgets/FieldList.cpp" line="220"/>
+        <location filename="widgets/FieldList.cpp" line="263"/>
+        <source>Error</source>
+        <translation>エラー</translation>
     </message>
+</context>
+<context>
+    <name>FieldSaveIO</name>
     <message>
-        <location filename="widgets/FieldList.cpp" line="207"/>
-        <source>Cannot open file.</source>
+        <location filename="core/field/FieldIO.cpp" line="66"/>
+        <source>Cannot save field map %1</source>
+        <oldsource>Cannot save field %1</oldsource>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FontManager</name>
     <message>
-        <location filename="widgets/FontManager.cpp" line="24"/>
+        <location filename="widgets/FontManager.cpp" line="25"/>
         <source>Font Manager</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="55"/>
+        <source>Japanese</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="115"/>
+        <source>&amp;Displayed name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="116"/>
+        <source>&amp;File name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="132"/>
+        <source>This name already exist or is invalid, please choose another.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="149"/>
+        <source>Remove font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="150"/>
+        <source>Do you want to remove the selected font?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="obsolete">追加</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="obsolete">削除</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="55"/>
+        <source>Latin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="111"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontManager.cpp" line="132"/>
+        <source>Choose another name</source>
+        <oldsource>Choisissez un autre nom</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FontWidget</name>
@@ -512,13 +668,18 @@
         <translation>シアン</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="43"/>
+        <location filename="widgets/FontWidget.cpp" line="31"/>
+        <source>Green</source>
+        <translation type="unfinished">緑色</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontWidget.cpp" line="45"/>
         <source>Export...</source>
         <oldsource>Exporter...</oldsource>
         <translation>エクスポート...</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="44"/>
+        <location filename="widgets/FontWidget.cpp" line="46"/>
         <source>Import...</source>
         <oldsource>Importer...</oldsource>
         <translation>インポート...</translation>
@@ -544,87 +705,93 @@
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="37"/>
-        <location filename="widgets/FontWidget.cpp" line="39"/>
-        <source>From Image...</source>
+        <location filename="widgets/FontWidget.cpp" line="47"/>
+        <source>Cancel Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="45"/>
-        <source>Cancel Changes</source>
+        <location filename="widgets/FontWidget.cpp" line="57"/>
+        <source>Text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="102"/>
-        <source>Table %1</source>
+        <location filename="widgets/FontWidget.cpp" line="59"/>
+        <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="166"/>
-        <source>FF7 font file (*.bin)</source>
-        <oldsource>Fichier police FF7 (*.bin)</oldsource>
+        <location filename="widgets/FontWidget.cpp" line="108"/>
+        <source>Table %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="167"/>
-        <location filename="widgets/FontWidget.cpp" line="243"/>
-        <source>FF8 font file (*.tdw)</source>
-        <oldsource>Fichier police FF8 (*.tdw)</oldsource>
+        <location filename="widgets/FontWidget.cpp" line="191"/>
+        <location filename="widgets/FontWidget.cpp" line="267"/>
+        <source>FF7 font file (*.bin)</source>
+        <oldsource>Fichier police FF7 (*.bin)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="168"/>
+        <location filename="widgets/FontWidget.cpp" line="193"/>
         <source>Image File (*.png)</source>
         <oldsource>Fichier image PNG (*.png)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="169"/>
-        <source>Image File (*.jpg))</source>
-        <oldsource>Fichier image JPG (*.jpg)</oldsource>
+        <location filename="widgets/FontWidget.cpp" line="194"/>
+        <source>Image File (*.jpg)</source>
+        <oldsource>Image File (*.jpg))</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="170"/>
+        <location filename="widgets/FontWidget.cpp" line="195"/>
         <source>Image File (*.bmp)</source>
         <oldsource>Fichier image BMP (*.bmp)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="174"/>
+        <location filename="widgets/FontWidget.cpp" line="199"/>
         <source>Translation file %1 (*.txt)</source>
         <oldsource>Fichier traduction %1 (*.txt)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="178"/>
+        <location filename="widgets/FontWidget.cpp" line="203"/>
         <source>Export font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="218"/>
-        <location filename="widgets/FontWidget.cpp" line="265"/>
+        <location filename="widgets/FontWidget.cpp" line="216"/>
+        <location filename="widgets/FontWidget.cpp" line="219"/>
+        <location filename="widgets/FontWidget.cpp" line="242"/>
+        <location filename="widgets/FontWidget.cpp" line="285"/>
+        <location filename="widgets/FontWidget.cpp" line="289"/>
+        <source>Error</source>
+        <oldsource>Erreur</oldsource>
+        <translation type="unfinished">エラー</translation>
+    </message>
+    <message>
+        <location filename="widgets/FontWidget.cpp" line="216"/>
+        <location filename="widgets/FontWidget.cpp" line="242"/>
+        <location filename="widgets/FontWidget.cpp" line="289"/>
         <source>Error opening file (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="247"/>
+        <location filename="widgets/FontWidget.cpp" line="219"/>
+        <source>Error saving file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/FontWidget.cpp" line="271"/>
         <source>Import font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/FontWidget.cpp" line="261"/>
+        <location filename="widgets/FontWidget.cpp" line="285"/>
         <source>Invalid file</source>
         <translation type="unfinished">無効なファイル</translation>
     </message>
-    <message>
-        <location filename="widgets/FontWidget.cpp" line="218"/>
-        <location filename="widgets/FontWidget.cpp" line="261"/>
-        <location filename="widgets/FontWidget.cpp" line="265"/>
-        <source>Error</source>
-        <oldsource>Erreur</oldsource>
-        <translation>エラー</translation>
-    </message>
 </context>
 <context>
     <name>GrpScriptList</name>
@@ -696,53 +863,63 @@
         <translation type="unfinished">下へ</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="100"/>
+        <location filename="widgets/GrpScriptList.cpp" line="101"/>
         <source>Remove a group</source>
         <translation type="unfinished">グループの削除</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="103"/>
+        <location filename="widgets/GrpScriptList.cpp" line="104"/>
         <source>Up</source>
         <translation type="unfinished">上に</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="105"/>
+        <location filename="widgets/GrpScriptList.cpp" line="106"/>
         <source>Down</source>
         <translation type="unfinished">下に</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="271"/>
+        <location filename="widgets/GrpScriptList.cpp" line="255"/>
+        <source>You have more than 16 models in this field, the game may crash.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/GrpScriptList.cpp" line="261"/>
+        <source>You have more than 48 groups in this field, the game may crash.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/GrpScriptList.cpp" line="316"/>
         <source>Delete</source>
         <translation type="unfinished">削除</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="271"/>
+        <location filename="widgets/GrpScriptList.cpp" line="316"/>
         <source>Are you sure you want to remove %1?
 Some scripts can refer to it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="95"/>
+        <location filename="widgets/GrpScriptList.cpp" line="96"/>
         <source>&amp;Group Editor</source>
         <oldsource>Édition des &amp;groupes</oldsource>
         <translation type="unfinished">グループ エディター(&amp;G)</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="98"/>
+        <location filename="widgets/GrpScriptList.cpp" line="99"/>
         <source>Add a group</source>
         <oldsource>Ajouter un groupe</oldsource>
         <translatorcomment>Add a group</translatorcomment>
         <translation type="unfinished">グループの追加</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="274"/>
+        <location filename="widgets/GrpScriptList.cpp" line="319"/>
         <source>the group selected</source>
         <oldsource>le groupe sélectionné</oldsource>
         <translatorcomment>the group selected</translatorcomment>
         <translation type="unfinished">選択グループ</translation>
     </message>
     <message>
-        <location filename="widgets/GrpScriptList.cpp" line="275"/>
+        <location filename="widgets/GrpScriptList.cpp" line="320"/>
         <source>the selected groups</source>
         <oldsource>les groupes sélectionnés</oldsource>
         <translatorcomment>the selected groups</translatorcomment>
@@ -802,8 +979,35 @@
         <translation type="unfinished">モデル ローダー</translation>
     </message>
     <message>
-        <location filename="widgets/ImportDialog.cpp" line="119"/>
-        <source>MIM File (*.MIM);;All Files(*)</source>
+        <location filename="widgets/ImportDialog.cpp" line="53"/>
+        <source> (partial: models and animations are not linked properly)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="54"/>
+        <source> (partial: Z-depth might be a little broken)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="73"/>
+        <source>BSX file:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="147"/>
+        <source>Select the associated BSX file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="148"/>
+        <source>BSX File (*.BSX);;All Files (*)</source>
+        <oldsource>BSX File (*.BSX);;All Files(*)</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ImportDialog.cpp" line="159"/>
+        <source>MIM File (*.MIM);;All Files (*)</source>
+        <oldsource>MIM File (*.MIM);;All Files(*)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -812,19 +1016,20 @@
         <translation type="unfinished">背景</translation>
     </message>
     <message>
-        <location filename="widgets/ImportDialog.cpp" line="53"/>
+        <location filename="widgets/ImportDialog.cpp" line="59"/>
+        <location filename="widgets/ImportDialog.cpp" line="69"/>
         <source>Change</source>
         <oldsource>Changer</oldsource>
         <translation type="unfinished">変更</translation>
     </message>
     <message>
-        <location filename="widgets/ImportDialog.cpp" line="57"/>
+        <location filename="widgets/ImportDialog.cpp" line="63"/>
         <source>MIM file:</source>
         <oldsource>Fichier MIM :</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ImportDialog.cpp" line="119"/>
+        <location filename="widgets/ImportDialog.cpp" line="158"/>
         <source>Select the associated MIM file</source>
         <oldsource>Sélectionner le fichier MIM associé</oldsource>
         <translation type="unfinished"></translation>
@@ -846,193 +1051,218 @@
 <context>
     <name>LgpDialog</name>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="677"/>
+        <source>Rename</source>
+        <oldsource>Renommer</oldsource>
+        <translation type="obsolete">リネーム</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="obsolete">追加</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="obsolete">削除</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="obsolete">保存</translation>
+    </message>
+    <message>
+        <source>Opening error</source>
+        <translation type="obsolete">オープン エラー</translation>
+    </message>
+    <message>
+        <source>Lgp File (*.lgp)</source>
+        <translation type="obsolete">Lgp ファイル (*.lgp)</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="obsolete">キャンセル</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <oldsource>Erreur</oldsource>
+        <translation type="obsolete">エラー</translation>
+    </message>
+</context>
+<context>
+    <name>LgpItemModel</name>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="513"/>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="588"/>
+        <source>Name</source>
+        <oldsource>Nom</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="589"/>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LgpWidget</name>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="680"/>
         <source>LGP archive manager</source>
-        <oldsource>Gestionnaire d&apos;archive LGP</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="688"/>
-        <location filename="widgets/LgpDialog.cpp" line="734"/>
-        <location filename="widgets/LgpDialog.cpp" line="893"/>
+        <location filename="widgets/LgpWidget.cpp" line="691"/>
+        <location filename="widgets/LgpWidget.cpp" line="838"/>
+        <location filename="widgets/LgpWidget.cpp" line="1056"/>
         <source>Rename</source>
-        <oldsource>Renommer</oldsource>
         <translation type="unfinished">リネーム</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="690"/>
+        <location filename="widgets/LgpWidget.cpp" line="693"/>
         <source>Replace</source>
-        <oldsource>Remplacer</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="692"/>
+        <location filename="widgets/LgpWidget.cpp" line="695"/>
         <source>Extract</source>
-        <oldsource>Extraire</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="694"/>
+        <location filename="widgets/LgpWidget.cpp" line="697"/>
+        <source>Extract All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="699"/>
         <source>Add</source>
         <translation type="unfinished">追加</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="696"/>
+        <location filename="widgets/LgpWidget.cpp" line="701"/>
         <source>Delete</source>
         <translation type="unfinished">削除</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="699"/>
-        <source>Save</source>
-        <translation type="unfinished">保存</translation>
-    </message>
-    <message>
-        <location filename="widgets/LgpDialog.cpp" line="734"/>
-        <location filename="widgets/LgpDialog.cpp" line="894"/>
+        <location filename="widgets/LgpWidget.cpp" line="838"/>
+        <location filename="widgets/LgpWidget.cpp" line="1057"/>
         <source>New Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="741"/>
-        <location filename="widgets/LgpDialog.cpp" line="879"/>
+        <location filename="widgets/LgpWidget.cpp" line="845"/>
+        <location filename="widgets/LgpWidget.cpp" line="848"/>
+        <location filename="widgets/LgpWidget.cpp" line="851"/>
+        <location filename="widgets/LgpWidget.cpp" line="888"/>
+        <location filename="widgets/LgpWidget.cpp" line="1002"/>
+        <location filename="widgets/LgpWidget.cpp" line="1041"/>
+        <location filename="widgets/LgpWidget.cpp" line="1046"/>
+        <location filename="widgets/LgpWidget.cpp" line="1067"/>
+        <location filename="widgets/LgpWidget.cpp" line="1091"/>
+        <location filename="widgets/LgpWidget.cpp" line="1119"/>
+        <source>Error</source>
+        <translation type="unfinished">エラー</translation>
+    </message>
+    <message>
+        <location filename="widgets/LgpWidget.cpp" line="845"/>
+        <location filename="widgets/LgpWidget.cpp" line="1042"/>
         <source>The name &apos;%1&apos; is invalid, don&apos;t put special characters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="744"/>
-        <location filename="widgets/LgpDialog.cpp" line="884"/>
+        <location filename="widgets/LgpWidget.cpp" line="848"/>
+        <location filename="widgets/LgpWidget.cpp" line="1047"/>
         <source>A file named &apos;%1&apos; already exists, please choose another name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="747"/>
+        <location filename="widgets/LgpWidget.cpp" line="851"/>
         <source>Can not Rename the file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="777"/>
-        <location filename="widgets/LgpDialog.cpp" line="814"/>
-        <location filename="widgets/LgpDialog.cpp" line="858"/>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="widgets/LgpDialog.cpp" line="785"/>
-        <source>Can not modify the archive!</source>
+        <location filename="widgets/LgpWidget.cpp" line="871"/>
+        <location filename="widgets/LgpWidget.cpp" line="907"/>
+        <source>%1 file (*.%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="829"/>
-        <source>Write error</source>
+        <location filename="widgets/LgpWidget.cpp" line="873"/>
+        <location filename="widgets/LgpWidget.cpp" line="909"/>
+        <location filename="widgets/LgpWidget.cpp" line="1020"/>
+        <source>All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="829"/>
-        <source>Can not write to file (message: %1).</source>
+        <location filename="widgets/LgpWidget.cpp" line="880"/>
+        <location filename="widgets/LgpWidget.cpp" line="1021"/>
+        <source>New File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="834"/>
-        <source>Opening error</source>
-        <translation type="unfinished">オープン エラー</translation>
-    </message>
-    <message>
-        <location filename="widgets/LgpDialog.cpp" line="834"/>
-        <source>Can not open the file (message: %1).</source>
+        <location filename="widgets/LgpWidget.cpp" line="888"/>
+        <source>Can not modify the archive!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="919"/>
-        <source>Delete ?</source>
+        <location filename="widgets/LgpWidget.cpp" line="916"/>
+        <source>Extract file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="930"/>
-        <source>Cannot delete the file!</source>
+        <location filename="widgets/LgpWidget.cpp" line="931"/>
+        <source>Write error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="937"/>
-        <source>Save as</source>
+        <location filename="widgets/LgpWidget.cpp" line="931"/>
+        <source>Can not write to file (message: %1).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="937"/>
-        <source>Lgp File (*.lgp)</source>
-        <translation type="unfinished">Lgp ファイル (*.lgp)</translation>
+        <location filename="widgets/LgpWidget.cpp" line="936"/>
+        <source>Opening error</source>
+        <translation type="unfinished">オープン エラー</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="948"/>
-        <source>Saving...</source>
+        <location filename="widgets/LgpWidget.cpp" line="936"/>
+        <source>Can not open the file (message: %1).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="948"/>
-        <source>Cancel</source>
-        <translation type="unfinished">キャンセル</translation>
-    </message>
-    <message>
-        <location filename="widgets/LgpDialog.cpp" line="961"/>
-        <source>Cannot create the archive (message: %1).</source>
+        <location filename="widgets/LgpWidget.cpp" line="949"/>
+        <source>Extract all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="741"/>
-        <location filename="widgets/LgpDialog.cpp" line="744"/>
-        <location filename="widgets/LgpDialog.cpp" line="747"/>
-        <location filename="widgets/LgpDialog.cpp" line="785"/>
-        <location filename="widgets/LgpDialog.cpp" line="878"/>
-        <location filename="widgets/LgpDialog.cpp" line="883"/>
-        <location filename="widgets/LgpDialog.cpp" line="904"/>
-        <location filename="widgets/LgpDialog.cpp" line="930"/>
-        <location filename="widgets/LgpDialog.cpp" line="961"/>
-        <source>Error</source>
-        <oldsource>Erreur</oldsource>
-        <translation type="unfinished">エラー</translation>
-    </message>
-    <message>
-        <location filename="widgets/LgpDialog.cpp" line="768"/>
-        <location filename="widgets/LgpDialog.cpp" line="805"/>
-        <source>%1 file (*.%1)</source>
-        <oldsource>Fichier %1 (*.%1)</oldsource>
+        <location filename="widgets/LgpWidget.cpp" line="956"/>
+        <source>Extracting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="770"/>
-        <location filename="widgets/LgpDialog.cpp" line="807"/>
-        <location filename="widgets/LgpDialog.cpp" line="857"/>
-        <source>All files (*)</source>
-        <oldsource>Tous les fichiers (*)</oldsource>
-        <translation type="unfinished"></translation>
+        <location filename="widgets/LgpWidget.cpp" line="956"/>
+        <source>Cancel</source>
+        <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="905"/>
+        <location filename="widgets/LgpWidget.cpp" line="1068"/>
         <source>Can not add the file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="920"/>
-        <source>Are you sure you want to delete this file from the archive?</source>
-        <oldsource>Êtes-vous sûr de vouloir supprimer ce fichier de l&apos;archive ?</oldsource>
+        <location filename="widgets/LgpWidget.cpp" line="1081"/>
+        <source>Delete?</source>
+        <oldsource>Delete ?</oldsource>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>LgpItemModel</name>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="510"/>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <location filename="widgets/LgpDialog.cpp" line="585"/>
-        <source>Name</source>
-        <oldsource>Nom</oldsource>
+        <location filename="widgets/LgpWidget.cpp" line="1082"/>
+        <source>Are you sure you want to delete this file from the archive?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/LgpDialog.cpp" line="586"/>
-        <source>Size</source>
+        <location filename="widgets/LgpWidget.cpp" line="1091"/>
+        <source>Cannot delete the file!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1052,12 +1282,12 @@
     <message>
         <location filename="widgets/MassExportDialog.cpp" line="33"/>
         <source>+</source>
-        <translation type="unfinished">+</translation>
+        <translation>+</translation>
     </message>
     <message>
         <location filename="widgets/MassExportDialog.cpp" line="34"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="widgets/MassExportDialog.cpp" line="41"/>
@@ -1081,61 +1311,68 @@
     </message>
     <message>
         <location filename="widgets/MassExportDialog.cpp" line="50"/>
-        <source>Export sounds</source>
+        <source>Export musics</source>
+        <oldsource>Export sounds</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="widgets/MassExportDialog.cpp" line="52"/>
-        <source>AKAO sound</source>
+        <source>AKAO music</source>
+        <oldsource>AKAO sound</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/MassExportDialog.cpp" line="53"/>
+        <source>PSF MIDI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="54"/>
+        <location filename="widgets/MassExportDialog.cpp" line="55"/>
         <source>Export texts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="56"/>
+        <location filename="widgets/MassExportDialog.cpp" line="57"/>
         <source>XML Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="57"/>
+        <location filename="widgets/MassExportDialog.cpp" line="58"/>
         <source>Simple text TXT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="63"/>
+        <location filename="widgets/MassExportDialog.cpp" line="64"/>
         <source>Choose...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="65"/>
+        <location filename="widgets/MassExportDialog.cpp" line="66"/>
         <source>Overwrite existing files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="69"/>
+        <location filename="widgets/MassExportDialog.cpp" line="70"/>
         <source>Export</source>
         <translation type="unfinished">エクスポート</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="78"/>
+        <location filename="widgets/MassExportDialog.cpp" line="79"/>
         <source>Export directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="99"/>
+        <location filename="widgets/MassExportDialog.cpp" line="100"/>
         <source>FIELD File %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="100"/>
+        <location filename="widgets/MassExportDialog.cpp" line="101"/>
         <source>Uncompressed FIELD %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="118"/>
+        <location filename="widgets/MassExportDialog.cpp" line="120"/>
         <source>Choose a directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1146,12 +1383,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="97"/>
+        <location filename="widgets/MassExportDialog.cpp" line="98"/>
         <source>PC</source>
         <translation type="unfinished">PC</translation>
     </message>
     <message>
-        <location filename="widgets/MassExportDialog.cpp" line="97"/>
+        <location filename="widgets/MassExportDialog.cpp" line="98"/>
         <source>PS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1231,7 +1468,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/MassImportDialog.cpp" line="106"/>
+        <location filename="widgets/MassImportDialog.cpp" line="107"/>
         <source>Choose a directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1380,7 +1617,7 @@
     </message>
     <message>
         <location filename="widgets/ModelManagerPC.cpp" line="154"/>
-        <location filename="widgets/ModelManagerPC.cpp" line="407"/>
+        <location filename="widgets/ModelManagerPC.cpp" line="413"/>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
@@ -1421,158 +1658,163 @@
 <context>
     <name>OpcodeList</name>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="28"/>
+        <location filename="widgets/OpcodeList.cpp" line="29"/>
         <source>Action</source>
         <translation>アクション</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="52"/>
+        <location filename="widgets/OpcodeList.cpp" line="53"/>
         <source>Copy</source>
         <oldsource>Copier</oldsource>
         <translation type="unfinished">コピー</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="72"/>
+        <location filename="widgets/OpcodeList.cpp" line="73"/>
         <source>Expand the tree</source>
         <oldsource>Étendre l&apos;arbre</oldsource>
         <translation type="unfinished">ツリーを展く</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="37"/>
+        <location filename="widgets/OpcodeList.cpp" line="38"/>
         <source>Edit</source>
         <translation type="unfinished">編集</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="41"/>
+        <location filename="widgets/OpcodeList.cpp" line="42"/>
         <source>Add</source>
         <translation type="unfinished">追加</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="44"/>
-        <location filename="widgets/OpcodeList.cpp" line="722"/>
+        <location filename="widgets/OpcodeList.cpp" line="45"/>
+        <location filename="widgets/OpcodeList.cpp" line="760"/>
         <source>Delete</source>
         <translation type="unfinished">削除</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="48"/>
+        <location filename="widgets/OpcodeList.cpp" line="49"/>
         <source>Cut</source>
         <translation type="unfinished">切り取り</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="56"/>
+        <location filename="widgets/OpcodeList.cpp" line="57"/>
         <source>Copy text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="60"/>
+        <location filename="widgets/OpcodeList.cpp" line="61"/>
         <source>Paste</source>
         <translation type="unfinished">貼り付け</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="64"/>
+        <location filename="widgets/OpcodeList.cpp" line="65"/>
         <source>Up</source>
         <translation type="unfinished">上に</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="68"/>
+        <location filename="widgets/OpcodeList.cpp" line="69"/>
         <source>Down</source>
         <translation type="unfinished">下に</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="73"/>
+        <location filename="widgets/OpcodeList.cpp" line="74"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="77"/>
+        <location filename="widgets/OpcodeList.cpp" line="78"/>
         <source>Redo</source>
         <oldsource>Refaire</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="81"/>
+        <location filename="widgets/OpcodeList.cpp" line="82"/>
         <source>Edit text</source>
         <oldsource>Modifier texte</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="85"/>
-        <location filename="widgets/OpcodeList.cpp" line="225"/>
+        <location filename="widgets/OpcodeList.cpp" line="86"/>
+        <location filename="widgets/OpcodeList.cpp" line="242"/>
         <source>Disable tree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="227"/>
+        <location filename="widgets/OpcodeList.cpp" line="87"/>
+        <source>Search opcode...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/OpcodeList.cpp" line="244"/>
         <source>Enable tree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="261"/>
+        <location filename="widgets/OpcodeList.cpp" line="278"/>
         <source>Goto label</source>
         <oldsource>Aller au label</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="262"/>
+        <location filename="widgets/OpcodeList.cpp" line="279"/>
         <source>Alt + Click to go to the label</source>
         <oldsource>Alt + clic pour aller au label</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="135"/>
+        <location filename="widgets/OpcodeList.cpp" line="139"/>
         <source>&amp;Script editor</source>
         <oldsource>Édition du &amp;script</oldsource>
         <translation type="unfinished">スクリプト エディター(&amp;S)</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="141"/>
+        <location filename="widgets/OpcodeList.cpp" line="145"/>
         <source>Add line</source>
         <translation type="unfinished">行の追加</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="143"/>
+        <location filename="widgets/OpcodeList.cpp" line="147"/>
         <source>Remove line</source>
         <translation type="unfinished">行の削除</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="146"/>
+        <location filename="widgets/OpcodeList.cpp" line="150"/>
         <source>Move up</source>
         <translation type="unfinished">上へ</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="148"/>
+        <location filename="widgets/OpcodeList.cpp" line="152"/>
         <source>Move down</source>
         <translation type="unfinished">下へ</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="264"/>
+        <location filename="widgets/OpcodeList.cpp" line="281"/>
         <source>Goto script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="265"/>
+        <location filename="widgets/OpcodeList.cpp" line="282"/>
         <source>Alt + Click to go to the script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="421"/>
+        <location filename="widgets/OpcodeList.cpp" line="459"/>
         <source>If this script is run,
  assume that the last non-empty script that runs</source>
         <translation type="unfinished">このスクリプトを実行した場合
 空ではないスクリプトの最後のものが実行されます</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="723"/>
+        <location filename="widgets/OpcodeList.cpp" line="761"/>
         <source>Are you sure you want to delete %1?</source>
         <translation type="unfinished">%1 を削除しますか？</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="725"/>
+        <location filename="widgets/OpcodeList.cpp" line="763"/>
         <source>the selected command</source>
         <translation type="unfinished">選択コマンド</translation>
     </message>
     <message>
-        <location filename="widgets/OpcodeList.cpp" line="726"/>
+        <location filename="widgets/OpcodeList.cpp" line="764"/>
         <source>the selected commands</source>
         <translation type="unfinished">選択したコマンド</translation>
     </message>
@@ -1581,8 +1823,7 @@
     <name>OperationsManager</name>
     <message>
         <location filename="widgets/OperationsManager.cpp" line="23"/>
-        <source>Miscellaneous operations</source>
-        <oldsource>Opérations diverses</oldsource>
+        <source>Batch processing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1592,26 +1833,37 @@
     </message>
     <message>
         <location filename="widgets/OperationsManager.cpp" line="26"/>
-        <source>Disable all texts in the game</source>
+        <source>Autosize all text windows in the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="widgets/OperationsManager.cpp" line="27"/>
-        <source>Disable all battles in the game</source>
+        <source>Disable all texts in the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OperationsManager.cpp" line="29"/>
-        <source>Remove unused data in field model loaders</source>
+        <location filename="widgets/OperationsManager.cpp" line="28"/>
+        <source>Disable all battles in the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="widgets/OperationsManager.cpp" line="30"/>
-        <source>Remove all unused data for field backgrounds</source>
+        <source>Clean unused data in field model loaders</source>
+        <oldsource>Remove all unused data for field backgrounds</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/OperationsManager.cpp" line="34"/>
+        <location filename="widgets/OperationsManager.cpp" line="31"/>
+        <source>Clean unused data for field backgrounds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/OperationsManager.cpp" line="32"/>
+        <source>Repair broken backgrounds (lastmap, fr_e)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/OperationsManager.cpp" line="36"/>
         <source>Apply</source>
         <oldsource>Appliquer</oldsource>
         <translation type="unfinished"></translation>
@@ -1627,793 +1879,872 @@
     </message>
 </context>
 <context>
+    <name>PsfDialog</name>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="21"/>
+        <source>psflib</source>
+        <translation>psflib</translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="23"/>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="25"/>
+        <source>Artist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="27"/>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="29"/>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="31"/>
+        <source>Genre</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="33"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="35"/>
+        <source>Copyright</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="37"/>
+        <source>Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/PsfDialog.cpp" line="62"/>
+        <source>(auto)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
-        <location filename="core/field/Opcode.cpp" line="347"/>
-        <location filename="core/field/Opcode.cpp" line="363"/>
-        <location filename="core/field/Opcode.cpp" line="369"/>
-        <location filename="core/field/Opcode.cpp" line="374"/>
+        <location filename="core/field/Opcode.cpp" line="367"/>
         <location filename="core/field/Opcode.cpp" line="383"/>
         <location filename="core/field/Opcode.cpp" line="389"/>
+        <location filename="core/field/Opcode.cpp" line="394"/>
+        <location filename="core/field/Opcode.cpp" line="403"/>
+        <location filename="core/field/Opcode.cpp" line="409"/>
         <source>No%1</source>
         <oldsource>n°%1</oldsource>
         <translatorcomment>No%1</translatorcomment>
         <translation>No.%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="464"/>
+        <location filename="core/field/Opcode.cpp" line="483"/>
         <source>Pan transitions (channel #4)</source>
         <oldsource>Tempo transitions sur tous les canaux</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="472"/>
+        <location filename="core/field/Opcode.cpp" line="491"/>
         <source>Tempo transitions (channel #4)</source>
         <oldsource>Transition sur le tempo de la musique</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1368"/>
+        <location filename="core/field/Opcode.cpp" line="1394"/>
         <source>Label %1</source>
         <translation type="unfinished">レイヤー %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3377"/>
+        <location filename="core/field/Opcode.cpp" line="3488"/>
         <source>main (parameter %1)</source>
         <oldsource>%1? (paramètre %2)</oldsource>
         <translatorcomment>%1? (parameter %2)</translatorcomment>
         <translation>メイン (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2225"/>
+        <location filename="core/field/Opcode.cpp" line="2318"/>
         <source>LIGHT</source>
         <translation type="unfinished">LIGHT</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="418"/>
+        <location filename="core/field/Opcode.cpp" line="438"/>
         <source>Play music [param1: music ID, 0-based]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="421"/>
+        <location filename="core/field/Opcode.cpp" line="440"/>
         <source>Play music and resume from last position [param1: music ID, 0-based]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="423"/>
+        <location filename="core/field/Opcode.cpp" line="442"/>
         <source>Play a sound effect (will be terminated if another effect is played on channel) [param1: panning, param2: effect ID]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="427"/>
+        <location filename="core/field/Opcode.cpp" line="446"/>
         <source>Play a sound effect (will be terminated if another effect is played on channel) [param1: panning, param2: effect ID, param3: ?]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="431"/>
+        <location filename="core/field/Opcode.cpp" line="450"/>
         <source>Play a sound effect (will be terminated if another effect is played on channel) [param1: panning, param2: effect ID, param3: ?, param4: ?]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="435"/>
+        <location filename="core/field/Opcode.cpp" line="454"/>
         <source>Play a sound effect (will be terminated if another effect is played on channel) [param1: panning, param2: effect ID, param3: ?, param4: ?, param5: ?]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="438"/>
+        <location filename="core/field/Opcode.cpp" line="457"/>
         <source>Play a sound effect on channel #1 [param1: panning, param2: effect ID]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="439"/>
+        <location filename="core/field/Opcode.cpp" line="458"/>
         <source>Play a sound effect on channel #2 [param1: panning, param2: effect ID]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="440"/>
+        <location filename="core/field/Opcode.cpp" line="459"/>
         <source>Play a sound effect on channel #3 [param1: panning, param2: effect ID]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="441"/>
+        <location filename="core/field/Opcode.cpp" line="460"/>
         <source>Play a sound effect on channel #4 [param1: panning, param2: effect ID]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="442"/>
+        <location filename="core/field/Opcode.cpp" line="461"/>
         <source>Play a sound effect (cannot be stopped) [param1: effect ID]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="453"/>
+        <location filename="core/field/Opcode.cpp" line="472"/>
         <source>Volume transitions (channel #1) [param1: transition time, param2: target volume]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="454"/>
+        <location filename="core/field/Opcode.cpp" line="473"/>
         <source>Volume transitions (channel #2) [param1: transition time, param2: target volume]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="455"/>
+        <location filename="core/field/Opcode.cpp" line="474"/>
         <source>Volume transitions (channel #3) [param1: transition time, param2: target volume]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="456"/>
+        <location filename="core/field/Opcode.cpp" line="475"/>
         <source>Volume transitions (channel #4) [param1: transition time, param2: target volume]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="473"/>
+        <location filename="core/field/Opcode.cpp" line="492"/>
         <source>Volume control for all channels [param1: volume]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="474"/>
+        <location filename="core/field/Opcode.cpp" line="493"/>
         <source>Volume transitions for all channels [param1: transition time, param2: target volume]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="479"/>
+        <location filename="core/field/Opcode.cpp" line="498"/>
         <source>Set music volume [param1: volume]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="480"/>
+        <location filename="core/field/Opcode.cpp" line="499"/>
         <source>Music volume transition [param1: transition time, param2: target volume]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="482"/>
+        <location filename="core/field/Opcode.cpp" line="501"/>
         <source>Set music pan (noop in PC version)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="483"/>
+        <location filename="core/field/Opcode.cpp" line="502"/>
         <source>Music pan transition (noop in PC version)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="484"/>
+        <location filename="core/field/Opcode.cpp" line="503"/>
         <source>Music pan fade (noop in PC version)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="485"/>
+        <location filename="core/field/Opcode.cpp" line="504"/>
         <source>Set music tempo [param1: tempo, 0x20 is normal]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2265"/>
+        <location filename="core/field/Opcode.cpp" line="2358"/>
         <source>SBOBJ</source>
         <translation type="unfinished">SBOBJ</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2295"/>
+        <location filename="core/field/Opcode.cpp" line="2388"/>
         <source>SHINE</source>
         <translation type="unfinished">SHINE</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2305"/>
+        <location filename="core/field/Opcode.cpp" line="2398"/>
         <source>RESET</source>
         <translation type="unfinished">RESET</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3371"/>
+        <location filename="core/field/Opcode.cpp" line="3482"/>
         <source>Exit program (parameter %1)</source>
         <oldsource>? (paramètre %1)</oldsource>
         <translatorcomment>? (parameter %1)</translatorcomment>
         <translation>プログラムの終了 (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3372"/>
+        <location filename="core/field/Opcode.cpp" line="3483"/>
         <source>Encount Error (parameter %1)</source>
         <oldsource>HPs à 1 (paramètre %1)</oldsource>
         <translatorcomment>エンカウント エラー (パラメータ %1)</translatorcomment>
         <translation>エンカウント エラー (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3387"/>
+        <location filename="core/field/Opcode.cpp" line="3498"/>
         <source>Check if %1 and store the result in var[15][111]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7091"/>
+        <location filename="core/field/Opcode.cpp" line="7209"/>
         <source>Create line (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7139"/>
+        <location filename="core/field/Opcode.cpp" line="7257"/>
         <source>%1 line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7140"/>
+        <location filename="core/field/Opcode.cpp" line="7258"/>
         <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7140"/>
+        <location filename="core/field/Opcode.cpp" line="7258"/>
         <source>Disable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7187"/>
+        <location filename="core/field/Opcode.cpp" line="7305"/>
         <source>Set line (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8079"/>
+        <location filename="core/field/Opcode.cpp" line="8214"/>
         <source>CPPAL2 %1</source>
         <translation type="unfinished">CPPAL2 %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8100"/>
+        <location filename="core/field/Opcode.cpp" line="8235"/>
         <source>RTPAL2 %1</source>
         <translation type="unfinished">RTPAL2 %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8121"/>
+        <location filename="core/field/Opcode.cpp" line="8256"/>
         <source>ADPAL2 %1</source>
         <translation type="unfinished">ADPAL2 %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8142"/>
+        <location filename="core/field/Opcode.cpp" line="8277"/>
         <source>Play music #%1</source>
         <translation>BGM #%1 を再生</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8165"/>
+        <location filename="core/field/Opcode.cpp" line="8300"/>
         <source>Play sound #%1 (position=%2/127)</source>
         <translation>効果音 #%1 を再生 (位置=%2/127)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8251"/>
+        <location filename="core/field/Opcode.cpp" line="8403"/>
         <source>MUSVT (music #%1)</source>
         <translation>MUSVT (BGM #%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8272"/>
+        <location filename="core/field/Opcode.cpp" line="8424"/>
         <source>MUSVM (music #%1)</source>
         <translation>MUSVM (BGM #%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8293"/>
+        <location filename="core/field/Opcode.cpp" line="8445"/>
         <source>%1 music</source>
         <translation>BGM を%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8294"/>
+        <location filename="core/field/Opcode.cpp" line="8446"/>
         <source>Unlock</source>
         <translation>アンロック</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8294"/>
+        <location filename="core/field/Opcode.cpp" line="8446"/>
         <source>Lock</source>
         <comment>test</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8314"/>
+        <location filename="core/field/Opcode.cpp" line="8466"/>
         <source>Set the music #%1 for next battle</source>
         <translation>次のバトル BGM に #%1 をセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8337"/>
+        <location filename="core/field/Opcode.cpp" line="8489"/>
         <source>CHMPH: Save (unknown) in %1 and (unknown) in %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8370"/>
+        <location filename="core/field/Opcode.cpp" line="8522"/>
         <source>Set next movie: %1</source>
         <translation>次のムービーをセット : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8385"/>
+        <location filename="core/field/Opcode.cpp" line="8537"/>
         <source>Play movie</source>
         <translation>ムービーを再生</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8401"/>
+        <location filename="core/field/Opcode.cpp" line="8553"/>
         <source>Save Movie frame in %1</source>
         <translation>ムービー フレームを %1 に保存</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8430"/>
+        <location filename="core/field/Opcode.cpp" line="8582"/>
         <source>Camera Movie: %1</source>
         <translation>カメラ ムービー : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8451"/>
+        <location filename="core/field/Opcode.cpp" line="8603"/>
         <source>FMUSC (?=%1)</source>
         <translation type="unfinished">FMUSC (?=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="566"/>
+        <location filename="core/field/Opcode.cpp" line="586"/>
         <source>normal</source>
         <translatorcomment>normal</translatorcomment>
         <translation>ノーマル</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1553"/>
-        <location filename="core/field/Opcode.cpp" line="1595"/>
-        <location filename="core/field/Opcode.cpp" line="1639"/>
-        <location filename="core/field/Opcode.cpp" line="1695"/>
-        <location filename="core/field/Opcode.cpp" line="1750"/>
-        <location filename="core/field/Opcode.cpp" line="1806"/>
-        <location filename="core/field/Opcode.cpp" line="2661"/>
-        <location filename="core/field/Opcode.cpp" line="2680"/>
-        <location filename="core/field/Opcode.cpp" line="2699"/>
-        <location filename="core/field/Opcode.cpp" line="6990"/>
-        <location filename="core/field/Opcode.cpp" line="7004"/>
+        <location filename="core/field/Opcode.cpp" line="1579"/>
+        <location filename="core/field/Opcode.cpp" line="1621"/>
+        <location filename="core/field/Opcode.cpp" line="1665"/>
+        <location filename="core/field/Opcode.cpp" line="1721"/>
+        <location filename="core/field/Opcode.cpp" line="1776"/>
+        <location filename="core/field/Opcode.cpp" line="1832"/>
+        <location filename="core/field/Opcode.cpp" line="1921"/>
+        <location filename="core/field/Opcode.cpp" line="2762"/>
+        <location filename="core/field/Opcode.cpp" line="2781"/>
+        <location filename="core/field/Opcode.cpp" line="2800"/>
+        <location filename="core/field/Opcode.cpp" line="7108"/>
+        <location filename="core/field/Opcode.cpp" line="7122"/>
         <source>else goto label %1</source>
         <oldsource>aller au label %1 sinon</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1258"/>
+        <location filename="core/field/Opcode.cpp" line="1278"/>
         <source>SPECIAL - </source>
         <translatorcomment>SPECIAL - </translatorcomment>
         <translation>SPECIAL -</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2065"/>
-        <location filename="core/field/Opcode.cpp" line="2086"/>
-        <location filename="core/field/Opcode.cpp" line="2427"/>
-        <location filename="core/field/Opcode.cpp" line="7161"/>
+        <location filename="core/field/Opcode.cpp" line="2158"/>
+        <location filename="core/field/Opcode.cpp" line="2179"/>
+        <location filename="core/field/Opcode.cpp" line="2520"/>
+        <location filename="core/field/Opcode.cpp" line="7279"/>
         <source>ON</source>
         <translatorcomment>許可</translatorcomment>
         <translation>オン</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2065"/>
-        <location filename="core/field/Opcode.cpp" line="2086"/>
-        <location filename="core/field/Opcode.cpp" line="2427"/>
-        <location filename="core/field/Opcode.cpp" line="7161"/>
+        <location filename="core/field/Opcode.cpp" line="2158"/>
+        <location filename="core/field/Opcode.cpp" line="2179"/>
+        <location filename="core/field/Opcode.cpp" line="2520"/>
+        <location filename="core/field/Opcode.cpp" line="7279"/>
         <source>OFF</source>
         <translatorcomment>禁止</translatorcomment>
         <translation>オフ</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2085"/>
+        <location filename="core/field/Opcode.cpp" line="2178"/>
         <source>BGMOVIE : %1</source>
         <translation>BGMOVIE : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2426"/>
+        <location filename="core/field/Opcode.cpp" line="2519"/>
         <source>SLIP : %1</source>
         <translatorcomment>SLIP: %1</translatorcomment>
         <translation>SLIP: %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4322"/>
+        <location filename="core/field/Opcode.cpp" line="4440"/>
         <source>MPDSP : %1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5003"/>
+        <location filename="core/field/Opcode.cpp" line="5121"/>
         <source>Seed Random Generator : %1</source>
         <translatorcomment>Seed Random Generator: %1</translatorcomment>
         <translation>乱数ジェネレータをシード: %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5491"/>
+        <location filename="core/field/Opcode.cpp" line="5609"/>
         <source>%1 = %2 &amp; 0xFF (low byte)</source>
         <translation>%1 = %2 &amp; 0xFF (下位バイト)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5508"/>
+        <location filename="core/field/Opcode.cpp" line="5626"/>
         <source>%1 = (%2 &gt;&gt; 8) &amp; 0xFF (high byte)</source>
         <translation>%1 = (%2 &gt;&gt; 8) &amp; 0xFF (上位バイト)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5529"/>
+        <location filename="core/field/Opcode.cpp" line="5647"/>
         <source>%1 = (%2 &amp; 0xFF) | ((%3 &amp; 0xFF) &lt;&lt; 8)</source>
         <translation>%1 = (%2 &amp; 0xFF) | ((%3 &amp; 0xFF) &lt;&lt; 8)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7240"/>
+        <location filename="core/field/Opcode.cpp" line="7358"/>
         <source>%4 = ((Sinus(%1) * %2) + %3) &gt;&gt; 12</source>
         <translation>%4 = ((サイン (%1) * %2) + %3) &gt;&gt; 12</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7285"/>
+        <location filename="core/field/Opcode.cpp" line="7403"/>
         <source>%4 = ((Cosinus(%1) * %2) + %3) &gt;&gt; 12</source>
         <translation>%4 = ((コサイン (%1) * %2) + %3) &gt;&gt; 12</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7386"/>
+        <location filename="core/field/Opcode.cpp" line="7504"/>
         <source>Preload the field map %1</source>
         <translation>フィールド マップ %1 の先読み</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7401"/>
+        <location filename="core/field/Opcode.cpp" line="7519"/>
         <source>PMJMP2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7469"/>
+        <location filename="core/field/Opcode.cpp" line="7604"/>
         <source>%1 rotation</source>
         <translation>回転を %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="329"/>
+        <location filename="core/field/Opcode.cpp" line="349"/>
         <source> (No%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="330"/>
+        <location filename="core/field/Opcode.cpp" line="350"/>
         <source>? (No%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="341"/>
+        <location filename="core/field/Opcode.cpp" line="361"/>
         <source>(no text)</source>
         <translation>(テキストなし)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="380"/>
+        <location filename="core/field/Opcode.cpp" line="400"/>
         <source>%1 (#%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="397"/>
+        <location filename="core/field/Opcode.cpp" line="417"/>
         <source>%1 (disc %2)</source>
         <translation>%1 (ディスク %2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="443"/>
+        <location filename="core/field/Opcode.cpp" line="462"/>
         <source>Resumes music and sound effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="444"/>
+        <location filename="core/field/Opcode.cpp" line="463"/>
         <source>Pauses music and sound effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="445"/>
+        <location filename="core/field/Opcode.cpp" line="464"/>
         <source>Resumes only the music</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="446"/>
+        <location filename="core/field/Opcode.cpp" line="465"/>
         <source>Pauses only the music</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="447"/>
+        <location filename="core/field/Opcode.cpp" line="466"/>
         <source>Resumes only sound effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="448"/>
+        <location filename="core/field/Opcode.cpp" line="467"/>
         <source>Pauses only sound effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="457"/>
+        <location filename="core/field/Opcode.cpp" line="468"/>
+        <source>Volume control (channel #1) [param1: volume]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="469"/>
+        <source>Volume control (channel #2) [param1: volume]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="470"/>
+        <source>Volume control (channel #3) [param1: volume]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="471"/>
+        <source>Volume control (channel #4) [param1: volume]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="476"/>
         <source>Pan control (channel #1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="458"/>
+        <location filename="core/field/Opcode.cpp" line="477"/>
         <source>Pan control (channel #2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="459"/>
+        <location filename="core/field/Opcode.cpp" line="478"/>
         <source>Pan control (channel #3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="460"/>
+        <location filename="core/field/Opcode.cpp" line="479"/>
         <source>Pan control (channel #4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="461"/>
+        <location filename="core/field/Opcode.cpp" line="480"/>
         <source>Pan transitions (channel #1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="462"/>
+        <location filename="core/field/Opcode.cpp" line="481"/>
         <source>Pan transitions (channel #2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="463"/>
+        <location filename="core/field/Opcode.cpp" line="482"/>
         <source>Pan transitions (channel #3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="465"/>
+        <location filename="core/field/Opcode.cpp" line="484"/>
         <source>Tempo control (channel #1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="466"/>
+        <location filename="core/field/Opcode.cpp" line="485"/>
         <source>Tempo control (channel #2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="467"/>
+        <location filename="core/field/Opcode.cpp" line="486"/>
         <source>Tempo control (channel #3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="468"/>
+        <location filename="core/field/Opcode.cpp" line="487"/>
         <source>Tempo control (channel #4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="469"/>
+        <location filename="core/field/Opcode.cpp" line="488"/>
         <source>Tempo transitions (channel #1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="470"/>
+        <location filename="core/field/Opcode.cpp" line="489"/>
         <source>Tempo transitions (channel #2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="471"/>
+        <location filename="core/field/Opcode.cpp" line="490"/>
         <source>Tempo transitions (channel #3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="475"/>
+        <location filename="core/field/Opcode.cpp" line="494"/>
         <source>Pan control for all channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="476"/>
+        <location filename="core/field/Opcode.cpp" line="495"/>
         <source>Pan transitions for all channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="477"/>
+        <location filename="core/field/Opcode.cpp" line="496"/>
         <source>Tempo control for all channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="478"/>
+        <location filename="core/field/Opcode.cpp" line="497"/>
         <source>Tempo transitions for all channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="481"/>
+        <location filename="core/field/Opcode.cpp" line="500"/>
         <source>Fade music volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="486"/>
+        <location filename="core/field/Opcode.cpp" line="505"/>
         <source>Music tempo transition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="487"/>
+        <location filename="core/field/Opcode.cpp" line="506"/>
         <source>Music tempo fade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="488"/>
+        <location filename="core/field/Opcode.cpp" line="507"/>
+        <source>Stop music-like (noop in PC version)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="508"/>
         <source>Stop music</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="489"/>
+        <location filename="core/field/Opcode.cpp" line="509"/>
         <source>Stop sound effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="494"/>
+        <location filename="core/field/Opcode.cpp" line="514"/>
         <source>AKAO: %1?</source>
         <translation>AKAO: %1?</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="531"/>
+        <location filename="core/field/Opcode.cpp" line="551"/>
         <source>%1 and %2 and %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="541"/>
+        <location filename="core/field/Opcode.cpp" line="561"/>
         <source>(Empty)</source>
         <translation type="unfinished">(なし)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="553"/>
+        <location filename="core/field/Opcode.cpp" line="573"/>
         <source>Top Left</source>
         <translation>左上</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="554"/>
+        <location filename="core/field/Opcode.cpp" line="574"/>
         <source>Bottom Left</source>
         <translation>左下</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="555"/>
+        <location filename="core/field/Opcode.cpp" line="575"/>
         <source>Top Right</source>
         <translation>右上</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="556"/>
+        <location filename="core/field/Opcode.cpp" line="576"/>
         <source>Bottom Right</source>
         <translation>右下</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="564"/>
-        <location filename="core/field/Opcode.cpp" line="565"/>
+        <location filename="core/field/Opcode.cpp" line="584"/>
+        <location filename="core/field/Opcode.cpp" line="585"/>
         <source>reverse</source>
         <translation>反転</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="601"/>
+        <location filename="core/field/Opcode.cpp" line="621"/>
         <source>? (ID=%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="621"/>
+        <location filename="core/field/Opcode.cpp" line="641"/>
         <source>Return</source>
         <translation>リターン</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="655"/>
+        <location filename="core/field/Opcode.cpp" line="675"/>
         <source>Execute script #%3 in extern group %1 (priority %2/6) - Only if the script is not already running</source>
         <translation>グループ %1 のスクリプト #%3 を実行 (優先度 %2/6) - スクリプトが実行されていない場合のみ</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="673"/>
+        <location filename="core/field/Opcode.cpp" line="693"/>
         <source>Execute script #%3 in extern group %1 (priority %2/6)</source>
         <translation>グループ %1 のスクリプト #%3 を実行 (優先度 %2/6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="691"/>
+        <location filename="core/field/Opcode.cpp" line="711"/>
         <source>Execute script #%3 in group %1 (priority %2/6) - Waiting for end of execution to continue</source>
         <translation>外部グループ %1 のスクリプト #%3 を実行 (優先度 %2/6) - 完了してから次へ</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="728"/>
+        <location filename="core/field/Opcode.cpp" line="748"/>
         <source>Execute script #%3 in extern group associated with the character #%1 in the current party (priority %2/6) - Only if the script is not already running</source>
         <translation>現在のパーティのキャラクター #%1 のグループのスクリプト #%3 を実行 (優先度 %2/6) - スクリプトが実行されていない場合のみ</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="746"/>
+        <location filename="core/field/Opcode.cpp" line="766"/>
         <source>Execute script #%3 in extern group associated with the character #%1 in the current party (priority %2/6)</source>
         <translation>現在のパーティのキャラクター #%1 のグループのスクリプト #%3 を実行 (優先度 %2/6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="764"/>
+        <location filename="core/field/Opcode.cpp" line="784"/>
         <source>Execute script #%3 in group associated with the character #%1 in the current party (priority %2/6) - Waiting for end of execution to continue</source>
         <translation>現在のパーティのキャラクター #%1 のグループのスクリプト #%3 を実行 (優先度 %2/6) - 完了したら次へ</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="783"/>
+        <location filename="core/field/Opcode.cpp" line="803"/>
         <source>Return and execute script #%2 from the appellant group (Priority %1/6)</source>
         <translation>リターンして呼び出したグループのスクリプト #%2 を実行 (優先度 %1/6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="806"/>
+        <location filename="core/field/Opcode.cpp" line="826"/>
         <source>Join party field (speed=%1)</source>
         <translation>パーティ合流フィールド (速度=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="836"/>
+        <location filename="core/field/Opcode.cpp" line="856"/>
         <source>Split party field (member 1: X=%1, Y=%2, dir=%3 ; member 2 : X=%4, Y=%5, dir=%6) (speed %7)</source>
         <translation>メンバー分割フィールド (メンバー 1: X=%1, Y=%2, dir=%3 ; メンバー 2 : X=%4, Y=%5, dir=%6) (速度 %7)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="920"/>
+        <location filename="core/field/Opcode.cpp" line="940"/>
         <source>Set party from memory: %1 | %2 | %3</source>
         <translation>パーティをメモリからセット: %1 | %2 | %3</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="938"/>
+        <location filename="core/field/Opcode.cpp" line="958"/>
         <source>Get party from memory: %1 | %2 | %3</source>
         <translation>パーティをメモリに送る: %1 | %2 | %3</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="966"/>
+        <location filename="core/field/Opcode.cpp" line="986"/>
         <source>Ask for disc %1</source>
         <translation>ディスク %1 の確認</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="992"/>
+        <location filename="core/field/Opcode.cpp" line="1012"/>
         <source>%1 arrow</source>
         <translation type="unfinished">カーソルを %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="993"/>
-        <location filename="core/field/Opcode.cpp" line="5760"/>
+        <location filename="core/field/Opcode.cpp" line="1013"/>
+        <location filename="core/field/Opcode.cpp" line="5878"/>
         <source>Display</source>
         <translation>表示</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="993"/>
-        <location filename="core/field/Opcode.cpp" line="5760"/>
+        <location filename="core/field/Opcode.cpp" line="1013"/>
+        <location filename="core/field/Opcode.cpp" line="5878"/>
         <source>Hide</source>
         <translation>隠す</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1019"/>
+        <location filename="core/field/Opcode.cpp" line="1039"/>
         <source>PNAME - Disable right menu (%1)</source>
         <translation>PNAME - 右のメニューを無効化 (%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1045"/>
+        <location filename="core/field/Opcode.cpp" line="1065"/>
         <source>Set game speed (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1072"/>
+        <location filename="core/field/Opcode.cpp" line="1092"/>
         <source>Set field message speed (%2) | %1 |</source>
         <translation>フィールド メッセージ速度をセット (%2) | %1 |</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1095"/>
+        <location filename="core/field/Opcode.cpp" line="1115"/>
         <source>Fill materia menu with all materias in full quantity</source>
         <translation>マテリア メニューのマテリアを最大数に</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1109"/>
+        <location filename="core/field/Opcode.cpp" line="1129"/>
         <source>Fills all available item entries in full quantity</source>
         <translation>すべての使用可能な所持アイテムを最大化</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1130"/>
+        <location filename="core/field/Opcode.cpp" line="1150"/>
         <source>%1 battles</source>
         <translation type="unfinished">バトルを %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1131"/>
-        <location filename="core/field/Opcode.cpp" line="1157"/>
-        <location filename="core/field/Opcode.cpp" line="2151"/>
-        <location filename="core/field/Opcode.cpp" line="2715"/>
-        <location filename="core/field/Opcode.cpp" line="4443"/>
-        <location filename="core/field/Opcode.cpp" line="4562"/>
-        <location filename="core/field/Opcode.cpp" line="4982"/>
-        <location filename="core/field/Opcode.cpp" line="6887"/>
-        <location filename="core/field/Opcode.cpp" line="7470"/>
+        <location filename="core/field/Opcode.cpp" line="1151"/>
+        <location filename="core/field/Opcode.cpp" line="1177"/>
+        <location filename="core/field/Opcode.cpp" line="2244"/>
+        <location filename="core/field/Opcode.cpp" line="2816"/>
+        <location filename="core/field/Opcode.cpp" line="4561"/>
+        <location filename="core/field/Opcode.cpp" line="4680"/>
+        <location filename="core/field/Opcode.cpp" line="5100"/>
+        <location filename="core/field/Opcode.cpp" line="7005"/>
+        <location filename="core/field/Opcode.cpp" line="7605"/>
         <source>Activate</source>
         <translation>有効化</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1131"/>
-        <location filename="core/field/Opcode.cpp" line="1157"/>
-        <location filename="core/field/Opcode.cpp" line="2151"/>
-        <location filename="core/field/Opcode.cpp" line="2715"/>
-        <location filename="core/field/Opcode.cpp" line="4443"/>
-        <location filename="core/field/Opcode.cpp" line="4562"/>
-        <location filename="core/field/Opcode.cpp" line="4982"/>
-        <location filename="core/field/Opcode.cpp" line="6887"/>
-        <location filename="core/field/Opcode.cpp" line="7470"/>
+        <location filename="core/field/Opcode.cpp" line="1151"/>
+        <location filename="core/field/Opcode.cpp" line="1177"/>
+        <location filename="core/field/Opcode.cpp" line="2244"/>
+        <location filename="core/field/Opcode.cpp" line="2816"/>
+        <location filename="core/field/Opcode.cpp" line="4561"/>
+        <location filename="core/field/Opcode.cpp" line="4680"/>
+        <location filename="core/field/Opcode.cpp" line="5100"/>
+        <location filename="core/field/Opcode.cpp" line="7005"/>
+        <location filename="core/field/Opcode.cpp" line="7605"/>
         <source>Deactivate</source>
         <translation>無効化</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1156"/>
+        <location filename="core/field/Opcode.cpp" line="1176"/>
         <source>%1 movies</source>
         <translation>ムービーを %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1183"/>
+        <location filename="core/field/Opcode.cpp" line="1203"/>
         <source>Change name of %1 by text %2</source>
         <translation>%1 の名前をテキスト %2 に変更</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1216"/>
+        <location filename="core/field/Opcode.cpp" line="1236"/>
         <source>Set game time to 0, unlock &quot;PHS&quot; and Save menu. New party: Cloud | (empty) | (empty)</source>
         <translation>プレイ時間を 0 に, PHS とセーブを有効化, 新しいパーティ クラウド | (空き) | (空き)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1230"/>
+        <location filename="core/field/Opcode.cpp" line="1250"/>
         <source>Remove all items</source>
         <translation>すべてのアイテムを削除</translation>
     </message>
     <message numerus="yes">
-        <location filename="core/field/Opcode.cpp" line="1400"/>
-        <location filename="core/field/Opcode.cpp" line="1431"/>
+        <location filename="core/field/Opcode.cpp" line="1426"/>
+        <location filename="core/field/Opcode.cpp" line="1457"/>
         <source>Forward %n byte(s)</source>
         <comment>With plural</comment>
         <translation type="unfinished">
@@ -2421,16 +2752,16 @@
         </translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1401"/>
-        <location filename="core/field/Opcode.cpp" line="1432"/>
-        <location filename="core/field/Opcode.cpp" line="1461"/>
-        <location filename="core/field/Opcode.cpp" line="1492"/>
+        <location filename="core/field/Opcode.cpp" line="1427"/>
+        <location filename="core/field/Opcode.cpp" line="1458"/>
+        <location filename="core/field/Opcode.cpp" line="1487"/>
+        <location filename="core/field/Opcode.cpp" line="1518"/>
         <source>Goto label %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="core/field/Opcode.cpp" line="1460"/>
-        <location filename="core/field/Opcode.cpp" line="1491"/>
+        <location filename="core/field/Opcode.cpp" line="1486"/>
+        <location filename="core/field/Opcode.cpp" line="1517"/>
         <source>Back %n byte(s)</source>
         <comment>With plural</comment>
         <translation type="unfinished">
@@ -2438,27 +2769,28 @@
         </translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1547"/>
-        <location filename="core/field/Opcode.cpp" line="1589"/>
-        <location filename="core/field/Opcode.cpp" line="1633"/>
-        <location filename="core/field/Opcode.cpp" line="1689"/>
-        <location filename="core/field/Opcode.cpp" line="1744"/>
-        <location filename="core/field/Opcode.cpp" line="1800"/>
+        <location filename="core/field/Opcode.cpp" line="1573"/>
+        <location filename="core/field/Opcode.cpp" line="1615"/>
+        <location filename="core/field/Opcode.cpp" line="1659"/>
+        <location filename="core/field/Opcode.cpp" line="1715"/>
+        <location filename="core/field/Opcode.cpp" line="1770"/>
+        <location filename="core/field/Opcode.cpp" line="1826"/>
         <source>If %1 %3 %2 (%4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="core/field/Opcode.cpp" line="1552"/>
-        <location filename="core/field/Opcode.cpp" line="1594"/>
-        <location filename="core/field/Opcode.cpp" line="1638"/>
-        <location filename="core/field/Opcode.cpp" line="1694"/>
-        <location filename="core/field/Opcode.cpp" line="1749"/>
-        <location filename="core/field/Opcode.cpp" line="1805"/>
-        <location filename="core/field/Opcode.cpp" line="2660"/>
-        <location filename="core/field/Opcode.cpp" line="2679"/>
-        <location filename="core/field/Opcode.cpp" line="2698"/>
-        <location filename="core/field/Opcode.cpp" line="6989"/>
-        <location filename="core/field/Opcode.cpp" line="7003"/>
+        <location filename="core/field/Opcode.cpp" line="1578"/>
+        <location filename="core/field/Opcode.cpp" line="1620"/>
+        <location filename="core/field/Opcode.cpp" line="1664"/>
+        <location filename="core/field/Opcode.cpp" line="1720"/>
+        <location filename="core/field/Opcode.cpp" line="1775"/>
+        <location filename="core/field/Opcode.cpp" line="1831"/>
+        <location filename="core/field/Opcode.cpp" line="1920"/>
+        <location filename="core/field/Opcode.cpp" line="2761"/>
+        <location filename="core/field/Opcode.cpp" line="2780"/>
+        <location filename="core/field/Opcode.cpp" line="2799"/>
+        <location filename="core/field/Opcode.cpp" line="7107"/>
+        <location filename="core/field/Opcode.cpp" line="7121"/>
         <source>else forward %n byte(s)</source>
         <comment>With plural</comment>
         <translation type="unfinished">
@@ -2466,453 +2798,493 @@
         </translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1851"/>
-        <location filename="core/field/Opcode.cpp" line="3378"/>
+        <location filename="core/field/Opcode.cpp" line="1875"/>
+        <source>8 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1876"/>
+        <source>16 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1877"/>
+        <source>24 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1878"/>
+        <source>32 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1883"/>
+        <source>From is a pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1887"/>
+        <source>To is a pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1890"/>
+        <source>Write/Read entire savemap (from=%1, to=%2, absValue=%3, flags={%4})</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1918"/>
+        <source>If Red XIII is named Nanaki (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Opcode.cpp" line="1944"/>
+        <location filename="core/field/Opcode.cpp" line="3489"/>
         <source>Bike (parameter %1)</source>
         <translation>バイク (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1852"/>
+        <location filename="core/field/Opcode.cpp" line="1945"/>
         <source>Chocobo Races (parameter %1)</source>
         <translation>チョコボ レース (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1853"/>
+        <location filename="core/field/Opcode.cpp" line="1946"/>
         <source>Snowboard -normal mode- (parameter %1)</source>
         <translation>スノーボード・アイシクル (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1854"/>
+        <location filename="core/field/Opcode.cpp" line="1947"/>
         <source>Fort Condor (parameter %1)</source>
         <translation>コンドルフォート (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1855"/>
+        <location filename="core/field/Opcode.cpp" line="1948"/>
         <source>Submarine (parameter %1)</source>
         <translation>潜水艦 (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1856"/>
+        <location filename="core/field/Opcode.cpp" line="1949"/>
         <source>Speed Square (parameter %1)</source>
         <translation>スピードスクエア (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1857"/>
+        <location filename="core/field/Opcode.cpp" line="1950"/>
         <source>Snowboard -Gold Saucer mode- (parameter %1)</source>
         <translation>スノーボード・ゴールドソーサー (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1858"/>
-        <location filename="core/field/Opcode.cpp" line="3392"/>
+        <location filename="core/field/Opcode.cpp" line="1951"/>
+        <location filename="core/field/Opcode.cpp" line="3503"/>
         <source>%1? (parameter %2)</source>
         <translation>%1? (パラメータ %2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1861"/>
+        <location filename="core/field/Opcode.cpp" line="1954"/>
         <source>Mini-game: %5 (After the game goto field %1 (X=%2, Y=%3, triangle ID=%4))</source>
         <translation>ミニゲーム: %5 (ゲームがフィールド %1 (X=%2, Y=%3, ポリゴンID=%4) に達したとき)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1892"/>
+        <location filename="core/field/Opcode.cpp" line="1985"/>
         <source>Tutorial #%1</source>
         <translation>解説 No.%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1930"/>
-        <location filename="core/field/Opcode.cpp" line="4589"/>
+        <location filename="core/field/Opcode.cpp" line="2023"/>
+        <location filename="core/field/Opcode.cpp" line="4707"/>
         <source>Countdown</source>
         <translation>カウントダウン</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1931"/>
-        <location filename="core/field/Opcode.cpp" line="4590"/>
+        <location filename="core/field/Opcode.cpp" line="2024"/>
+        <location filename="core/field/Opcode.cpp" line="4708"/>
         <source>Pre-emptive attack</source>
         <translation>先制攻撃</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1932"/>
-        <location filename="core/field/Opcode.cpp" line="4591"/>
+        <location filename="core/field/Opcode.cpp" line="2025"/>
+        <location filename="core/field/Opcode.cpp" line="4709"/>
         <source>The party cannot escape the battle</source>
         <translation>パーティはバトルから逃走不能</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1933"/>
-        <location filename="core/field/Opcode.cpp" line="4592"/>
+        <location filename="core/field/Opcode.cpp" line="2026"/>
+        <location filename="core/field/Opcode.cpp" line="4710"/>
         <source>Do not play the battle victory music</source>
         <translation>バトル勝利時の BGM を再生しない</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1934"/>
-        <location filename="core/field/Opcode.cpp" line="4593"/>
+        <location filename="core/field/Opcode.cpp" line="2027"/>
+        <location filename="core/field/Opcode.cpp" line="4711"/>
         <source>Activates the battle arena</source>
         <translation>バトル アリーナの有効化</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1935"/>
-        <location filename="core/field/Opcode.cpp" line="4594"/>
+        <location filename="core/field/Opcode.cpp" line="2028"/>
+        <location filename="core/field/Opcode.cpp" line="4712"/>
         <source>Do not show battle rewards</source>
         <translation>バトル後の AP/EXP/ギル/アイテム 精算画面を表示しない</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1936"/>
+        <location filename="core/field/Opcode.cpp" line="2029"/>
         <source>The party members do not perform their victory celebrations at the end of battle</source>
         <translation>バトル後のメンバーの決めポーズをやめる</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1937"/>
-        <location filename="core/field/Opcode.cpp" line="4595"/>
+        <location filename="core/field/Opcode.cpp" line="2030"/>
+        <location filename="core/field/Opcode.cpp" line="4713"/>
         <source>Disable game over</source>
         <translation>ゲーム オーバーを無効化</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1943"/>
-        <location filename="core/field/Opcode.cpp" line="4601"/>
+        <location filename="core/field/Opcode.cpp" line="2036"/>
+        <location filename="core/field/Opcode.cpp" line="4719"/>
         <source>Battle mode: %1</source>
         <translation>バトル モード : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1943"/>
-        <location filename="core/field/Opcode.cpp" line="4601"/>
+        <location filename="core/field/Opcode.cpp" line="2036"/>
+        <location filename="core/field/Opcode.cpp" line="4719"/>
         <source>None</source>
         <translation type="unfinished">なし</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1964"/>
+        <location filename="core/field/Opcode.cpp" line="2057"/>
         <source>Stores the result of the last battle in %1</source>
         <translation>最後のバトル結果を %1 に保存</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="1993"/>
+        <location filename="core/field/Opcode.cpp" line="2086"/>
         <source>Wait %1 frame</source>
         <translation>%1 フレーム待機</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2020"/>
+        <location filename="core/field/Opcode.cpp" line="2113"/>
         <source>Fades the screen to the colour RGB(%2, %3, %4) (speed=%5, type=%1)</source>
         <translation>画面を RGB(%2, %3, %4) にフェード (速度=%5, タイプ=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2064"/>
+        <location filename="core/field/Opcode.cpp" line="2157"/>
         <source>Field Model blink : %1</source>
         <translation>3Dモデルを点滅させる : %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2115"/>
+        <location filename="core/field/Opcode.cpp" line="2208"/>
         <source>Change the state of the eye/mouth texture (eye 1=%1, eye 2=%2, mouth=%3, 3D object ID=%4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2150"/>
+        <location filename="core/field/Opcode.cpp" line="2243"/>
         <source>%1 blending</source>
         <translation type="unfinished">透過効果を %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2185"/>
+        <location filename="core/field/Opcode.cpp" line="2278"/>
         <source>Change the ambient color of the model: RGB(%1, %2, %3) RGB(%4, %5, %6) (flags=%7)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2215"/>
+        <location filename="core/field/Opcode.cpp" line="2308"/>
         <source>UNKNOWN4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2235"/>
+        <location filename="core/field/Opcode.cpp" line="2328"/>
         <source>UNKNOWN7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2245"/>
+        <location filename="core/field/Opcode.cpp" line="2338"/>
         <source>UNKNOWN8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2255"/>
+        <location filename="core/field/Opcode.cpp" line="2348"/>
         <source>UNKNOWN9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2275"/>
+        <location filename="core/field/Opcode.cpp" line="2368"/>
         <source>UNKNOWNB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2285"/>
+        <location filename="core/field/Opcode.cpp" line="2378"/>
         <source>UNKNOWNC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2333"/>
+        <location filename="core/field/Opcode.cpp" line="2426"/>
         <source>Field Model graphic filter - %1</source>
         <translation>3Dモデル グラフィック フィルター - %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2390"/>
+        <location filename="core/field/Opcode.cpp" line="2483"/>
         <source>Wait for graphic filter</source>
         <translation>グラフィック フィルター待ち</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2405"/>
+        <location filename="core/field/Opcode.cpp" line="2498"/>
         <source>Move Field Model to Party Member #%1</source>
         <translation>3Dモデルをパーティ メンバー #%1 に移動</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2449"/>
+        <location filename="core/field/Opcode.cpp" line="2542"/>
         <source>Set Z-deph for the background layer #%1 (Z=%2)</source>
         <translation>背景レイヤー #%1 の Z 値をセット (Z=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2483"/>
+        <location filename="core/field/Opcode.cpp" line="2576"/>
         <source>Animate the background layer #%1 (Horizontally=%2, Vertically=%3)</source>
         <translation>背景レイヤー  #%1 をアニメーション (水平=%2, 垂直=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2518"/>
+        <location filename="core/field/Opcode.cpp" line="2611"/>
         <source>Close the window #%1</source>
         <translation>ウィンドウを閉じる (ウィンドウ #%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2600"/>
+        <location filename="core/field/Opcode.cpp" line="2701"/>
         <source>Resizes/Repositions the window #%1 (X=%2, Y=%3, width=%4, height=%5)</source>
         <translation>ウィンドウ #%1 のリサイズと移動 (X=%2, Y=%3, 幅=%4, 高さ=%5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2640"/>
+        <location filename="core/field/Opcode.cpp" line="2741"/>
         <source>(no key)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2642"/>
+        <location filename="core/field/Opcode.cpp" line="2743"/>
         <source> or </source>
         <translation>または</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2657"/>
+        <location filename="core/field/Opcode.cpp" line="2758"/>
         <source>If key %1 pressed (%2)</source>
         <translation type="unfinished">キー %1 が押された場合 (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2676"/>
+        <location filename="core/field/Opcode.cpp" line="2777"/>
         <source>If key %1 pressed once (%2)</source>
         <translation type="unfinished">キー %1 が一度押された場合 (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2695"/>
+        <location filename="core/field/Opcode.cpp" line="2796"/>
         <source>If key %1 released once (%2)</source>
         <translation type="unfinished">キー %1 が一度離された場合 (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2714"/>
+        <location filename="core/field/Opcode.cpp" line="2815"/>
         <source>%1 the movability of the playable character</source>
         <translation>操作可能キャラクターの移動能力を %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2735"/>
+        <location filename="core/field/Opcode.cpp" line="2836"/>
         <source>Instantly turns the field model to face the party member #%1</source>
         <translation>3Dモデルの向きをパーティ メンバー #%1 の方へただちにターン</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2758"/>
+        <location filename="core/field/Opcode.cpp" line="2859"/>
         <source>Turns the field model to face the party member #%1 (Speed=%2, Rotation=%3)</source>
         <translation>3Dモデルの向きをパーティ メンバー #%1 の方へターン (速度=%2, 回転=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2790"/>
+        <location filename="core/field/Opcode.cpp" line="2891"/>
         <source>(none)</source>
         <translation>(なし)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2791"/>
+        <location filename="core/field/Opcode.cpp" line="2892"/>
         <source>Clock (00:00)</source>
         <translation>クロック (00:00)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2792"/>
+        <location filename="core/field/Opcode.cpp" line="2893"/>
         <source>Numeric (000000)</source>
         <translation>数値 (000000)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2796"/>
+        <location filename="core/field/Opcode.cpp" line="2897"/>
         <source>%2 in the window #%1 (left=%3, top=%4)</source>
         <translation>ウィンドウ #%1 内の %2 (左=%3, 上=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2837"/>
+        <location filename="core/field/Opcode.cpp" line="2938"/>
         <source>Sets %2 in window #%1 (show %3 digits)</source>
         <translation>%2 をウィンドウ #%1 にセット (%3 回表示)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2886"/>
+        <location filename="core/field/Opcode.cpp" line="2987"/>
         <source>Set Timer (H=%1, M=%2, S=%3)</source>
         <translation>タイマーをセット (H=%1, M=%2, S=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2949"/>
+        <location filename="core/field/Opcode.cpp" line="3050"/>
         <source>Add %1 gil to the party </source>
         <translation>パーティの所持ギルに %1 を加える</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2965"/>
+        <location filename="core/field/Opcode.cpp" line="3066"/>
         <source>Remove %1 gils from the party</source>
         <translation>パーティの所持ギルから %1 を減らす</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="2983"/>
+        <location filename="core/field/Opcode.cpp" line="3084"/>
         <source>Copies the amount of gil in %1 and %2</source>
         <translation>%1 と %2 にギルの総額をコピー</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3010"/>
-        <location filename="core/field/Opcode.cpp" line="3019"/>
-        <location filename="core/field/Opcode.cpp" line="3037"/>
+        <location filename="core/field/Opcode.cpp" line="3111"/>
+        <location filename="core/field/Opcode.cpp" line="3120"/>
+        <location filename="core/field/Opcode.cpp" line="3138"/>
         <source>Restores full HP and MP of every party member</source>
         <translation>すべてのパーティメンバーの HP, MP を回復</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3028"/>
+        <location filename="core/field/Opcode.cpp" line="3129"/>
         <source>Restores full HP and MP of every available character and removing status effects</source>
         <translation>利用可能なすべてのキャラクターの HP, MP を回復してステータス異常も解消</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3053"/>
+        <location filename="core/field/Opcode.cpp" line="3159"/>
         <source>Displays the dialog %2 in the window #%1</source>
         <translation>ダイアログ %2 をウィンドウ #%1 に表示</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3100"/>
-        <location filename="core/field/Opcode.cpp" line="3146"/>
+        <location filename="core/field/Opcode.cpp" line="3206"/>
+        <location filename="core/field/Opcode.cpp" line="3252"/>
         <source>Set %3 to the variable #%2 in the window #%1</source>
         <translation>ウィンドウ #%1 の変数 #%2 に %3 をセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3189"/>
+        <location filename="core/field/Opcode.cpp" line="3300"/>
         <source>Display %1 in the main menu</source>
         <translation>%1 をメイン メニューに表示</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3247"/>
+        <location filename="core/field/Opcode.cpp" line="3358"/>
         <source>Add %2 MP to party member #%1</source>
         <translation>パーティ メンバー #%1 の MP を %2 増やす</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3264"/>
+        <location filename="core/field/Opcode.cpp" line="3375"/>
         <source>Remove %2 MP to party member #%1</source>
         <translation>パーティ メンバー #%1 の MP を %2 減らす</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3286"/>
+        <location filename="core/field/Opcode.cpp" line="3397"/>
         <source>Ask Question %2 in the window #%1 (and put selected answer in %5) first line=%3, last line=%4</source>
         <translation>ウィンドウ #%1 に選択肢 %2 を表示 (続いてプレーヤーの選択を %5 にセット) 最初の行=%3, 最後の行=%4</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3347"/>
+        <location filename="core/field/Opcode.cpp" line="3458"/>
         <source>all magic materias are present and mastered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3348"/>
+        <location filename="core/field/Opcode.cpp" line="3459"/>
         <source>all summon materias are present and mastered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3349"/>
+        <location filename="core/field/Opcode.cpp" line="3460"/>
         <source>necessary command materias are present and mastered</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3350"/>
+        <location filename="core/field/Opcode.cpp" line="3461"/>
         <source>Bahamut and Neo Bahamut materias are present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3351"/>
+        <location filename="core/field/Opcode.cpp" line="3462"/>
         <source>22? (parameter %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3359"/>
+        <location filename="core/field/Opcode.cpp" line="3470"/>
         <source>Remove mastered magic materias and add Master Magic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3360"/>
+        <location filename="core/field/Opcode.cpp" line="3471"/>
         <source>Remove mastered summon materias and add Master Summon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3361"/>
+        <location filename="core/field/Opcode.cpp" line="3472"/>
         <source>Remove mastered meaning command materias and add Master Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3362"/>
+        <location filename="core/field/Opcode.cpp" line="3473"/>
         <source>Add Bahamut Zero to the inventory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3363"/>
+        <location filename="core/field/Opcode.cpp" line="3474"/>
         <source>23? (parameter %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3373"/>
+        <location filename="core/field/Opcode.cpp" line="3484"/>
         <source>ff7 credits (parameter %1)</source>
         <translation>FF7 クレジット (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3374"/>
+        <location filename="core/field/Opcode.cpp" line="3485"/>
         <source>Change name of %1</source>
         <translation>名前の変更: %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3375"/>
+        <location filename="core/field/Opcode.cpp" line="3486"/>
         <source>Change party (parameter %1)</source>
         <translation>パーティ変更 (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3376"/>
+        <location filename="core/field/Opcode.cpp" line="3487"/>
         <source>Shop No%1</source>
         <translation>ショップ No.%1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3379"/>
+        <location filename="core/field/Opcode.cpp" line="3490"/>
         <source>Save (parameter %1)</source>
         <translation>セーブ (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3380"/>
+        <location filename="core/field/Opcode.cpp" line="3491"/>
         <source>Remove all materias (parameter %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3381"/>
+        <location filename="core/field/Opcode.cpp" line="3492"/>
         <source>Restore all materias (parameter %1)</source>
         <translation>すべてのマテリアを解除 (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3382"/>
+        <location filename="core/field/Opcode.cpp" line="3493"/>
         <source>Remove %1&apos;s Materia</source>
         <translation>%1 のマテリアを解除</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3383"/>
+        <location filename="core/field/Opcode.cpp" line="3494"/>
         <source>Clear Cloud&apos;s materias (parameter %1)</source>
         <translation>クラウドのマテリアを解除 (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3384"/>
+        <location filename="core/field/Opcode.cpp" line="3495"/>
         <source>Restore Cloud&apos;s materias (parameter %1)</source>
         <translation>クラウドのマテリアを戻す (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3385"/>
-        <location filename="core/field/Opcode.cpp" line="3390"/>
-        <location filename="core/field/Opcode.cpp" line="3391"/>
+        <location filename="core/field/Opcode.cpp" line="3496"/>
+        <location filename="core/field/Opcode.cpp" line="3501"/>
+        <location filename="core/field/Opcode.cpp" line="3502"/>
         <source>? (parameter %1)</source>
         <translation>? (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3386"/>
+        <location filename="core/field/Opcode.cpp" line="3497"/>
         <source>HP to 1 (parameter %1)</source>
         <translatorcomment>エンカウント エラー (パラメータ %1)</translatorcomment>
         <translation>HP を 1 に (パラメータ %1)</translation>
@@ -2922,608 +3294,608 @@
         <translation type="vanished">マスター ? (パラメータ %1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3398"/>
+        <location filename="core/field/Opcode.cpp" line="3509"/>
         <source>Show menu %1</source>
         <translation>メニュー %1 を表示</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3428"/>
+        <location filename="core/field/Opcode.cpp" line="3539"/>
         <source>%1 access to the main menu</source>
         <translation type="unfinished">メイン メニューへのアクセスを %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3429"/>
+        <location filename="core/field/Opcode.cpp" line="3540"/>
         <source>Enables</source>
         <translation>有効化</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3429"/>
+        <location filename="core/field/Opcode.cpp" line="3540"/>
         <source>Disables</source>
         <translation>無効化</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3449"/>
+        <location filename="core/field/Opcode.cpp" line="3560"/>
         <source>Set battle table: %1</source>
         <translation>バトル テーブル %1 をセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3470"/>
+        <location filename="core/field/Opcode.cpp" line="3581"/>
         <source>Add %2 HP to party member #%1</source>
         <translation>パーティ メンバー #%1 の HP を %2 増やす</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3487"/>
+        <location filename="core/field/Opcode.cpp" line="3598"/>
         <source>Remove %2 HP to party member #%1</source>
         <translation>パーティ メンバー  #%1 の HP を %2 減らす</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3504"/>
+        <location filename="core/field/Opcode.cpp" line="3622"/>
         <source>Create window #%1 (X=%2, Y=%3, Width=%4, Height=%5)</source>
         <translation>ウィンドウ #%1 の作成 (X=%2, Y=%3, 幅=%4, 高さ=%5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3526"/>
+        <location filename="core/field/Opcode.cpp" line="3644"/>
         <source>Move the window #%1 (Move : X=%2, Y=%3)</source>
         <translation>ウィンドウ #%1 を移動 (X=%2, Y=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3567"/>
+        <location filename="core/field/Opcode.cpp" line="3685"/>
         <source>Normal</source>
         <translation>ノーマル</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3568"/>
+        <location filename="core/field/Opcode.cpp" line="3686"/>
         <source>No Background/Border</source>
         <translation>背景/ボーダーなし</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3569"/>
+        <location filename="core/field/Opcode.cpp" line="3687"/>
         <source>Transparent Background</source>
         <translation>背景の透過</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3573"/>
+        <location filename="core/field/Opcode.cpp" line="3691"/>
         <source>Set the window #%1 mode: %2 (%3 the closing of the window by the player)</source>
         <translation>ウィンドウ #%1 モード: %2 をセット (プレーヤーがウィンドウを閉じる操作を %3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3576"/>
+        <location filename="core/field/Opcode.cpp" line="3694"/>
         <source>Authorize</source>
         <translation>許可</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3576"/>
+        <location filename="core/field/Opcode.cpp" line="3694"/>
         <source>prevent</source>
         <translation>禁止</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3609"/>
+        <location filename="core/field/Opcode.cpp" line="3727"/>
         <source>Reset the window #%1</source>
         <translation>ウィンドウ #%1 をリセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3653"/>
+        <location filename="core/field/Opcode.cpp" line="3771"/>
         <source>Close the window #%1 (stronger)</source>
         <translation>ウィンドウを閉じる (ウィンドウ #%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3685"/>
+        <location filename="core/field/Opcode.cpp" line="3803"/>
         <source>Number of row in the window #%1 = %2</source>
         <translation>ウィンドウ #%1 の桁数 = %2</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3744"/>
+        <location filename="core/field/Opcode.cpp" line="3862"/>
         <source>Get windows %1 color to %2 (R), %3 (G) and %4 (B)</source>
         <translation>ウィンドウ %1 の色を  %2 (R), %3 (G), %4 (B) に変更</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3776"/>
+        <location filename="core/field/Opcode.cpp" line="3894"/>
         <source>Set windows %1 color: RGB(%2, %3, %4)</source>
         <translation>ウィンドウ %1 の色をセット: RGB(%2, %3, %4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3836"/>
+        <location filename="core/field/Opcode.cpp" line="3954"/>
         <source>Add %2 item(s) %1 to the inventory</source>
         <translation>アイテム %1 の所持数を %2 増やす</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3853"/>
+        <location filename="core/field/Opcode.cpp" line="3971"/>
         <source>Remove %2 item(s) %1 from the inventory</source>
         <translation>アイテム %1 の所持数を %2 減らす</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3870"/>
+        <location filename="core/field/Opcode.cpp" line="3988"/>
         <source>%2 = amount of item %1 in the inventory</source>
         <translation>%2 = アイテム %1 の所持数</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3899"/>
+        <location filename="core/field/Opcode.cpp" line="4017"/>
         <source>Add %1 materia to the inventory (AP=%2)</source>
         <translation>所持アイテムにマテリア %1 を追加 (AP=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3941"/>
+        <location filename="core/field/Opcode.cpp" line="4059"/>
         <source>Remove %3 materia(s) %1 from the inventory (AP=%2)</source>
         <translation>所持アイテムから%3 マテリア %1 を減らす (AP=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="3987"/>
+        <location filename="core/field/Opcode.cpp" line="4105"/>
         <source>%4 = amount of materia %1 in the inventory (AP=%2, ?=%3)</source>
         <translation>%4 = 所持アイテム中のマテリア %1 の数 (AP=%2, ?=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4036"/>
+        <location filename="core/field/Opcode.cpp" line="4154"/>
         <source>Shake (nbSwings=%1, Amplitude=%2, speed=%3)</source>
         <translation>揺らす (nb周期=%1, 拡がり=%2, 速度=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4060"/>
+        <location filename="core/field/Opcode.cpp" line="4178"/>
         <source>Perform no operation...</source>
         <translation>何もしない...</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4079"/>
+        <location filename="core/field/Opcode.cpp" line="4197"/>
         <source>Jump to map %1 (X=%2, Y=%3, triangle ID=%4, direction=%5)</source>
         <translation>マップ %1 にジャンプ (X=%2, Y=%3, ポリゴンID=%4, 方向=%5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4154"/>
+        <location filename="core/field/Opcode.cpp" line="4272"/>
         <source>Scroll to group %2 (speed=%1, type=%3)</source>
         <translation>グループ %2 へスクロール (速度=%1, タイプ=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4189"/>
+        <location filename="core/field/Opcode.cpp" line="4307"/>
         <source>Scroll to location (X=%1, Y=%2)</source>
         <translation>エリアにスクロール (X=%1, Y=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4216"/>
+        <location filename="core/field/Opcode.cpp" line="4334"/>
         <source>Scroll to playable character</source>
         <translation>操作可能なキャラクターへスクロール</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4235"/>
-        <location filename="core/field/Opcode.cpp" line="4285"/>
+        <location filename="core/field/Opcode.cpp" line="4353"/>
+        <location filename="core/field/Opcode.cpp" line="4403"/>
         <source>Scroll to location (X=%1, Y=%2, speed=%3)</source>
         <translation>エリアにスクロール (X=%1, Y=%2, 速度=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4266"/>
+        <location filename="core/field/Opcode.cpp" line="4384"/>
         <source>Wait for scroll</source>
         <translation>スクロール待ち</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4346"/>
+        <location filename="core/field/Opcode.cpp" line="4464"/>
         <source>Scroll to location (?=%1, ?=%2, ?=%3)</source>
         <translation>エリアにスクロール (?=%1, ?=%2, ?=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4388"/>
+        <location filename="core/field/Opcode.cpp" line="4506"/>
         <source>Fades the screen to the colour RGB(%1, %2, %3) (speed=%4, type=%5, adjust=%6)</source>
         <translation>画面の色を RGB(%1, %2, %3) にフェード (速度=%4, タイプ=%5, アジャスト=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4425"/>
+        <location filename="core/field/Opcode.cpp" line="4543"/>
         <source>Wait for fade</source>
         <translation>フェード待ち</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4441"/>
+        <location filename="core/field/Opcode.cpp" line="4559"/>
         <source>%2 the triangle #%1</source>
         <translation>ポリゴン #%1 を %2</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4466"/>
+        <location filename="core/field/Opcode.cpp" line="4584"/>
         <source>Retrieves the field ID number of the last field in %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4498"/>
+        <location filename="core/field/Opcode.cpp" line="4616"/>
         <source>Scroll to party member #%2 (speed=%1 frames, type=%3)</source>
         <translation>パーティ メンバー#%2 にスクロール (速度=%1 フレーム, タイプ=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4532"/>
+        <location filename="core/field/Opcode.cpp" line="4650"/>
         <source>Start battle #%1</source>
         <translation>バトル #%1 の開始</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4561"/>
+        <location filename="core/field/Opcode.cpp" line="4679"/>
         <source>%1 random battle</source>
         <translation>ランダム バトルを %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4623"/>
+        <location filename="core/field/Opcode.cpp" line="4741"/>
         <source>Get direction of the party member #%1 to %2</source>
         <translation>パーティ メンバー #%1 の向きを取得して %2 へ保存</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4656"/>
+        <location filename="core/field/Opcode.cpp" line="4774"/>
         <source>Get group ID of the party member #%1 to %2</source>
         <translation>パーティ メンバー #%1 のグループID を取得して %2 へ保存</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4693"/>
+        <location filename="core/field/Opcode.cpp" line="4811"/>
         <source>Get coordinates of the party member #%1 (store : X in %2, Y in %3, Z in %4 and triangle ID in %5)</source>
         <translation>パーティ メンバー #%1 の座標を取得して保存 (X → %2 , Y → %3, Z → %4, ポリゴンID → %5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4848"/>
-        <location filename="core/field/Opcode.cpp" line="5139"/>
+        <location filename="core/field/Opcode.cpp" line="4966"/>
+        <location filename="core/field/Opcode.cpp" line="5257"/>
         <source>%1 = %1 + %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4865"/>
-        <location filename="core/field/Opcode.cpp" line="5156"/>
+        <location filename="core/field/Opcode.cpp" line="4983"/>
+        <location filename="core/field/Opcode.cpp" line="5274"/>
         <source>%1 = %1 + %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4882"/>
-        <location filename="core/field/Opcode.cpp" line="5173"/>
+        <location filename="core/field/Opcode.cpp" line="5000"/>
+        <location filename="core/field/Opcode.cpp" line="5291"/>
         <source>%1 = %1 - %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4899"/>
-        <location filename="core/field/Opcode.cpp" line="5190"/>
+        <location filename="core/field/Opcode.cpp" line="5017"/>
+        <location filename="core/field/Opcode.cpp" line="5308"/>
         <source>%1 = %1 - %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4917"/>
-        <location filename="core/field/Opcode.cpp" line="5411"/>
+        <location filename="core/field/Opcode.cpp" line="5035"/>
+        <location filename="core/field/Opcode.cpp" line="5529"/>
         <source>%1 = %1 + 1 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4933"/>
-        <location filename="core/field/Opcode.cpp" line="5427"/>
+        <location filename="core/field/Opcode.cpp" line="5051"/>
+        <location filename="core/field/Opcode.cpp" line="5545"/>
         <source>%1 = %1 + 1 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4949"/>
-        <location filename="core/field/Opcode.cpp" line="5443"/>
+        <location filename="core/field/Opcode.cpp" line="5067"/>
+        <location filename="core/field/Opcode.cpp" line="5561"/>
         <source>%1 = %1 - 1 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4965"/>
-        <location filename="core/field/Opcode.cpp" line="5459"/>
+        <location filename="core/field/Opcode.cpp" line="5083"/>
+        <location filename="core/field/Opcode.cpp" line="5577"/>
         <source>%1 = %1 - 1 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4981"/>
+        <location filename="core/field/Opcode.cpp" line="5099"/>
         <source>%1 talk script for the current field model</source>
         <translation>3Dモデルのダイアログ スクリプトを %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5026"/>
+        <location filename="core/field/Opcode.cpp" line="5144"/>
         <source>%1 = %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5043"/>
+        <location filename="core/field/Opcode.cpp" line="5161"/>
         <source>%1 = %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5088"/>
+        <location filename="core/field/Opcode.cpp" line="5206"/>
         <source>Bit %2 ON in %1</source>
         <translation>%1 の %2 ビット目を 1 にセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5105"/>
+        <location filename="core/field/Opcode.cpp" line="5223"/>
         <source>Bit %2 OFF in %1</source>
         <translation>%1 の %2 ビット目を 0 にセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5122"/>
+        <location filename="core/field/Opcode.cpp" line="5240"/>
         <source>Toggle bit %2 in %1</source>
         <translation>%1 の %2 ビット目を切り替え</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5207"/>
+        <location filename="core/field/Opcode.cpp" line="5325"/>
         <source>%1 = %1 * %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5224"/>
+        <location filename="core/field/Opcode.cpp" line="5342"/>
         <source>%1 = %1 * %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5241"/>
+        <location filename="core/field/Opcode.cpp" line="5359"/>
         <source>%1 = %1 / %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5258"/>
+        <location filename="core/field/Opcode.cpp" line="5376"/>
         <source>%1 = %1 / %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5275"/>
+        <location filename="core/field/Opcode.cpp" line="5393"/>
         <source>%1 = %1 mod %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5292"/>
+        <location filename="core/field/Opcode.cpp" line="5410"/>
         <source>%1 = %1 mod %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5309"/>
+        <location filename="core/field/Opcode.cpp" line="5427"/>
         <source>%1 = %1 &amp; %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5326"/>
+        <location filename="core/field/Opcode.cpp" line="5444"/>
         <source>%1 = %1 &amp; %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5343"/>
+        <location filename="core/field/Opcode.cpp" line="5461"/>
         <source>%1 = %1 | %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5360"/>
+        <location filename="core/field/Opcode.cpp" line="5478"/>
         <source>%1 = %1 | %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5377"/>
+        <location filename="core/field/Opcode.cpp" line="5495"/>
         <source>%1 = %1 ^ %2 (8 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5394"/>
+        <location filename="core/field/Opcode.cpp" line="5512"/>
         <source>%1 = %1 ^ %2 (16 bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5475"/>
+        <location filename="core/field/Opcode.cpp" line="5593"/>
         <source>Set random value to %1 (8-bit)</source>
         <translation>%1 にランダムな値をセット (8-bit)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5613"/>
+        <location filename="core/field/Opcode.cpp" line="5731"/>
         <source>Search the value %5 in the memory (bank=%1, start=%2+%3, end=%2+%4) and put the position in %6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5662"/>
+        <location filename="core/field/Opcode.cpp" line="5780"/>
         <source>Field model is playable and it is %1</source>
         <translation>操作可能な 3Dモデル %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5688"/>
+        <location filename="core/field/Opcode.cpp" line="5806"/>
         <source>This group is a field model (ID=%1)</source>
         <translation>この項は 3Dモデル (ID=%1) のグループ</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5710"/>
+        <location filename="core/field/Opcode.cpp" line="5828"/>
         <source>Play loop animation #%1 of the field model (speed=%2)</source>
         <oldsource>Play animation #%1 of the field model (speed=%2)</oldsource>
         <translation type="unfinished">3Dモデルのアニメーション #%1 を再生 (速度=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5735"/>
-        <location filename="core/field/Opcode.cpp" line="6105"/>
+        <location filename="core/field/Opcode.cpp" line="5853"/>
+        <location filename="core/field/Opcode.cpp" line="6223"/>
         <source>Play animation #%1 of the field model and reset to previous state (speed=%2)</source>
         <translation>3Dモデルのアニメーション #%1 を再生して前のステートをリセット (速度=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5759"/>
+        <location filename="core/field/Opcode.cpp" line="5877"/>
         <source>%1 field model</source>
         <translation type="unfinished">3Dモデルを %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5785"/>
+        <location filename="core/field/Opcode.cpp" line="5903"/>
         <source>Place field Model (X=%1, Y=%2, Z=%3, triangle ID=%4)</source>
         <translation>3Dモデルを配置 (X=%1, Y=%2, Z=%3, ポリゴンID=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5841"/>
+        <location filename="core/field/Opcode.cpp" line="5959"/>
         <source>Place field Model (X=%1, Y=%2, triangle ID=%4)</source>
         <translation>3Dモデルを配置 (X=%1, Y=%2, ポリゴンID=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5892"/>
+        <location filename="core/field/Opcode.cpp" line="6010"/>
         <source>Place field Model (X=%1, Y=%2, Z=%3)</source>
         <translation>3Dモデルを配置 (X=%1, Y=%2, Z=%3)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5942"/>
+        <location filename="core/field/Opcode.cpp" line="6060"/>
         <source>Move field Model (X=%1, Y=%2)</source>
         <translation>3Dモデルを移動 (X=%1, Y=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5977"/>
-        <location filename="core/field/Opcode.cpp" line="6071"/>
+        <location filename="core/field/Opcode.cpp" line="6095"/>
+        <location filename="core/field/Opcode.cpp" line="6189"/>
         <source>Place field Model without animation (X=%1, Y=%2)</source>
         <translation>3Dモデルをアニメーション抜きで移動 (X=%1, Y=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6010"/>
+        <location filename="core/field/Opcode.cpp" line="6128"/>
         <source>Move field Model to the group %1</source>
         <translation>3Dモデルをグループ %1 に移動</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6034"/>
+        <location filename="core/field/Opcode.cpp" line="6152"/>
         <source>Rotation of the field model to group %1 (Speed=%3, Rotation=%2)</source>
         <translation>3Dモデルをグループ %1 の方向へ回転 (速度=%3, 回転=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6054"/>
+        <location filename="core/field/Opcode.cpp" line="6172"/>
         <source>Wait for animation</source>
         <translation>アニメーション待ち</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6130"/>
+        <location filename="core/field/Opcode.cpp" line="6248"/>
         <source>Play animation #%1 of the field model (speed=%2, type=1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6157"/>
-        <location filename="core/field/Opcode.cpp" line="6508"/>
+        <location filename="core/field/Opcode.cpp" line="6275"/>
+        <location filename="core/field/Opcode.cpp" line="6626"/>
         <source>Play partially the animation #%1 of the field model and reset to initial state (first frame=%2, last frame=%3, speed=%4)</source>
         <translation>3Dモデルのアニメーション #%1 の一部を再生して初期状態にリセット (最初のフレーム=%2, 最後のフレーム=%3, 速度=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6188"/>
-        <location filename="core/field/Opcode.cpp" line="6539"/>
+        <location filename="core/field/Opcode.cpp" line="6306"/>
+        <location filename="core/field/Opcode.cpp" line="6657"/>
         <source>Play partially the animation #%1 of the field model (first frame=%2, last frame=%3, speed=%4)</source>
         <translation>3Dモデルのアニメーション #%1 の一部を再生 (最初のフレーム=%2, 最後のフレーム=%3, 速度=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6217"/>
+        <location filename="core/field/Opcode.cpp" line="6335"/>
         <source>Set the field model move speed: %1</source>
         <translation>3Dモデルの移動速度を %1 にセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6247"/>
+        <location filename="core/field/Opcode.cpp" line="6365"/>
         <source>Set field model direction: %1</source>
         <translation>3Dモデルの向きを %1 にセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6280"/>
+        <location filename="core/field/Opcode.cpp" line="6398"/>
         <source>Rotation (direction=%1, nbRevolution=%2, speed=%3, ?=%4)</source>
         <translation>回転 (方向=%1, nb回転量=%2, 速度=%3, ?=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6319"/>
+        <location filename="core/field/Opcode.cpp" line="6437"/>
         <source>Inversed rotation (direction=%1, nbRevolution=%2, speed=%3, ?=%4)</source>
         <translation>反回転 (方向=%1, nb回転量=%2, 速度=%3, ?=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6354"/>
+        <location filename="core/field/Opcode.cpp" line="6472"/>
         <source>Direct the field model towards the group %1</source>
         <translation>3Dモデルの向きグループ %1の方向へセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6378"/>
+        <location filename="core/field/Opcode.cpp" line="6496"/>
         <source>Store direction of the group %1 in %2</source>
         <translation>グループ %1 の向きを %2 に保存</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6412"/>
+        <location filename="core/field/Opcode.cpp" line="6530"/>
         <source>Store position of the group %1 in %2 (X) and %3 (Y)</source>
         <translation>グループ %1 の向きを %2 (X), %3 (Y) に保存</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6449"/>
+        <location filename="core/field/Opcode.cpp" line="6567"/>
         <source>Store triangle ID of the group %1 in %2</source>
         <translation>グループ %1 のポリゴンを %2 に保存</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6481"/>
+        <location filename="core/field/Opcode.cpp" line="6599"/>
         <source>Play animation #%1 of the field model (speed=%2, type=2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6568"/>
+        <location filename="core/field/Opcode.cpp" line="6686"/>
         <source>Set the field model animations speed: %1</source>
         <translation>3D アニメーションの速度を %1 にセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6597"/>
+        <location filename="core/field/Opcode.cpp" line="6715"/>
         <source>Control the group %1</source>
         <translation>グループ %1 のコントロール</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6623"/>
+        <location filename="core/field/Opcode.cpp" line="6741"/>
         <source>Field model jump (X=%1, Y=%2, triangle ID=%3, Steps=%4)</source>
         <translation>3Dモデルのジャンプ (X=%1, Y=%2, ポリゴンID=%3, 歩数=%4)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6669"/>
+        <location filename="core/field/Opcode.cpp" line="6787"/>
         <source>Store position of the group %1 in %2 (X), %3 (Y), %4 (Z) and %5 (triangle ID)</source>
         <translation>グループ %1 の位置を保存 %2(X), %3(Y), %4(Z), %5(ポリゴンID) </translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6720"/>
+        <location filename="core/field/Opcode.cpp" line="6838"/>
         <source>Climb a ladder with the animation #%6 (X=%1, Y=%2, Z=%3, triangle ID=%4, direction1=%5, direction2=%7, speed=%8)</source>
         <translation>匍匐アニメーション #%6 (X=%1, Y=%2, Z=%3, ポリゴンID=%4, 方向1=%5, 方向2=%7, 速度=%8)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6774"/>
+        <location filename="core/field/Opcode.cpp" line="6892"/>
         <source>Offset Object (movement=%1, X=%2, Y=%3, Z=%4, speed=%5)</source>
         <translation>オブジェの移動 (移動量=%1, X=%2, Y=%3, Z=%4, 速度=%5)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6811"/>
+        <location filename="core/field/Opcode.cpp" line="6929"/>
         <source>Wait for offset object</source>
         <translation>オブジェの移動待ち</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6827"/>
-        <location filename="core/field/Opcode.cpp" line="7327"/>
+        <location filename="core/field/Opcode.cpp" line="6945"/>
+        <location filename="core/field/Opcode.cpp" line="7445"/>
         <source>Set range of the talk circle for the field model: %1</source>
         <translation>3Dモデル %1 のダイアログ範囲の大きさをセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6857"/>
-        <location filename="core/field/Opcode.cpp" line="7357"/>
+        <location filename="core/field/Opcode.cpp" line="6975"/>
+        <location filename="core/field/Opcode.cpp" line="7475"/>
         <source>Set range of the contact circle for the field model: %1</source>
         <translation>3Dモデル %1 のコンタクト範囲の大きさをセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6886"/>
+        <location filename="core/field/Opcode.cpp" line="7004"/>
         <source>%1 contact with field model</source>
         <translation type="unfinished">3Dモデルとのコンタクトを %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6907"/>
+        <location filename="core/field/Opcode.cpp" line="7025"/>
         <source>Add %1 to the current party</source>
         <translation>現在のパーティに %1 が加わる</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6928"/>
+        <location filename="core/field/Opcode.cpp" line="7046"/>
         <source>Remove %1 from the current party</source>
         <translation>現在のパーティから %1 が離脱</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6949"/>
+        <location filename="core/field/Opcode.cpp" line="7067"/>
         <source>New party: %1 | %2 | %3</source>
         <translation>新しいパーティ: %1 | %2 | %3</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="6986"/>
+        <location filename="core/field/Opcode.cpp" line="7104"/>
         <source>If %1 is in the current party (%2)</source>
         <translation type="unfinished">%1 がパーティにいる場合 (%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7000"/>
+        <location filename="core/field/Opcode.cpp" line="7118"/>
         <source>If %1 exists (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7020"/>
+        <location filename="core/field/Opcode.cpp" line="7138"/>
         <source>%2 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7021"/>
+        <location filename="core/field/Opcode.cpp" line="7139"/>
         <source>not available</source>
         <translation>操作不能</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7021"/>
+        <location filename="core/field/Opcode.cpp" line="7139"/>
         <source>available</source>
         <translation>使用可能</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7044"/>
+        <location filename="core/field/Opcode.cpp" line="7162"/>
         <source>Locks %1 in PHS menu</source>
         <translation>PHS メニューの %1 をロック</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7065"/>
+        <location filename="core/field/Opcode.cpp" line="7183"/>
         <source>Unlock %1 in PHS menu</source>
         <translation>PHS メニューの %1 をアンロック</translation>
     </message>
@@ -3544,7 +3916,7 @@
         <translation type="vanished">トレース</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7160"/>
+        <location filename="core/field/Opcode.cpp" line="7278"/>
         <source>Gateways %1</source>
         <translation type="unfinished">出入り口 %1</translation>
     </message>
@@ -3553,159 +3925,159 @@
         <translation type="vanished">エリアのリサイズ (X1=%1, Y1=%2, Z1=%3, X2=%4, Y2=%5, Z2=%6)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7422"/>
+        <location filename="core/field/Opcode.cpp" line="7540"/>
         <source>%1 (param1=%2, param2=%3, param3=%4, param4=%5, param5=%6)</source>
         <oldsource>%1 (16-bit) (param1=%2, param2=%3, param3=%4, param4=%5, param5=%6)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7492"/>
+        <location filename="core/field/Opcode.cpp" line="7627"/>
         <source>Play animation #%1 for &apos;%3&apos; (speed=%2)</source>
         <translation>&apos;%3&apos; のアニメーション #%1 を再生 (速度=%2)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7495"/>
+        <location filename="core/field/Opcode.cpp" line="7630"/>
         <source>stay</source>
         <translation>止まる</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7496"/>
+        <location filename="core/field/Opcode.cpp" line="7631"/>
         <source>walk</source>
         <translation>歩く</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7497"/>
+        <location filename="core/field/Opcode.cpp" line="7632"/>
         <source>run</source>
         <translation>走る</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7514"/>
+        <location filename="core/field/Opcode.cpp" line="7649"/>
         <source>Break field model animation</source>
         <translation>3Dモデルのアニメーションを停止</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7523"/>
+        <location filename="core/field/Opcode.cpp" line="7658"/>
         <source>Wait for rotation</source>
         <translation>回転待ち</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7545"/>
+        <location filename="core/field/Opcode.cpp" line="7680"/>
         <source>Multiply RGB(%6, %5, %4) on the colors in a palette (sourcePal=%1, targetPal=%2, first color=%3, color count=%7+1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7596"/>
+        <location filename="core/field/Opcode.cpp" line="7731"/>
         <source>Show the state #%2 of the background parameter #%1</source>
         <translation>背景パラメータ #%1 のステート #%2 を表示</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7631"/>
+        <location filename="core/field/Opcode.cpp" line="7766"/>
         <source>Hide the state #%2 of the background parameter #%1</source>
         <translation>背景パラメータ #%1 のステート #%2 を隠す</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7665"/>
+        <location filename="core/field/Opcode.cpp" line="7800"/>
         <source>Show next state of the background parameter #%1</source>
         <translation>背景パラメータ #%1 の次のステートを表示</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7695"/>
+        <location filename="core/field/Opcode.cpp" line="7830"/>
         <source>Show previous state of the background parameter #%1</source>
         <translation>背景パラメータ #%1 の前のステートを表示</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7725"/>
+        <location filename="core/field/Opcode.cpp" line="7860"/>
         <source>Hide background parameter #%1</source>
         <translation>背景パラメータ #%1 を隠す</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7757"/>
+        <location filename="core/field/Opcode.cpp" line="7892"/>
         <source>Load the palette #%1 in the position %2 (color count=%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7795"/>
+        <location filename="core/field/Opcode.cpp" line="7930"/>
         <source>Load the position %1 in the palette #%2 (color count=%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7833"/>
+        <location filename="core/field/Opcode.cpp" line="7968"/>
         <source>Copy palette (sourcePal=%1, targetPal=%2, color count=%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7872"/>
+        <location filename="core/field/Opcode.cpp" line="8007"/>
         <source>Copy partially palette (sourcePal=%1, targetPal=%2, first color=%3, color count=%4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7917"/>
+        <location filename="core/field/Opcode.cpp" line="8052"/>
         <source>Add RGB(%5, %4, %3) on the colors in a palette (sourcePal=%1, targetPal=%2, color count=%6)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="7970"/>
+        <location filename="core/field/Opcode.cpp" line="8105"/>
         <source>Multiply RGB(%5, %4, %3) on the colors in a palette (sourcePal=%1, targetPal=%2, color count=%6)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8020"/>
+        <location filename="core/field/Opcode.cpp" line="8155"/>
         <source>Load the palette #%1 in the position %2 (first color=%3, color count=%4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8051"/>
+        <location filename="core/field/Opcode.cpp" line="8186"/>
         <source>Load the position %1 in the palette #%2 (first color=%3, color count=%4)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8204"/>
+        <location filename="core/field/Opcode.cpp" line="8339"/>
         <source>%1 (param1 (8-bit)=%2, param2=%3, param3=%4, param4=%5, param5=%6)</source>
         <oldsource>%1 (8-bit) (param1=%2, param2=%3, param3=%4, param4=%5, param5=%6)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8478"/>
+        <location filename="core/field/Opcode.cpp" line="8630"/>
         <source>CMUSC (music #%1, unknown1=%2, unknown2=%3, unknown2=%4, unknown4=%5, unknown5=%6, unknown6=%7)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8513"/>
+        <location filename="core/field/Opcode.cpp" line="8665"/>
         <source>If music is currently playing set %1 to 1</source>
         <translation type="unfinished">BGM が再生されたとき %1 に 1 をセット</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4109"/>
+        <location filename="core/field/Opcode.cpp" line="4227"/>
         <source>SCRLO (?=%1)</source>
         <translation type="unfinished">SCRLO (?=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="4130"/>
+        <location filename="core/field/Opcode.cpp" line="4248"/>
         <source>SCRLC (?=%1)</source>
         <translation type="unfinished">SCRLC (?=%1)</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5566"/>
+        <location filename="core/field/Opcode.cpp" line="5684"/>
         <source>SETX %1</source>
         <translation type="unfinished">SETX %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="5587"/>
+        <location filename="core/field/Opcode.cpp" line="5705"/>
         <source>GETX %1</source>
         <translation type="unfinished">GETX %1</translation>
     </message>
     <message>
-        <location filename="core/field/Opcode.cpp" line="8536"/>
+        <location filename="core/field/Opcode.cpp" line="8688"/>
         <source>Game Over</source>
         <translation>ゲーム・オーバー</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="223"/>
+        <location filename="core/field/GrpScript.cpp" line="224"/>
         <source>Untitled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="254"/>
+        <location filename="core/field/GrpScript.cpp" line="255"/>
         <source>Field model</source>
         <translation>3Dモデル</translation>
     </message>
@@ -3714,238 +4086,242 @@
         <translation type="vanished">エリア</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="256"/>
+        <location filename="core/field/GrpScript.cpp" line="257"/>
         <source>Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="257"/>
+        <location filename="core/field/GrpScript.cpp" line="258"/>
         <source>Animation</source>
         <translation>アニメーション</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="258"/>
+        <location filename="core/field/GrpScript.cpp" line="259"/>
         <source>Main</source>
         <translation>メイン</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="281"/>
+        <location filename="core/field/GrpScript.cpp" line="282"/>
         <source>S0 - Init</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="282"/>
+        <location filename="core/field/GrpScript.cpp" line="283"/>
         <source>S0 - Main</source>
         <translation>S0 - メイン</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="284"/>
+        <location filename="core/field/GrpScript.cpp" line="285"/>
         <source>S1 - Talk</source>
         <oldsource>S1 - Parler</oldsource>
         <translatorcomment>S1 - Talk</translatorcomment>
         <translation type="unfinished">S1 - ダイアログ</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="285"/>
+        <location filename="core/field/GrpScript.cpp" line="286"/>
         <source>S1 - [OK]</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="288"/>
+        <location filename="core/field/GrpScript.cpp" line="289"/>
         <source>S2 - Contact</source>
         <oldsource>S2 - Toucher</oldsource>
         <translatorcomment>S2 - Contact</translatorcomment>
         <translation type="unfinished">S2 - コンタクト</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="289"/>
+        <location filename="core/field/GrpScript.cpp" line="290"/>
         <source>S2 - Move</source>
         <oldsource>S2 - Bouger</oldsource>
         <translatorcomment>S2 - Move</translatorcomment>
         <translation type="unfinished">S2 - 通過</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="292"/>
+        <location filename="core/field/GrpScript.cpp" line="293"/>
         <source>S3 - Move</source>
         <oldsource>S3 - Bouger</oldsource>
         <translatorcomment>S3 - Move</translatorcomment>
         <translation type="unfinished">S3 - 通過</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="295"/>
+        <location filename="core/field/GrpScript.cpp" line="296"/>
         <source>S4 - Go</source>
         <oldsource>S4 - Aller</oldsource>
         <translatorcomment>S4 - Go</translatorcomment>
         <translation type="unfinished">S4 - 進入</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="298"/>
+        <location filename="core/field/GrpScript.cpp" line="299"/>
         <source>S5 - Go 1x</source>
         <oldsource>S5 - Aller 1x</oldsource>
         <translatorcomment>S5 - Go 1x</translatorcomment>
         <translation type="unfinished">S5 - 進入 1x</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="301"/>
+        <location filename="core/field/GrpScript.cpp" line="302"/>
         <source>S6 - Go away</source>
         <oldsource>S6 - Partir</oldsource>
         <translatorcomment>S6 - Go away</translatorcomment>
         <translation type="unfinished">S6 - 離れる</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="305"/>
+        <location filename="core/field/GrpScript.cpp" line="306"/>
         <source>Script %1</source>
         <translation>スクリプト %1</translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="530"/>
+        <location filename="core/field/GrpScript.cpp" line="540"/>
         <source>Group &apos;%1&apos;:</source>
         <oldsource>Groupe &apos;%1&apos; :</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/GrpScript.cpp" line="538"/>
+        <location filename="core/field/GrpScript.cpp" line="548"/>
         <source>Script &apos;%1&apos; :</source>
         <translation type="unfinished">スクリプト %1 :</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="459"/>
+        <location filename="Data.cpp" line="508"/>
         <source>Cloud</source>
         <oldsource>Clad</oldsource>
         <translatorcomment>Cloud</translatorcomment>
         <translation type="unfinished">クラウド</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="459"/>
+        <location filename="Data.cpp" line="508"/>
         <source>Barret</source>
         <translation>バレット</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="459"/>
+        <location filename="Data.cpp" line="508"/>
         <source>Tifa</source>
         <translation>ティファ</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="460"/>
         <source>Aeris</source>
         <translatorcomment>Aeris</translatorcomment>
-        <translation>エアリス</translation>
+        <translation type="vanished">エアリス</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="460"/>
+        <location filename="Data.cpp" line="509"/>
         <source>Red XIII</source>
         <translation>レッドXIII</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="460"/>
+        <location filename="Data.cpp" line="509"/>
         <source>Yuffie</source>
         <translation>ユフィ</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="461"/>
+        <location filename="Data.cpp" line="509"/>
+        <source>Aerith</source>
+        <translation>エアリス</translation>
+    </message>
+    <message>
+        <location filename="Data.cpp" line="510"/>
         <source>Cait Sith</source>
         <translation>ケット・シー</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="461"/>
+        <location filename="Data.cpp" line="510"/>
         <source>Vincent</source>
         <translation>ヴィンセント</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="461"/>
+        <location filename="Data.cpp" line="510"/>
         <source>Cid</source>
         <translation>シド</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="462"/>
+        <location filename="Data.cpp" line="511"/>
         <source>Yound Cloud</source>
         <oldsource>Jeune Clad</oldsource>
         <translatorcomment>Young Cloud</translatorcomment>
         <translation type="unfinished">昔のクラウド</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="462"/>
+        <location filename="Data.cpp" line="511"/>
         <source>Sephiroth</source>
         <translation>セフィロス</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="462"/>
+        <location filename="Data.cpp" line="511"/>
         <source>Chocobo</source>
         <translation>チョコボ</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="467"/>
+        <location filename="Data.cpp" line="516"/>
         <source>[CAMERA|L2]</source>
         <translation>[視点|L2]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="467"/>
+        <location filename="Data.cpp" line="516"/>
         <source>[TARGET|R2]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="468"/>
+        <location filename="Data.cpp" line="517"/>
         <source>[PAGE UP|L1]</source>
         <oldsource>[PAGE HAUT|L1]</oldsource>
         <translatorcomment>[PAGE UP|L1]</translatorcomment>
         <translation type="unfinished">|ページ送り|L1}ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="468"/>
+        <location filename="Data.cpp" line="517"/>
         <source>[PAGE DOWN|R1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="469"/>
+        <location filename="Data.cpp" line="518"/>
         <source>[MENU|TRIANGLE]</source>
         <translation>[メニュー|△]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="469"/>
+        <location filename="Data.cpp" line="518"/>
         <source>[OK|CIRCLE]</source>
         <translation type="unfinished">[決定|○]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="473"/>
+        <location filename="Data.cpp" line="522"/>
         <source>[UP]</source>
         <translation type="unfinished">[↑]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="473"/>
+        <location filename="Data.cpp" line="522"/>
         <source>[RIGHT]</source>
         <translation type="unfinished">[→]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="474"/>
+        <location filename="Data.cpp" line="523"/>
         <source>[DOWN]</source>
         <translation type="unfinished">[↓]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="474"/>
+        <location filename="Data.cpp" line="523"/>
         <source>[LEFT]</source>
         <translation type="unfinished">[←]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="470"/>
+        <location filename="Data.cpp" line="519"/>
         <source>[CANCEL|CROSS]</source>
         <oldsource>[ANNULER|CROIX]</oldsource>
         <translatorcomment>[CANCEL|CROSS]</translatorcomment>
         <translation type="unfinished">[キャンセル|×]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="470"/>
+        <location filename="Data.cpp" line="519"/>
         <source>[SWITCH|SQUARE]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="471"/>
+        <location filename="Data.cpp" line="520"/>
         <source>[ASSIST|SELECT]</source>
         <oldsource>[ASSISTER|SELECT]</oldsource>
         <translatorcomment>[ヘルプ|ASSIST|SELECT]</translatorcomment>
         <translation type="unfinished">[SELECT]ボタン</translation>
     </message>
     <message>
-        <location filename="Data.cpp" line="472"/>
+        <location filename="Data.cpp" line="521"/>
         <source>[START]</source>
         <oldsource>[DEMARRER|START]</oldsource>
         <translatorcomment>[START]</translatorcomment>
@@ -3953,7 +4329,7 @@
     </message>
     <message>
         <location filename="core/field/TutFileStandard.cpp" line="163"/>
-        <location filename="main.cpp" line="50"/>
+        <location filename="main.cpp" line="84"/>
         <source>Error</source>
         <oldsource>Erreur</oldsource>
         <translatorcomment>Error</translatorcomment>
@@ -3979,1297 +4355,1332 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="863"/>
-        <source>Label %1 is unreachable, please use a long jump.</source>
-        <oldsource>Le label %1 est inaccessible, veuillez utiliser un saut long.</oldsource>
+        <location filename="core/field/Script.cpp" line="882"/>
+        <source>Label %1 is declared several times.</source>
+        <oldsource>Le label %1 est déclaré plusieurs fois.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="839"/>
-        <source>Label %1 is declared several times.</source>
-        <oldsource>Le label %1 est déclaré plusieurs fois.</oldsource>
+        <location filename="core/field/Script.cpp" line="907"/>
+        <source>Label %1 is unreachable, please bring this instruction closer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="867"/>
+        <location filename="core/field/Script.cpp" line="912"/>
         <source>Label %1 is unreachable because your script exceeds 65535 bytes, please reduce the size of the script.</source>
         <oldsource>Le label %1 est inaccessible car votre script dépasse 65535 octets, veuillez réduire la taille du script.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="875"/>
+        <location filename="core/field/Script.cpp" line="920"/>
         <source>The label %1 is unreachable because it is located before the opcode.</source>
         <oldsource>Le label %1 est inaccessible car il se trouve avant la commande.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/field/Script.cpp" line="885"/>
+        <location filename="core/field/Script.cpp" line="930"/>
         <source>Script too big, it should not exceed 65535 bytes. Actual size: %1.</source>
         <oldsource>Script trop grand, il ne doit pas dépasser les 65535 octets. Taille actuelle : %1.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="core/IsoArchiveFF7.cpp" line="447"/>
+        <location filename="core/IsoArchiveFF7.cpp" line="525"/>
         <source>Cannot update game binaries.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="50"/>
+        <location filename="main.cpp" line="84"/>
         <source>The file &apos;var.cfg&apos; could not be loaded.
 Make sure it is valid or delete it.</source>
         <translation>ファイル &apos;var.cfg&apos; が読み込めません。
 ファイルが有効か確認するか、または削除してください。。</translation>
     </message>
+    <message>
+        <location filename="core/field/Section1File.cpp" line="157"/>
+        <source>Map name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/field/Section1File.cpp" line="158"/>
+        <source>Hello world!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/Lgp.cpp" line="862"/>
+        <location filename="core/field/FieldArchiveIOPS.cpp" line="360"/>
+        <source>Cannot remove destination archive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="core/Lgp.cpp" line="880"/>
+        <location filename="core/field/FieldArchiveIOPS.cpp" line="376"/>
+        <source>Cannot rename temporary file to destination path</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ScriptEditor</name>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="51"/>
+        <location filename="widgets/ScriptEditor.cpp" line="53"/>
         <source>Script Editor%1</source>
         <oldsource>Éditeur de script%1</oldsource>
         <translatorcomment>Editor%1</translatorcomment>
         <translation type="unfinished">エディター%1</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="51"/>
+        <location filename="widgets/ScriptEditor.cpp" line="53"/>
         <source> (init mode)</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="55"/>
+        <location filename="widgets/ScriptEditor.cpp" line="57"/>
         <source>Control Structures</source>
         <oldsource>Structures de contrôle</oldsource>
         <translatorcomment>Control Structures</translatorcomment>
         <translation type="unfinished">コントロール ストラクチャ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="57"/>
+        <location filename="widgets/ScriptEditor.cpp" line="59"/>
         <source>Windowing and messages</source>
         <oldsource>Fenêtres et messages</oldsource>
         <translatorcomment>Windowing and messages</translatorcomment>
         <translation>ウィンドウとメッセージ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="58"/>
+        <location filename="widgets/ScriptEditor.cpp" line="60"/>
         <source>Party and inventory</source>
         <oldsource>Équipe et inventaire</oldsource>
         <translatorcomment>Party and inventory</translatorcomment>
         <translation>パーティと所持アイテム</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="59"/>
+        <location filename="widgets/ScriptEditor.cpp" line="61"/>
         <source>Field Models and animations</source>
         <oldsource>Objets 3D et animations</oldsource>
         <translatorcomment>Field Models and animations</translatorcomment>
         <translation type="unfinished">3Dモデルとアニメーション</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="61"/>
+        <location filename="widgets/ScriptEditor.cpp" line="63"/>
         <source>Background</source>
         <translation>背景</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="63"/>
+        <location filename="widgets/ScriptEditor.cpp" line="65"/>
         <source>Audio and video</source>
         <oldsource>Audio et vidéo</oldsource>
         <translatorcomment>Audio and video</translatorcomment>
         <translation type="unfinished">サウンドとビデオ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="64"/>
+        <location filename="widgets/ScriptEditor.cpp" line="66"/>
         <source>Modules</source>
         <translation>モジュール</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="98"/>
+        <location filename="widgets/ScriptEditor.cpp" line="102"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="409"/>
+        <location filename="widgets/ScriptEditor.cpp" line="421"/>
         <source>Seed Random Generator</source>
         <translation>乱数ジェネレータをシード</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="411"/>
+        <location filename="widgets/ScriptEditor.cpp" line="423"/>
         <source>Sinus</source>
         <translation>サイン</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="412"/>
+        <location filename="widgets/ScriptEditor.cpp" line="424"/>
         <source>Cosinus</source>
         <translation>コサイン</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="385"/>
+        <location filename="widgets/ScriptEditor.cpp" line="396"/>
         <source>Label</source>
         <translation type="unfinished">レイヤー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="395"/>
+        <location filename="widgets/ScriptEditor.cpp" line="407"/>
         <source>No Operation</source>
         <oldsource>Opération binaire</oldsource>
         <translation>命令なし</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="403"/>
+        <location filename="widgets/ScriptEditor.cpp" line="415"/>
         <source>Unary operation</source>
         <oldsource>Opération bit à bit</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="439"/>
+        <location filename="widgets/ScriptEditor.cpp" line="451"/>
         <source>HP/MP Maximum (1)</source>
         <oldsource>HP/MP restaurés (3)</oldsource>
         <translatorcomment>HP/MP Maximum (3)</translatorcomment>
         <translation>HP/MP 最大化 (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="480"/>
+        <location filename="widgets/ScriptEditor.cpp" line="492"/>
         <source>Place (X,Y,Z)</source>
         <oldsource>Placer (Dir)</oldsource>
         <translatorcomment>Place (Dir)</translatorcomment>
         <translation>位置 (X,Y,Z)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="565"/>
+        <location filename="widgets/ScriptEditor.cpp" line="577"/>
         <source>Store Palette</source>
         <oldsource>ST (Store) Palette</oldsource>
         <translatorcomment>●</translatorcomment>
         <translation type="unfinished">ST (保存) Palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="566"/>
+        <location filename="widgets/ScriptEditor.cpp" line="578"/>
         <source>Store Palette (S)</source>
         <oldsource>ST (Store) PLS</oldsource>
         <translatorcomment>●</translatorcomment>
         <translation type="unfinished">ST (保存) PLS</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="567"/>
+        <location filename="widgets/ScriptEditor.cpp" line="579"/>
         <source>Load Palette</source>
         <oldsource>LD (Load) Palette</oldsource>
         <translatorcomment>●</translatorcomment>
         <translation type="unfinished">LD (読み込み) Palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="568"/>
+        <location filename="widgets/ScriptEditor.cpp" line="580"/>
         <source>Load Palette (S)</source>
         <oldsource>LD (Load) PLS</oldsource>
         <translatorcomment>●</translatorcomment>
         <translation type="unfinished">LD (読み込み) PLS</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="569"/>
+        <location filename="widgets/ScriptEditor.cpp" line="581"/>
         <source>Copy Palette</source>
         <oldsource>CP (Copy) Palette</oldsource>
         <translatorcomment>●</translatorcomment>
         <translation type="unfinished">CP (コピー) Palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="570"/>
+        <location filename="widgets/ScriptEditor.cpp" line="582"/>
         <source>Copy Palette (2)</source>
         <oldsource>CP (Copy) Palette (2)</oldsource>
         <translatorcomment>●</translatorcomment>
         <translation type="unfinished">CP (コピー) Palette (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="571"/>
+        <location filename="widgets/ScriptEditor.cpp" line="583"/>
         <source>Partial Copy Palette</source>
         <oldsource>RT Palette</oldsource>
         <translatorcomment>●</translatorcomment>
         <translation type="unfinished">RT Palette</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="572"/>
+        <location filename="widgets/ScriptEditor.cpp" line="584"/>
         <source>Partial Copy Palette (2)</source>
         <oldsource>RT Palette (2)</oldsource>
         <translatorcomment>●</translatorcomment>
         <translation type="unfinished">RT Palette (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="56"/>
+        <location filename="widgets/ScriptEditor.cpp" line="58"/>
         <source>Mathematics</source>
         <translation>演算命令</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="60"/>
+        <location filename="widgets/ScriptEditor.cpp" line="62"/>
         <source>Walkmesh and locations</source>
         <translation>ウォーク メッシュとエリア</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="62"/>
+        <location filename="widgets/ScriptEditor.cpp" line="64"/>
         <source>Fade and camera</source>
         <translation>フェードとカメラ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="65"/>
+        <location filename="widgets/ScriptEditor.cpp" line="67"/>
         <source>Unknown</source>
         <translation type="unfinished">不明</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="100"/>
+        <location filename="widgets/ScriptEditor.cpp" line="104"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="377"/>
+        <location filename="widgets/ScriptEditor.cpp" line="388"/>
         <source>Return</source>
         <translation>リターン</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="378"/>
+        <location filename="widgets/ScriptEditor.cpp" line="389"/>
         <source>Return to</source>
         <translation>リターン →</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="380"/>
+        <location filename="widgets/ScriptEditor.cpp" line="391"/>
         <source>Execute a script</source>
         <translation>スクリプトの実行</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="382"/>
+        <location filename="widgets/ScriptEditor.cpp" line="393"/>
         <source>Execute a script from a party member</source>
         <translation>パーティ メンバーのスクリプトを実行</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="386"/>
+        <location filename="widgets/ScriptEditor.cpp" line="397"/>
         <source>Goto label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="388"/>
+        <location filename="widgets/ScriptEditor.cpp" line="399"/>
         <source>If...then</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="390"/>
+        <location filename="widgets/ScriptEditor.cpp" line="401"/>
         <source>If key pressed</source>
         <translation>キーが押された場合</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="391"/>
+        <location filename="widgets/ScriptEditor.cpp" line="402"/>
         <source>If Party Member</source>
         <translation>パーティ メンバーの場合</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="392"/>
+        <location filename="widgets/ScriptEditor.cpp" line="403"/>
         <source>If character exsists</source>
         <translation>キャラクターが存在する場合</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="394"/>
+        <location filename="widgets/ScriptEditor.cpp" line="404"/>
+        <source>[DLPB&apos;s custom opcode] If Red XIII is named Nanaki</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditor.cpp" line="406"/>
         <source>Wait</source>
         <translation>完了待ち</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="398"/>
+        <location filename="widgets/ScriptEditor.cpp" line="410"/>
         <source>Binary operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="406"/>
+        <location filename="widgets/ScriptEditor.cpp" line="418"/>
         <source>Bitwise operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="410"/>
+        <location filename="widgets/ScriptEditor.cpp" line="422"/>
         <source>Two Byte from two one-byte</source>
         <translation>1-バイト二つからなる 2-バイト</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="415"/>
+        <location filename="widgets/ScriptEditor.cpp" line="427"/>
         <source>Window creation</source>
         <translation>ウィンドウの作成</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="416"/>
+        <location filename="widgets/ScriptEditor.cpp" line="428"/>
         <source>Resizes/Repositions a window</source>
         <translation>ウィンドウの大きさ,位置の変更</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="417"/>
+        <location filename="widgets/ScriptEditor.cpp" line="429"/>
         <source>Set line count in window</source>
         <translation>ウィンドウの行数をセット</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="418"/>
+        <location filename="widgets/ScriptEditor.cpp" line="430"/>
         <source>Move a window</source>
         <translation>ウィンドウの移動</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="419"/>
+        <location filename="widgets/ScriptEditor.cpp" line="431"/>
         <source>Set window type</source>
         <translation>ウィンドウ タイプのセット</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="420"/>
+        <location filename="widgets/ScriptEditor.cpp" line="432"/>
         <source>Reset a window</source>
         <translation>ウィンドウのリセット</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="421"/>
+        <location filename="widgets/ScriptEditor.cpp" line="433"/>
         <source>Close a window (1)</source>
         <translation>ウィンドウを閉じる (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="422"/>
+        <location filename="widgets/ScriptEditor.cpp" line="434"/>
         <source>Close a window (2)</source>
         <translation>ウィンドウを閉じる (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="424"/>
+        <location filename="widgets/ScriptEditor.cpp" line="436"/>
         <source>Numerical Display</source>
         <translation>数値表示</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="425"/>
-        <location filename="widgets/ScriptEditor.cpp" line="428"/>
+        <location filename="widgets/ScriptEditor.cpp" line="437"/>
+        <location filename="widgets/ScriptEditor.cpp" line="440"/>
         <source>Set window variable (16-bit)</source>
         <translation>ウィンドウの変数をセット (16-ビット)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="426"/>
+        <location filename="widgets/ScriptEditor.cpp" line="438"/>
         <source>Countdown</source>
         <translation>カウントダウン</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="427"/>
+        <location filename="widgets/ScriptEditor.cpp" line="439"/>
         <source>Set window variable (8-bit)</source>
         <translation>ウィンドウの変数をセット (8-ビット)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="430"/>
+        <location filename="widgets/ScriptEditor.cpp" line="442"/>
         <source>Set window Text</source>
         <translation>ウィンドウにテキストをセット</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="431"/>
+        <location filename="widgets/ScriptEditor.cpp" line="443"/>
         <source>Ask Question</source>
         <translation>選択肢を表示</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="433"/>
+        <location filename="widgets/ScriptEditor.cpp" line="445"/>
         <source>Set map name</source>
         <translation>マップ名をセット</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="434"/>
+        <location filename="widgets/ScriptEditor.cpp" line="446"/>
         <source>Enable/Disable menu</source>
         <translation>メニューの有効化/無効化</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="435"/>
+        <location filename="widgets/ScriptEditor.cpp" line="447"/>
         <source>Get window color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="436"/>
+        <location filename="widgets/ScriptEditor.cpp" line="448"/>
         <source>Set window color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="440"/>
+        <location filename="widgets/ScriptEditor.cpp" line="452"/>
         <source>HP/MP Maximum (2)</source>
         <translation>HP/MP 最大化 (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="441"/>
+        <location filename="widgets/ScriptEditor.cpp" line="453"/>
         <source>HP/MP Maximum with Status Clear</source>
         <translation>HP/MP を最大化してステータス異常を解消</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="442"/>
+        <location filename="widgets/ScriptEditor.cpp" line="454"/>
         <source>HP/MP Maximum (3)</source>
         <translation>HP/MP 最大化 (3)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="444"/>
+        <location filename="widgets/ScriptEditor.cpp" line="456"/>
         <source>Increase MP</source>
         <translation>MP を増加</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="445"/>
+        <location filename="widgets/ScriptEditor.cpp" line="457"/>
         <source>Decrease MP</source>
         <translation>MP を増加</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="446"/>
+        <location filename="widgets/ScriptEditor.cpp" line="458"/>
         <source>Increase HP</source>
         <translation>HP を増加</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="447"/>
+        <location filename="widgets/ScriptEditor.cpp" line="459"/>
         <source>Decrease HP</source>
         <translation>HP を減少</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="448"/>
+        <location filename="widgets/ScriptEditor.cpp" line="460"/>
         <source>Add gil</source>
         <translation>所持ギルを増加</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="449"/>
+        <location filename="widgets/ScriptEditor.cpp" line="461"/>
         <source>Remove gil</source>
         <translation>所持ギルを減少</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="450"/>
+        <location filename="widgets/ScriptEditor.cpp" line="462"/>
         <source>Amount of gil</source>
         <translation>所持ギル</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="451"/>
+        <location filename="widgets/ScriptEditor.cpp" line="463"/>
         <source>Add Item</source>
         <translation>アイテムを追加</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="452"/>
+        <location filename="widgets/ScriptEditor.cpp" line="464"/>
         <source>Remove item</source>
         <translation>アイテムを削除</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="453"/>
+        <location filename="widgets/ScriptEditor.cpp" line="465"/>
         <source>Amount of item</source>
         <translation>アイテムの数</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="454"/>
+        <location filename="widgets/ScriptEditor.cpp" line="466"/>
         <source>Add Materia</source>
         <translation>マテリアを追加</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="455"/>
+        <location filename="widgets/ScriptEditor.cpp" line="467"/>
         <source>Remove Materia</source>
         <translation>マテリアを削除</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="456"/>
+        <location filename="widgets/ScriptEditor.cpp" line="468"/>
         <source>Amount of Materia</source>
         <translation>マテリアの数</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="458"/>
+        <location filename="widgets/ScriptEditor.cpp" line="470"/>
         <source>Party Change</source>
         <translation>パーティ変更</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="459"/>
+        <location filename="widgets/ScriptEditor.cpp" line="471"/>
         <source>Add Character to the party</source>
         <translation>パーティにキャラクターを追加</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="460"/>
+        <location filename="widgets/ScriptEditor.cpp" line="472"/>
         <source>Remove Character from the party</source>
         <translation>パーティからキャラクターをはずす</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="461"/>
+        <location filename="widgets/ScriptEditor.cpp" line="473"/>
         <source>Save party</source>
         <translation>パーティを保存</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="462"/>
+        <location filename="widgets/ScriptEditor.cpp" line="474"/>
         <source>Load party</source>
         <translation>パーティを読み込み</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="463"/>
+        <location filename="widgets/ScriptEditor.cpp" line="475"/>
         <source>Create/Delete character</source>
         <translation>キャラクターの作成/削除</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="464"/>
+        <location filename="widgets/ScriptEditor.cpp" line="476"/>
         <source>Lock character</source>
         <translation>キャラクターをロック</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="465"/>
+        <location filename="widgets/ScriptEditor.cpp" line="477"/>
         <source>Unlock character</source>
         <translation>キャラクターをアンロック</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="468"/>
+        <location filename="widgets/ScriptEditor.cpp" line="480"/>
         <source>Set Field Model</source>
         <translation>3Dモデルをセット</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="469"/>
+        <location filename="widgets/ScriptEditor.cpp" line="481"/>
         <source>Set character to Field Model</source>
         <translation>3Dモデルにキャラクターを追加</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="470"/>
+        <location filename="widgets/ScriptEditor.cpp" line="482"/>
         <source>Group control</source>
         <translation>グループ コントロール</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="472"/>
+        <location filename="widgets/ScriptEditor.cpp" line="484"/>
         <source>Get Group Direction (Dir)</source>
         <translation>グループの向きを取得 (Dir)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="473"/>
+        <location filename="widgets/ScriptEditor.cpp" line="485"/>
         <source>Get Party Member Direction (Dir)</source>
         <translation>パーティ メンバーの向きを取得 (Dir)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="474"/>
+        <location filename="widgets/ScriptEditor.cpp" line="486"/>
         <source>Get Group Triangle ID (I)</source>
         <translation>グループのポリゴンID を取得 (I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="475"/>
+        <location filename="widgets/ScriptEditor.cpp" line="487"/>
         <source>Get Party Member Triangle ID (I)</source>
         <translation>パーティ メンバーのポリゴンID を取得 (I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="476"/>
+        <location filename="widgets/ScriptEditor.cpp" line="488"/>
         <source>Get Group coordinates (X,Y)</source>
         <translation>グループの座標を取得 (X,Y)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="477"/>
+        <location filename="widgets/ScriptEditor.cpp" line="489"/>
         <source>Get Group coordinates (X,Y,Z,I)</source>
         <translation>グループの座標を取得 (X,Y,Z,I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="478"/>
+        <location filename="widgets/ScriptEditor.cpp" line="490"/>
         <source>Get Party coordinates (X,Y,Z,I)</source>
         <translation>他のメンバーの座標を取得 (X,Y,Z,I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="481"/>
+        <location filename="widgets/ScriptEditor.cpp" line="493"/>
         <source>Place (X,Y,I)</source>
         <translation>位置 (X,Y,I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="482"/>
+        <location filename="widgets/ScriptEditor.cpp" line="494"/>
         <source>Place (X,Y,Z,I)</source>
         <translation>位置 (X,Y,Z,I)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="483"/>
+        <location filename="widgets/ScriptEditor.cpp" line="495"/>
         <source>Place (Dir)</source>
         <translation>位置 (Dir)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="485"/>
+        <location filename="widgets/ScriptEditor.cpp" line="497"/>
         <source>Move</source>
         <translation>移動</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="486"/>
+        <location filename="widgets/ScriptEditor.cpp" line="498"/>
         <source>Move without animation</source>
         <translation>アニメーションぬきで移動</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="487"/>
+        <location filename="widgets/ScriptEditor.cpp" line="499"/>
         <source>Move without animation or rotation</source>
         <translation>アニメーション・回転せずに移動</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="488"/>
+        <location filename="widgets/ScriptEditor.cpp" line="500"/>
         <source>Move to Group</source>
         <translation>グループに移動</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="489"/>
+        <location filename="widgets/ScriptEditor.cpp" line="501"/>
         <source>Move to Party Member</source>
         <translation>パーティ メンバーの方へ移動</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="491"/>
+        <location filename="widgets/ScriptEditor.cpp" line="503"/>
         <source>Turn</source>
         <translation>回転</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="492"/>
+        <location filename="widgets/ScriptEditor.cpp" line="504"/>
         <source>Direction to Group</source>
         <translation>グループへの方向</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="493"/>
+        <location filename="widgets/ScriptEditor.cpp" line="505"/>
         <source>Direction to Party Member</source>
         <translation>パーティ メンバーへの方向</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="494"/>
+        <location filename="widgets/ScriptEditor.cpp" line="506"/>
         <source>Inversed Turn</source>
         <translation>反転</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="495"/>
+        <location filename="widgets/ScriptEditor.cpp" line="507"/>
         <source>Direction (inversed) to Group</source>
         <translation>向きをグループの方へ反転</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="496"/>
+        <location filename="widgets/ScriptEditor.cpp" line="508"/>
         <source>Direction (inversed) to Party Member</source>
         <translation>向きをパーティ メンバーの方へ反転</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="497"/>
+        <location filename="widgets/ScriptEditor.cpp" line="509"/>
         <source>Wait for Turn</source>
         <translation>回転待ち</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="506"/>
+        <location filename="widgets/ScriptEditor.cpp" line="518"/>
         <source>Play partial animation and return (1)</source>
         <translation>アニメーションの一部を再生してリターン (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="507"/>
+        <location filename="widgets/ScriptEditor.cpp" line="519"/>
         <source>Play partial animation and return (2)</source>
         <translation>アニメーションの一部を再生してリターン (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="508"/>
+        <location filename="widgets/ScriptEditor.cpp" line="520"/>
         <source>Play Stand/Walk/Run animation</source>
         <translation>直立/歩行/走行 アニメーションを再生</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="509"/>
+        <location filename="widgets/ScriptEditor.cpp" line="521"/>
         <source>Play jump animation</source>
         <translation>ジャンプ アニメーションを再生</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="511"/>
+        <location filename="widgets/ScriptEditor.cpp" line="523"/>
         <source>Party field join</source>
         <translation>パーティ合流フィールド</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="512"/>
+        <location filename="widgets/ScriptEditor.cpp" line="524"/>
         <source>Party field split</source>
         <translation>パーティ分割フィールド</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="513"/>
+        <location filename="widgets/ScriptEditor.cpp" line="525"/>
         <source>Stop animation</source>
         <translation>アニメーション停止</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="514"/>
+        <location filename="widgets/ScriptEditor.cpp" line="526"/>
         <source>Wait for animation</source>
         <translation>アニメーション待ち</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="516"/>
+        <location filename="widgets/ScriptEditor.cpp" line="528"/>
         <source>Character Graphics - Eye open/close</source>
         <translation>キャラクター グラフィック - 目を開ける/閉じる</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="517"/>
+        <location filename="widgets/ScriptEditor.cpp" line="529"/>
         <source>Character Graphics - Activate/Deactivate blending</source>
         <translation type="unfinished">キャラクター グラフィック - 透過のオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="528"/>
+        <location filename="widgets/ScriptEditor.cpp" line="540"/>
         <source>Character Graphics - ??? (8)</source>
         <translation>キャラクター グラフィック - ??? (8)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="529"/>
+        <location filename="widgets/ScriptEditor.cpp" line="541"/>
         <source>Character Graphics - SHINE</source>
         <translation>キャラクター グラフィック - SHINE</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="530"/>
+        <location filename="widgets/ScriptEditor.cpp" line="542"/>
         <source>Character Graphics - RESET</source>
         <translation>キャラクター グラフィック - RESET</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="531"/>
+        <location filename="widgets/ScriptEditor.cpp" line="543"/>
         <source>Wait For Character Graphics</source>
         <translation>キャラクター グラフィック待ち</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="536"/>
+        <location filename="widgets/ScriptEditor.cpp" line="548"/>
         <source>Movement Speed</source>
         <translation>移動速度</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="537"/>
+        <location filename="widgets/ScriptEditor.cpp" line="549"/>
         <source>Animation Speed</source>
         <translation>アニメーション速度</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="538"/>
+        <location filename="widgets/ScriptEditor.cpp" line="550"/>
         <source>Hide/Display Field Model</source>
         <translation>3Dモデルを表示/隠す</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="539"/>
+        <location filename="widgets/ScriptEditor.cpp" line="551"/>
         <source>Enable/Disable rotation</source>
         <translation>回転のオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="540"/>
+        <location filename="widgets/ScriptEditor.cpp" line="552"/>
         <source>Character Blink</source>
         <translation>キャラクターの瞬き</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="541"/>
+        <location filename="widgets/ScriptEditor.cpp" line="553"/>
         <source>Talk On/Off</source>
         <translation>ダイアログのオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="542"/>
+        <location filename="widgets/ScriptEditor.cpp" line="554"/>
         <source>Contact On/Off</source>
         <translation>コンタクトのオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="543"/>
+        <location filename="widgets/ScriptEditor.cpp" line="555"/>
         <source>Talk Range (8-bit)</source>
         <translation>ダイアログ範囲 (8-bit)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="544"/>
+        <location filename="widgets/ScriptEditor.cpp" line="556"/>
         <source>Contact range (8-bit)</source>
         <translation>コンタクト範囲 (8-bit)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="545"/>
+        <location filename="widgets/ScriptEditor.cpp" line="557"/>
         <source>Talk Range (16-bit)</source>
         <translation>ダイアログ範囲 (16-bit)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="546"/>
+        <location filename="widgets/ScriptEditor.cpp" line="558"/>
         <source>Contact range (16-bit)</source>
         <translation>コンタクト範囲 (16-bit)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="549"/>
+        <location filename="widgets/ScriptEditor.cpp" line="561"/>
         <source>Create line</source>
         <oldsource>Create location</oldsource>
         <translation type="unfinished">エリアを作成</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="550"/>
+        <location filename="widgets/ScriptEditor.cpp" line="562"/>
         <source>Set line</source>
         <oldsource>Set location</oldsource>
         <translation type="unfinished">エリアをセット</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="551"/>
+        <location filename="widgets/ScriptEditor.cpp" line="563"/>
         <source>Line On/Off</source>
         <oldsource>Location On/Off</oldsource>
         <translation type="unfinished">エリアをオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="552"/>
+        <location filename="widgets/ScriptEditor.cpp" line="564"/>
         <source>Triangle On/Off</source>
         <translation>ポリゴンをオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="557"/>
+        <location filename="widgets/ScriptEditor.cpp" line="569"/>
         <source>Move background Z layer</source>
         <translation>背景レイヤーを移動 (Z)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="558"/>
+        <location filename="widgets/ScriptEditor.cpp" line="570"/>
         <source>Animate background layer</source>
         <translation>背景レイヤーをアニメーション</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="559"/>
+        <location filename="widgets/ScriptEditor.cpp" line="571"/>
         <source>Show a background state</source>
         <translation>背景ステートを表示</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="560"/>
+        <location filename="widgets/ScriptEditor.cpp" line="572"/>
         <source>Hide background state</source>
         <translation>背景ステートを隠す</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="561"/>
+        <location filename="widgets/ScriptEditor.cpp" line="573"/>
         <source>Show next background state</source>
         <translation>次の背景ステートを表示</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="562"/>
+        <location filename="widgets/ScriptEditor.cpp" line="574"/>
         <source>Show previous background state</source>
         <translation>前の背景ステートを表示</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="563"/>
+        <location filename="widgets/ScriptEditor.cpp" line="575"/>
         <source>Hide background parameters</source>
         <translation>背景パラメータを隠す</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="574"/>
+        <location filename="widgets/ScriptEditor.cpp" line="586"/>
         <source>Multiply Palette (2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="575"/>
+        <location filename="widgets/ScriptEditor.cpp" line="587"/>
         <source>Add Palette</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="576"/>
+        <location filename="widgets/ScriptEditor.cpp" line="588"/>
         <source>Add Palette (2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="579"/>
+        <location filename="widgets/ScriptEditor.cpp" line="591"/>
         <source>Scroll to playable character</source>
         <translation>操作可能なキャラクターへスクロール</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="580"/>
+        <location filename="widgets/ScriptEditor.cpp" line="592"/>
         <source>Scroll to party member</source>
         <translation>パーティ メンバーにスクロール</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="581"/>
+        <location filename="widgets/ScriptEditor.cpp" line="593"/>
         <source>Scroll to group</source>
         <translation>グループにスクロール</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="583"/>
+        <location filename="widgets/ScriptEditor.cpp" line="595"/>
         <source>Scroll (X,Y)</source>
         <translation>スクロール (X,Y)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="584"/>
+        <location filename="widgets/ScriptEditor.cpp" line="596"/>
         <source>Scroll (X,Y,Smooth)</source>
         <translation>スクロール (X,Y,リスムース)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="585"/>
+        <location filename="widgets/ScriptEditor.cpp" line="597"/>
         <source>Scroll (X,Y,Linear)</source>
         <translation>スクロール (X,Y,リニア)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="589"/>
+        <location filename="widgets/ScriptEditor.cpp" line="601"/>
         <source>Shake</source>
         <translation>画面を揺らす</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="590"/>
+        <location filename="widgets/ScriptEditor.cpp" line="602"/>
         <source>Wait for scroll</source>
         <translation>スクロール待ち</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="598"/>
+        <location filename="widgets/ScriptEditor.cpp" line="610"/>
         <source>Play sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="599"/>
+        <location filename="widgets/ScriptEditor.cpp" line="611"/>
         <source>Alter sound (8-bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="600"/>
+        <location filename="widgets/ScriptEditor.cpp" line="612"/>
         <source>Alter sound (16-bit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="602"/>
+        <location filename="widgets/ScriptEditor.cpp" line="614"/>
         <source>Play music</source>
         <translation>BGM を再生</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="605"/>
+        <location filename="widgets/ScriptEditor.cpp" line="617"/>
         <source>Music Unlock/Lock</source>
         <oldsource>Music On/Off</oldsource>
         <translation type="unfinished">BGM のオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="606"/>
+        <location filename="widgets/ScriptEditor.cpp" line="618"/>
         <source>Battle music</source>
         <translation>バトル BGM</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="612"/>
+        <location filename="widgets/ScriptEditor.cpp" line="624"/>
         <source>Set next movie</source>
         <translation>次のムービーをセット</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="613"/>
+        <location filename="widgets/ScriptEditor.cpp" line="625"/>
         <source>Play movie</source>
         <translation>ムービーの再生</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="619"/>
+        <location filename="widgets/ScriptEditor.cpp" line="631"/>
         <source>Play tutorial</source>
         <translation>解説を再生</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="620"/>
+        <location filename="widgets/ScriptEditor.cpp" line="632"/>
         <source>Display a menu</source>
         <translation>メニューの表示</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="621"/>
+        <location filename="widgets/ScriptEditor.cpp" line="633"/>
         <source>Disc change screen</source>
         <translation>デスクの変更画面</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="622"/>
+        <location filename="widgets/ScriptEditor.cpp" line="634"/>
         <source>Minigame</source>
         <translation>ミニゲーム</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="623"/>
+        <location filename="widgets/ScriptEditor.cpp" line="635"/>
         <source>Battle result load</source>
         <translation>バトル結果の読み込み</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="624"/>
+        <location filename="widgets/ScriptEditor.cpp" line="636"/>
         <source>Battle Table</source>
         <translation>バトル テーブル</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="625"/>
         <source>Change Field</source>
-        <translation>フィールドの変更</translation>
+        <translation type="vanished">フィールドの変更</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="626"/>
+        <location filename="widgets/ScriptEditor.cpp" line="638"/>
         <source>Last Map ID</source>
         <translation>最後のマップ ID</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="627"/>
+        <location filename="widgets/ScriptEditor.cpp" line="639"/>
         <source>Start Battle</source>
         <translation>バトル開始</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="628"/>
+        <location filename="widgets/ScriptEditor.cpp" line="640"/>
         <source>Battle On/Off</source>
         <translation>バトルをオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="629"/>
+        <location filename="widgets/ScriptEditor.cpp" line="641"/>
         <source>Battle mode</source>
         <translation>バトル モード</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="630"/>
+        <location filename="widgets/ScriptEditor.cpp" line="642"/>
         <source>Battle mode (2)</source>
         <translation>バトル モード</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="631"/>
+        <location filename="widgets/ScriptEditor.cpp" line="643"/>
         <source>Map Jump On/Off</source>
         <translation>マップのジャンプをオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="632"/>
+        <location filename="widgets/ScriptEditor.cpp" line="644"/>
         <source>Character movability On/Off</source>
         <translation>キャラクターの移動をオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="633"/>
+        <location filename="widgets/ScriptEditor.cpp" line="645"/>
         <source>Preload field Map</source>
         <translation>フィールド マップの先読み</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="642"/>
+        <location filename="widgets/ScriptEditor.cpp" line="648"/>
+        <source>[DLPB&apos;s custom opcode] Write/Read to entire Savemap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditor.cpp" line="655"/>
         <source>SPECIAL - Battle On/Off</source>
         <translation>SPECIAL - バトルをオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="643"/>
+        <location filename="widgets/ScriptEditor.cpp" line="656"/>
         <source>SPECIAL - Character movability On/Off</source>
         <translation>SPECIAL - キャラクターの移動をオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="499"/>
+        <location filename="widgets/ScriptEditor.cpp" line="511"/>
         <source>Play animation (loop)</source>
         <oldsource>Jouer animation et revenir (1)</oldsource>
         <translation>アニメーションを再生 (ループ)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="500"/>
+        <location filename="widgets/ScriptEditor.cpp" line="512"/>
         <source>Play animation (1)</source>
         <oldsource>Jouer animation et revenir (2)</oldsource>
         <translatorcomment>Play animation and return (2)</translatorcomment>
         <translation>アニメーションを再生 (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="501"/>
+        <location filename="widgets/ScriptEditor.cpp" line="513"/>
         <source>Play animation (2)</source>
         <oldsource>Jouer partiellement animation (1)</oldsource>
         <translatorcomment>Play partial animation (1)</translatorcomment>
         <translation>アニメーションを再生 (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="502"/>
+        <location filename="widgets/ScriptEditor.cpp" line="514"/>
         <source>Play animation and return (1)</source>
         <oldsource>Jouer partiellement animation (2)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="503"/>
+        <location filename="widgets/ScriptEditor.cpp" line="515"/>
         <source>Play animation and return (2)</source>
         <oldsource>Jouer partiellement animation et revenir (1)</oldsource>
         <translation type="unfinished">アニメーションの一部を再生してリターン (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="504"/>
+        <location filename="widgets/ScriptEditor.cpp" line="516"/>
         <source>Play partial animation (1)</source>
         <oldsource>Jouer partiellement animation et revenir (2)</oldsource>
         <translatorcomment>Play partial animation and return (2)</translatorcomment>
         <translation type="unfinished">アニメーションの一部を再生してリターン (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="505"/>
+        <location filename="widgets/ScriptEditor.cpp" line="517"/>
         <source>Play partial animation (2)</source>
         <oldsource>Jouer animation Stand/Walk/Run</oldsource>
         <translatorcomment>Play Stand/Walk/Run animation</translatorcomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="510"/>
+        <location filename="widgets/ScriptEditor.cpp" line="522"/>
         <source>Play climb animation</source>
         <oldsource>Arrêter animation</oldsource>
         <translation>登攀アニメーションを再生</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="518"/>
+        <location filename="widgets/ScriptEditor.cpp" line="530"/>
         <source>Character Graphics - ??? - AMBNT</source>
         <oldsource>Filtre graphique - ??? (3)</oldsource>
         <translatorcomment>Character Graphics - ??? (3)</translatorcomment>
         <translation>キャラクター グラフィック - AMBNT</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="519"/>
+        <location filename="widgets/ScriptEditor.cpp" line="531"/>
         <source>Character Graphics - ??? (1)</source>
         <oldsource>Filtre graphique - LIGHT</oldsource>
         <translatorcomment>Character Graphics - LIGHT</translatorcomment>
         <translation>キャラクター グラフィック - ??? (1)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="520"/>
+        <location filename="widgets/ScriptEditor.cpp" line="532"/>
         <source>Character Graphics - ??? (2)</source>
         <oldsource>Filtre graphique - ??? (4)</oldsource>
         <translatorcomment>Character Graphics - ??? (4)</translatorcomment>
         <translation>キャラクター グラフィック - ??? (2)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="521"/>
+        <location filename="widgets/ScriptEditor.cpp" line="533"/>
         <source>Character Graphics - ??? (3)</source>
         <oldsource>Filtre graphique - ??? (5)</oldsource>
         <translatorcomment>Character Graphics - ??? (5)</translatorcomment>
         <translation>キャラクター グラフィック - ??? (3)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="522"/>
+        <location filename="widgets/ScriptEditor.cpp" line="534"/>
         <source>Character Graphics - LIGHT</source>
         <oldsource>Filtre graphique - ??? (6)</oldsource>
         <translatorcomment>Character Graphics - ??? (6)</translatorcomment>
         <translation>キャラクター グラフィック - LIGHT</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="523"/>
+        <location filename="widgets/ScriptEditor.cpp" line="535"/>
         <source>Character Graphics - ??? (4)</source>
         <oldsource>Filtre graphique - SBOBJ</oldsource>
         <translatorcomment>Character Graphics - SBOBJ</translatorcomment>
         <translation>キャラクター グラフィック - ??? (4)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="524"/>
+        <location filename="widgets/ScriptEditor.cpp" line="536"/>
         <source>Character Graphics - ??? (5)</source>
         <oldsource>Filtre graphique - ??? (7)</oldsource>
         <translatorcomment>Character Graphics - ??? (7)</translatorcomment>
         <translation>キャラクター グラフィック - ??? (5)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="525"/>
+        <location filename="widgets/ScriptEditor.cpp" line="537"/>
         <source>Character Graphics - ??? (6)</source>
         <oldsource>Filtre graphique - ??? (8)</oldsource>
         <translatorcomment>Character Graphics - ??? (8)</translatorcomment>
         <translation>キャラクター グラフィック - ??? (6)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="526"/>
+        <location filename="widgets/ScriptEditor.cpp" line="538"/>
         <source>Character Graphics - SBOBJ</source>
         <oldsource>Filtre graphique - SHINE</oldsource>
         <translatorcomment>Character Graphics - SHINE</translatorcomment>
         <translation>キャラクター グラフィック - SBOBJ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="527"/>
+        <location filename="widgets/ScriptEditor.cpp" line="539"/>
         <source>Character Graphics - ??? (7)</source>
         <oldsource>Filtre graphique - RESET</oldsource>
         <translatorcomment>Character Graphics - RESET</translatorcomment>
         <translation>キャラクター グラフィック - ??? (7)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="533"/>
+        <location filename="widgets/ScriptEditor.cpp" line="545"/>
         <source>OFST</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="534"/>
+        <location filename="widgets/ScriptEditor.cpp" line="546"/>
         <source>OFSTW</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="554"/>
+        <location filename="widgets/ScriptEditor.cpp" line="566"/>
         <source>SLIP</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="586"/>
+        <location filename="widgets/ScriptEditor.cpp" line="598"/>
         <source>SCRLO</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="587"/>
+        <location filename="widgets/ScriptEditor.cpp" line="599"/>
         <source>SCRLC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="592"/>
+        <location filename="widgets/ScriptEditor.cpp" line="604"/>
         <source>VWOFT</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="593"/>
+        <location filename="widgets/ScriptEditor.cpp" line="605"/>
         <source>FADE</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="594"/>
+        <location filename="widgets/ScriptEditor.cpp" line="606"/>
         <source>FADEW</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="595"/>
+        <location filename="widgets/ScriptEditor.cpp" line="607"/>
         <source>NFADE</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="603"/>
+        <location filename="widgets/ScriptEditor.cpp" line="615"/>
         <source>MUSVT</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="604"/>
+        <location filename="widgets/ScriptEditor.cpp" line="616"/>
         <source>MUSVM</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="607"/>
+        <location filename="widgets/ScriptEditor.cpp" line="619"/>
         <source>CHMPH</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="608"/>
+        <location filename="widgets/ScriptEditor.cpp" line="620"/>
         <source>CHMST</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="609"/>
+        <location filename="widgets/ScriptEditor.cpp" line="621"/>
         <source>FMUSC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="610"/>
+        <location filename="widgets/ScriptEditor.cpp" line="622"/>
         <source>CMUSC</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="614"/>
+        <location filename="widgets/ScriptEditor.cpp" line="626"/>
         <source>MVIEF</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="615"/>
+        <location filename="widgets/ScriptEditor.cpp" line="627"/>
         <source>MVCAM</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="616"/>
+        <location filename="widgets/ScriptEditor.cpp" line="628"/>
         <source>BGMOVIE</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="573"/>
+        <location filename="widgets/ScriptEditor.cpp" line="585"/>
         <source>Multiply Palette</source>
         <oldsource>Additionner Palette (2)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="634"/>
+        <location filename="widgets/ScriptEditor.cpp" line="646"/>
         <source>PMJMP2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="635"/>
+        <location filename="widgets/ScriptEditor.cpp" line="647"/>
         <source>Game Over</source>
         <translation>ゲーム オーバー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="637"/>
+        <location filename="widgets/ScriptEditor.cpp" line="650"/>
         <source>SPECIAL - PNAME</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="636"/>
+        <location filename="widgets/ScriptEditor.cpp" line="649"/>
         <source>SPECIAL - Cursor On/Off</source>
         <oldsource>SPECIAL - Vitesse des message</oldsource>
         <translatorcomment>SPECIAL - Messages Speed</translatorcomment>
         <translation>SPECIAL - カーソルのオン/オフ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="638"/>
+        <location filename="widgets/ScriptEditor.cpp" line="651"/>
         <source>SPECIAL - Game Speed</source>
         <translation>SPECIAL - ゲーム速度</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="640"/>
+        <location filename="widgets/ScriptEditor.cpp" line="653"/>
         <source>SPECIAL - Full Materia</source>
         <translation>SPECIAL - フル マテリア</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="641"/>
+        <location filename="widgets/ScriptEditor.cpp" line="654"/>
         <source>SPECIAL - Full Item</source>
         <translation>SPECIAL - フル アイテム</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="639"/>
+        <location filename="widgets/ScriptEditor.cpp" line="652"/>
         <source>SPECIAL - Messages Speed</source>
         <oldsource>SPECIAL - Activer/Désactiver combats</oldsource>
         <translation>SPECIAL - メッセージ速度</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="644"/>
+        <location filename="widgets/ScriptEditor.cpp" line="637"/>
+        <source>Change Map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditor.cpp" line="657"/>
         <source>SPECIAL - Rename character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="645"/>
+        <location filename="widgets/ScriptEditor.cpp" line="658"/>
         <source>SPECIAL - Clear Game</source>
         <translation>SPECIAL - ゲームをクリア</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="646"/>
+        <location filename="widgets/ScriptEditor.cpp" line="659"/>
         <source>SPECIAL - Clear Items</source>
         <translation>SPECIAL - アイテムをクリア</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="649"/>
+        <location filename="widgets/ScriptEditor.cpp" line="662"/>
         <source>MPDSP</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="650"/>
+        <location filename="widgets/ScriptEditor.cpp" line="663"/>
         <source>SETX</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="651"/>
+        <location filename="widgets/ScriptEditor.cpp" line="664"/>
         <source>GETX</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditor.cpp" line="652"/>
+        <location filename="widgets/ScriptEditor.cpp" line="665"/>
         <source>SEARCHX</source>
         <translation></translation>
     </message>
@@ -5397,6 +5808,59 @@
     </message>
 </context>
 <context>
+    <name>ScriptEditorDLPBSavemap</name>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="39"/>
+        <source>8 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="40"/>
+        <source>16 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="41"/>
+        <source>24 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="42"/>
+        <source>32 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="44"/>
+        <source>From is a pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="45"/>
+        <source>To is a pointer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="48"/>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="50"/>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="52"/>
+        <source>Abs Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp" line="54"/>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ScriptEditorExecCharPage</name>
     <message>
         <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="226"/>
@@ -5489,151 +5953,151 @@
 <context>
     <name>ScriptEditorGenericList</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="593"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="599"/>
         <source>Long</source>
         <oldsource>Entier long</oldsource>
         <translation type="unfinished">Long</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="594"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="600"/>
         <source>Signed long</source>
         <oldsource>Entier long signé</oldsource>
         <translation type="unfinished">符号付き long</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="595"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="601"/>
         <source>X coordinate</source>
         <oldsource>Coordonnée X</oldsource>
         <translation type="unfinished">X 座標</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="596"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="602"/>
         <source>Y coordinate</source>
         <oldsource>Coordonnée Y</oldsource>
         <translation type="unfinished">Y 座標</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="597"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="603"/>
         <source>Z coordinate</source>
         <oldsource>Coordonnée Z</oldsource>
         <translation type="unfinished">Z 座標</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="599"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="605"/>
         <source>Tutorial</source>
         <oldsource>Tutoriel</oldsource>
         <translation type="unfinished">解説</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="601"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="607"/>
         <source>Disc</source>
         <oldsource>Disque</oldsource>
         <translation type="unfinished">ディスク</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="602"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="608"/>
         <source>Minigame</source>
         <oldsource>Mini-jeu</oldsource>
         <translation type="unfinished">ミニゲーム</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="605"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="611"/>
         <source>Speed (16-bit)</source>
         <oldsource>Vitesse (16 bits)</oldsource>
         <translation type="unfinished">速度 (16 ビット)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="606"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="612"/>
         <source>Direction</source>
         <translation type="unfinished">方向</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="607"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="613"/>
         <source>Triangle</source>
         <translation type="unfinished">△</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="608"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="614"/>
         <source>Group</source>
         <oldsource>Groupe</oldsource>
         <translation type="unfinished">グループ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="609"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="615"/>
         <source>Script</source>
         <translation type="unfinished">スクリプト</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="611"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="617"/>
         <source>Bank</source>
         <translation type="unfinished">バンク</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="612"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="618"/>
         <source>Address</source>
         <oldsource>Adresse</oldsource>
         <translation type="unfinished">アドレス</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="613"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="619"/>
         <source>Priority</source>
         <oldsource>Priorité</oldsource>
         <translation type="unfinished">優先度</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="614"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="620"/>
         <source>Flag</source>
         <translation type="unfinished">フラグ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="617"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="623"/>
         <source>Operator</source>
         <oldsource>Opérateur</oldsource>
         <translation type="unfinished">演算子</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="618"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="624"/>
         <source>Boolean</source>
         <oldsource>Booléen</oldsource>
         <translation type="unfinished">ブーリアン</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="620"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="626"/>
         <source>Parameter</source>
         <oldsource>Paramètre</oldsource>
         <translation type="unfinished">パラメータ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="621"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="627"/>
         <source>State</source>
         <oldsource>État</oldsource>
         <translation type="unfinished">ステート</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="625"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="631"/>
         <source>Variable</source>
         <translation type="unfinished">変数</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="627"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="633"/>
         <source>Rotation</source>
         <oldsource>Sens de rotation</oldsource>
         <translation type="unfinished">回転</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="628"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="634"/>
         <source>Display Type</source>
         <oldsource>Type d&apos;affichage</oldsource>
         <translation type="unfinished">表示タイプ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="629"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="635"/>
         <source>Text</source>
         <oldsource>Texte</oldsource>
         <translation type="unfinished">テキスト</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="630"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="636"/>
         <source>Menu</source>
         <translation type="unfinished">メニュー</translation>
     </message>
@@ -5654,128 +6118,133 @@
     </message>
     <message>
         <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="598"/>
+        <source>Double long</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="604"/>
         <source>Map</source>
         <translation type="unfinished">マップ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="600"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="606"/>
         <source>Character</source>
         <translation type="unfinished">キャラクター</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="603"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="609"/>
         <source>Short</source>
         <translation type="unfinished">Short</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="604"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="610"/>
         <source>Speed (8-bit)</source>
         <translation type="unfinished">速度 (8 ビット)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="610"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="616"/>
         <source>Team member</source>
         <translation>チーム メンバー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="615"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="621"/>
         <source>Jump (short)</source>
         <translation>ジャンプ (short)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="616"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="622"/>
         <source>Jump (long)</source>
         <oldsource>Jumb (long)</oldsource>
         <translation>ジャンプ (long)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="619"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="625"/>
         <source>Layer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="622"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="628"/>
         <source>Window</source>
         <translation>ウィンドウ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="623"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="629"/>
         <source>Width</source>
         <translation>幅</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="624"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="630"/>
         <source>Height</source>
         <translation>高さ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="626"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="632"/>
         <source>Key(s)</source>
         <translation>キー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="631"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="637"/>
         <source>Window Type</source>
         <translation>ウィンドウのタイプ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="632"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="638"/>
         <source>Item</source>
         <translation>アイテム</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="633"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="639"/>
         <source>Materia</source>
         <oldsource>Matéria</oldsource>
         <translation type="unfinished">マテリア</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="634"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="640"/>
         <source>Quantity</source>
         <oldsource>Quantité</oldsource>
         <translation type="unfinished">所持数</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="635"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="641"/>
         <source>Color</source>
         <oldsource>Couleur</oldsource>
         <translation type="unfinished">カラー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="636"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="642"/>
         <source>Animation</source>
         <translation type="unfinished">アニメーション</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="637"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="643"/>
         <source>Music</source>
         <oldsource>Musique</oldsource>
         <translation type="unfinished">BGM</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="638"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="644"/>
         <source>Sound</source>
         <oldsource>Son</oldsource>
         <translation type="unfinished">効果音</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="639"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="645"/>
         <source>Video</source>
         <oldsource>Vidéo</oldsource>
         <translation type="unfinished">ビデオ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="640"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="646"/>
         <source>Label</source>
         <translation>レイヤー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="641"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="647"/>
         <source>Sound operation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="643"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp" line="649"/>
         <source>???</source>
         <translation>???</translation>
     </message>
@@ -5787,33 +6256,33 @@
         <translation type="obsolete">キー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="830"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="877"/>
         <source>Key pressed</source>
         <oldsource>Touche pressée</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="805"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="852"/>
         <source>Keys</source>
         <translation type="unfinished">キー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="831"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="878"/>
         <source>Key pressed once</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="832"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="879"/>
         <source>Key released once</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="834"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="881"/>
         <source>Type</source>
         <translation type="unfinished">タイプ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="836"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="883"/>
         <source>Label</source>
         <translation type="unfinished">レイヤー</translation>
     </message>
@@ -5821,71 +6290,79 @@
 <context>
     <name>ScriptEditorIfPage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="560"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="607"/>
         <source>16-bit signed</source>
         <oldsource>Sur 16 bits signés</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="566"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="613"/>
         <source>Short (8-bit)</source>
         <oldsource>Court (8 bits)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="567"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="614"/>
         <source>Long (16-bit)</source>
         <oldsource>Long (16 bits)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="559"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="606"/>
         <source>8-bit unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="561"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="608"/>
         <source>16-bit unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="570"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="617"/>
         <source>Test to be performed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="574"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="621"/>
         <source>Compare type</source>
         <oldsource>Type de comparaison</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="576"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="623"/>
         <source>Label</source>
         <translation type="unfinished">レイヤー</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="578"/>
-        <source>Jump type</source>
-        <oldsource>Type de saut</oldsource>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="625"/>
+        <source>Jump type (expert)</source>
+        <oldsource>Jump type</oldsource>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScriptEditorIfQPage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="943"/>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="944"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="990"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="991"/>
         <source>(Empty)</source>
         <translation type="unfinished">(なし)</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="949"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="996"/>
         <source>Character</source>
         <translation type="unfinished">キャラクター</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="951"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="998"/>
+        <source>Label</source>
+        <translation type="unfinished">レイヤー</translation>
+    </message>
+</context>
+<context>
+    <name>ScriptEditorJumpNanakiPage</name>
+    <message>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="554"/>
         <source>Label</source>
         <translation type="unfinished">レイヤー</translation>
     </message>
@@ -5911,8 +6388,12 @@
     </message>
     <message>
         <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="429"/>
+        <source>Type (expert)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Type</source>
-        <translation type="unfinished">タイプ</translation>
+        <translation type="obsolete">タイプ</translation>
     </message>
 </context>
 <context>
@@ -5940,19 +6421,19 @@
 <context>
     <name>ScriptEditorMoviePage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="18"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="35"/>
         <source>Disc</source>
         <oldsource>Disque</oldsource>
         <translation type="unfinished">ディスク</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="20"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="37"/>
         <source>Video</source>
         <oldsource>Vidéo</oldsource>
         <translation type="unfinished">ビデオ</translation>
     </message>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="32"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp" line="49"/>
         <source>Disc %1</source>
         <oldsource>Disque %1</oldsource>
         <translation type="unfinished">ディスク %1</translation>
@@ -6020,7 +6501,7 @@
 <context>
     <name>ScriptEditorWaitPage</name>
     <message>
-        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="1005"/>
+        <location filename="widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp" line="1052"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6155,7 +6636,7 @@
 <context>
     <name>ScriptManager</name>
     <message>
-        <location filename="widgets/ScriptManager.cpp" line="170"/>
+        <location filename="widgets/ScriptManager.cpp" line="183"/>
         <source>Error on line %1 : %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6176,7 +6657,7 @@
     <message>
         <location filename="widgets/Search.cpp" line="30"/>
         <location filename="widgets/Search.cpp" line="119"/>
-        <location filename="widgets/Search.cpp" line="270"/>
+        <location filename="widgets/Search.cpp" line="275"/>
         <source>Find</source>
         <translation type="unfinished">検索</translation>
     </message>
@@ -6224,198 +6705,198 @@
     </message>
     <message>
         <location filename="widgets/Search.cpp" line="121"/>
-        <location filename="widgets/Search.cpp" line="279"/>
+        <location filename="widgets/Search.cpp" line="284"/>
         <source>Match case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="160"/>
+        <location filename="widgets/Search.cpp" line="164"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="161"/>
+        <location filename="widgets/Search.cpp" line="165"/>
         <source>Assignment</source>
         <translation type="unfinished">代入</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="162"/>
+        <location filename="widgets/Search.cpp" line="166"/>
         <source>Bit Assignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="165"/>
+        <location filename="widgets/Search.cpp" line="169"/>
         <source>Assignment ≠</source>
         <translation type="unfinished">代入 ≠</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="166"/>
+        <location filename="widgets/Search.cpp" line="170"/>
         <source>Assignment &lt;</source>
         <translation type="unfinished">代入 &lt;</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="167"/>
+        <location filename="widgets/Search.cpp" line="171"/>
         <source>Assignment ≤</source>
         <translation type="unfinished">代入 ≤</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="168"/>
+        <location filename="widgets/Search.cpp" line="172"/>
         <source>Assignment &gt;</source>
         <translation type="unfinished">代入 &gt;</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="169"/>
+        <location filename="widgets/Search.cpp" line="173"/>
         <source>Assignment ≥</source>
         <translation type="unfinished">代入 ≥</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="196"/>
+        <location filename="widgets/Search.cpp" line="200"/>
         <source>Group</source>
         <translation type="unfinished">グループ</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="215"/>
-        <location filename="widgets/Search.cpp" line="283"/>
+        <location filename="widgets/Search.cpp" line="219"/>
+        <location filename="widgets/Search.cpp" line="288"/>
         <source>Scope</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="216"/>
-        <location filename="widgets/Search.cpp" line="284"/>
+        <location filename="widgets/Search.cpp" line="220"/>
+        <location filename="widgets/Search.cpp" line="289"/>
         <source>All fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="217"/>
-        <location filename="widgets/Search.cpp" line="285"/>
+        <location filename="widgets/Search.cpp" line="221"/>
+        <location filename="widgets/Search.cpp" line="290"/>
         <source>Current field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="218"/>
+        <location filename="widgets/Search.cpp" line="222"/>
         <source>Current group script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="219"/>
+        <location filename="widgets/Search.cpp" line="223"/>
         <source>Current script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="275"/>
-        <location filename="widgets/Search.cpp" line="276"/>
+        <location filename="widgets/Search.cpp" line="280"/>
+        <location filename="widgets/Search.cpp" line="281"/>
         <source>Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="277"/>
+        <location filename="widgets/Search.cpp" line="282"/>
         <source>Replace all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="286"/>
+        <location filename="widgets/Search.cpp" line="291"/>
         <source>Current text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="455"/>
+        <location filename="widgets/Search.cpp" line="489"/>
         <source>Last field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="456"/>
+        <location filename="widgets/Search.cpp" line="490"/>
         <source>Last group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="457"/>
+        <location filename="widgets/Search.cpp" line="491"/>
         <source>Last script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="458"/>
+        <location filename="widgets/Search.cpp" line="492"/>
         <source>Last opcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="459"/>
+        <location filename="widgets/Search.cpp" line="493"/>
         <source>Last text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="467"/>
+        <location filename="widgets/Search.cpp" line="501"/>
         <source>First field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="468"/>
+        <location filename="widgets/Search.cpp" line="502"/>
         <source>First group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="469"/>
+        <location filename="widgets/Search.cpp" line="503"/>
         <source>First script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="470"/>
+        <location filename="widgets/Search.cpp" line="504"/>
         <source>First opcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="471"/>
+        <location filename="widgets/Search.cpp" line="505"/>
         <source>First text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="529"/>
+        <location filename="widgets/Search.cpp" line="570"/>
         <source>%1,
 continued from top.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="677"/>
+        <location filename="widgets/Search.cpp" line="688"/>
         <source>%1,
 chase at the end.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="widgets/Search.cpp" line="122"/>
-        <location filename="widgets/Search.cpp" line="280"/>
+        <location filename="widgets/Search.cpp" line="285"/>
         <source>Regular expression</source>
         <oldsource>Utiliser les expressions régulières</oldsource>
         <translation type="unfinished">正規表現</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="147"/>
+        <location filename="widgets/Search.cpp" line="151"/>
         <source>Var</source>
         <translation>変数</translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="159"/>
-        <location filename="widgets/Search.cpp" line="418"/>
+        <location filename="widgets/Search.cpp" line="163"/>
+        <location filename="widgets/Search.cpp" line="428"/>
         <source>Value</source>
         <oldsource>Valeur</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="163"/>
+        <location filename="widgets/Search.cpp" line="167"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="164"/>
+        <location filename="widgets/Search.cpp" line="168"/>
         <source>Bit test</source>
         <oldsource>Test bit</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="418"/>
+        <location filename="widgets/Search.cpp" line="428"/>
         <source>Position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/Search.cpp" line="194"/>
+        <location filename="widgets/Search.cpp" line="198"/>
         <source>Script</source>
         <translation>スクリプト</translation>
     </message>
@@ -6460,6 +6941,11 @@
         <oldsource>Texte n°</oldsource>
         <translation type="unfinished">テキスト</translation>
     </message>
+    <message>
+        <location filename="widgets/SearchAll.cpp" line="56"/>
+        <source>Text</source>
+        <translation type="unfinished">テキスト</translation>
+    </message>
 </context>
 <context>
     <name>SpinBoxDelegate</name>
@@ -6478,215 +6964,250 @@
 <context>
     <name>TextManager</name>
     <message>
-        <location filename="widgets/TextManager.cpp" line="28"/>
+        <location filename="widgets/TextManager.cpp" line="31"/>
         <source>Texts</source>
         <oldsource>Textes</oldsource>
         <translatorcomment>Texts</translatorcomment>
         <translation type="unfinished">テキスト</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="30"/>
+        <location filename="widgets/TextManager.cpp" line="33"/>
         <source>Show unused texts</source>
         <translation type="unfinished">未使用のテキストを表示</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="34"/>
+        <location filename="widgets/TextManager.cpp" line="37"/>
         <source>Add text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="60"/>
+        <location filename="widgets/TextManager.cpp" line="63"/>
         <source>Member 1</source>
         <translation type="unfinished">メンバー 1</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="62"/>
+        <location filename="widgets/TextManager.cpp" line="65"/>
         <source>Member 2</source>
         <translation type="unfinished">メンバー 2</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="64"/>
+        <location filename="widgets/TextManager.cpp" line="67"/>
         <source>Member 3</source>
         <translation type="unfinished">メンバー 3</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="67"/>
+        <location filename="widgets/TextManager.cpp" line="70"/>
         <source>New Page</source>
         <translation type="unfinished">新しいページ</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="69"/>
+        <location filename="widgets/TextManager.cpp" line="72"/>
         <source>Choice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="74"/>
+        <location filename="widgets/TextManager.cpp" line="77"/>
         <source>Grey</source>
         <translation type="unfinished">灰色</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="76"/>
+        <location filename="widgets/TextManager.cpp" line="79"/>
         <source>Blue</source>
         <translation type="unfinished">青色</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="78"/>
+        <location filename="widgets/TextManager.cpp" line="81"/>
         <source>Red</source>
         <translation type="unfinished">赤色</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="80"/>
+        <location filename="widgets/TextManager.cpp" line="83"/>
         <source>Purple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="82"/>
+        <location filename="widgets/TextManager.cpp" line="85"/>
         <source>Green</source>
         <translation type="unfinished">緑色</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="86"/>
+        <location filename="widgets/TextManager.cpp" line="89"/>
         <source>Yellow</source>
         <translation type="unfinished">黄色</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="88"/>
+        <location filename="widgets/TextManager.cpp" line="91"/>
         <source>White</source>
         <translation type="unfinished">白色</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="90"/>
+        <location filename="widgets/TextManager.cpp" line="93"/>
         <source>Blink</source>
         <translation>点滅</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="92"/>
+        <location filename="widgets/TextManager.cpp" line="95"/>
         <source>Multicolor</source>
         <translation>マルチカラー</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="97"/>
+        <location filename="widgets/TextManager.cpp" line="100"/>
         <source>Pause</source>
         <translatorcomment>Pause</translatorcomment>
         <translation>ポーズ</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="99"/>
+        <location filename="widgets/TextManager.cpp" line="102"/>
         <source>Pause 0</source>
         <translatorcomment>Pause 0</translatorcomment>
         <translation>ポーズ 0</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="101"/>
+        <location filename="widgets/TextManager.cpp" line="104"/>
         <source>Pause 5</source>
         <translatorcomment>Pause 5</translatorcomment>
         <translation>ポーズ 5</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="103"/>
+        <location filename="widgets/TextManager.cpp" line="106"/>
         <source>Pause 10</source>
         <translatorcomment>Pause 10</translatorcomment>
         <translation>ポーズ 10</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="105"/>
+        <location filename="widgets/TextManager.cpp" line="108"/>
         <source>Pause 15</source>
         <translatorcomment>Pause 15</translatorcomment>
         <translation>ポーズ 15</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="107"/>
+        <location filename="widgets/TextManager.cpp" line="110"/>
         <source>Pause 20</source>
         <translatorcomment>Pause 20</translatorcomment>
         <translation>ポーズ 20</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="109"/>
+        <location filename="widgets/TextManager.cpp" line="112"/>
         <source>Pause 30</source>
         <translatorcomment>Pause 30</translatorcomment>
         <translation>ポーズ 30</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="111"/>
+        <location filename="widgets/TextManager.cpp" line="114"/>
         <source>Pause 40</source>
         <translatorcomment>Pause 40</translatorcomment>
         <translation>ポーズ 40</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="113"/>
+        <location filename="widgets/TextManager.cpp" line="116"/>
         <source>Pause 50</source>
         <translatorcomment>Pause 50</translatorcomment>
         <translation>ポーズ 50</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="115"/>
+        <location filename="widgets/TextManager.cpp" line="118"/>
         <source>Pause 60</source>
         <translatorcomment>Pause 60</translatorcomment>
         <translation>ポーズ 60</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="117"/>
+        <location filename="widgets/TextManager.cpp" line="120"/>
         <source>Pauses</source>
         <translatorcomment>Pauses</translatorcomment>
         <translation>ポーズ</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="127"/>
+        <location filename="widgets/TextManager.cpp" line="130"/>
         <source>Var10r</source>
         <translation type="unfinished">変数10右 {10r?}</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="135"/>
+        <location filename="widgets/TextManager.cpp" line="138"/>
         <source>Circle</source>
         <translation>○</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="139"/>
+        <location filename="widgets/TextManager.cpp" line="142"/>
         <source>Square</source>
         <translation>□</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="141"/>
+        <location filename="widgets/TextManager.cpp" line="144"/>
         <source>Cross</source>
         <translation>×</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="143"/>
+        <location filename="widgets/TextManager.cpp" line="146"/>
         <source>Keys</source>
         <translation type="unfinished">キー</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="150"/>
+        <location filename="widgets/TextManager.cpp" line="153"/>
         <source>Spaced characters</source>
         <translation type="unfinished">スペース (空白)</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="152"/>
+        <location filename="widgets/TextManager.cpp" line="155"/>
         <source>Memory access</source>
         <translation>メモリー アクセス</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="154"/>
+        <location filename="widgets/TextManager.cpp" line="157"/>
         <source>New Page²</source>
         <translation type="unfinished">新しいページ No,</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="156"/>
+        <location filename="widgets/TextManager.cpp" line="159"/>
         <source>Others</source>
         <translation type="unfinished">その他</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="349"/>
+        <location filename="widgets/TextManager.cpp" line="204"/>
+        <source>Align horizontally</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="205"/>
+        <source>Align vertically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="206"/>
+        <source>Autosize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="215"/>
+        <source>X</source>
+        <translation type="unfinished">X</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="216"/>
+        <source>Y</source>
+        <translation type="unfinished">Y</translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="217"/>
+        <source>W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="218"/>
+        <source>H</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="382"/>
         <source>Text %1</source>
         <translation type="unfinished">テキスト %1</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="448"/>
+        <location filename="widgets/TextManager.cpp" line="491"/>
         <source>Text used in scripts</source>
         <translation type="unfinished">スクリプトのテキスト</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="448"/>
+        <location filename="widgets/TextManager.cpp" line="491"/>
         <source>This text is used by one or more scripts on this field.
 Removing this text may break scripts that reference it.
 Are you sure you want to continue?</source>
@@ -6695,51 +7216,57 @@
 削除を実行してもかまいませんか？</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="84"/>
+        <location filename="widgets/TextManager.cpp" line="544"/>
+        <source>Window %1/%2</source>
+        <oldsource>Fenêtre %1/%2</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/TextManager.cpp" line="87"/>
         <source>Cyan</source>
         <translatorcomment>Cyan</translatorcomment>
         <translation>シアン</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="123"/>
+        <location filename="widgets/TextManager.cpp" line="126"/>
         <source>Var10</source>
         <oldsource>Var1</oldsource>
         <translatorcomment>Var10</translatorcomment>
         <translation>変数10</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="125"/>
+        <location filename="widgets/TextManager.cpp" line="128"/>
         <source>Var16</source>
         <oldsource>Var2</oldsource>
         <translatorcomment>Var16</translatorcomment>
         <translation>変数16</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="129"/>
+        <location filename="widgets/TextManager.cpp" line="132"/>
         <source>Vars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="137"/>
+        <location filename="widgets/TextManager.cpp" line="140"/>
         <source>Triangle</source>
         <translatorcomment>Triangle</translatorcomment>
         <translation>△</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="148"/>
+        <location filename="widgets/TextManager.cpp" line="151"/>
         <source>Scrolling</source>
         <translatorcomment>Scrolling ●</translatorcomment>
         <translation>スクロール</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="35"/>
+        <location filename="widgets/TextManager.cpp" line="38"/>
         <source>Remove text</source>
         <oldsource>Ajouter texte</oldsource>
         <translatorcomment>Add text</translatorcomment>
         <translation type="unfinished">テキストの追加</translation>
     </message>
     <message>
-        <location filename="widgets/TextManager.cpp" line="479"/>
+        <location filename="widgets/TextManager.cpp" line="522"/>
         <source>Page %1/%2</source>
         <translatorcomment>Page %1/%2</translatorcomment>
         <translation>ページ %1/%2</translation>
@@ -6772,131 +7299,130 @@
 <context>
     <name>TutWidget</name>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="26"/>
+        <location filename="widgets/TutWidget.cpp" line="28"/>
         <source>Tutorials/Sounds</source>
         <oldsource>Tutoriels/Musiques</oldsource>
         <translatorcomment>Tutorials/Sounds</translatorcomment>
         <translation type="unfinished">解説/サウンド</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="45"/>
+        <location filename="widgets/TutWidget.cpp" line="47"/>
         <source>Import...</source>
         <oldsource>Exporter...</oldsource>
         <translatorcomment>Export...</translatorcomment>
         <translation type="unfinished">エクスポート...</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="29"/>
+        <location filename="widgets/TutWidget.cpp" line="31"/>
         <source>Add</source>
         <translation type="unfinished">追加</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="30"/>
+        <location filename="widgets/TutWidget.cpp" line="32"/>
         <source>Remove</source>
         <translation type="unfinished">削除</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="44"/>
+        <location filename="widgets/TutWidget.cpp" line="46"/>
         <source>Export...</source>
         <translation type="unfinished">エクスポート...</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="52"/>
+        <location filename="widgets/TutWidget.cpp" line="54"/>
         <source>PlayStation</source>
         <translatorcomment>PlayStation</translatorcomment>
         <translation>PlayStation</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="53"/>
+        <location filename="widgets/TutWidget.cpp" line="55"/>
         <source>PC</source>
         <translatorcomment>PC</translatorcomment>
         <translation>PC</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="130"/>
+        <location filename="widgets/TutWidget.cpp" line="132"/>
         <source>%1 - %2 : %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="143"/>
+        <location filename="widgets/TutWidget.cpp" line="145"/>
         <source>Music ID:</source>
         <translation type="unfinished">BGM ID:</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="156"/>
+        <location filename="widgets/TutWidget.cpp" line="158"/>
         <source>Repair</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="157"/>
+        <location filename="widgets/TutWidget.cpp" line="159"/>
         <source>Replace by empty AKAO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="158"/>
+        <location filename="widgets/TutWidget.cpp" line="160"/>
         <source>Replace by empty tuto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="161"/>
+        <location filename="widgets/TutWidget.cpp" line="163"/>
         <source>There is an error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="215"/>
+        <location filename="widgets/TutWidget.cpp" line="217"/>
         <source>Broken %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="219"/>
+        <location filename="widgets/TutWidget.cpp" line="221"/>
         <source>Music %1</source>
         <translation type="unfinished">BGM %1</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="330"/>
+        <location filename="widgets/TutWidget.cpp" line="332"/>
         <source>Tutorial</source>
         <translation>解説解説</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="331"/>
+        <location filename="widgets/TutWidget.cpp" line="333"/>
         <source>Music</source>
         <translation type="unfinished">BGM</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="348"/>
-        <location filename="widgets/TutWidget.cpp" line="534"/>
+        <location filename="widgets/TutWidget.cpp" line="350"/>
+        <location filename="widgets/TutWidget.cpp" line="546"/>
         <source>Import</source>
         <translation type="unfinished">インポート</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="348"/>
-        <location filename="widgets/TutWidget.cpp" line="492"/>
-        <location filename="widgets/TutWidget.cpp" line="530"/>
+        <location filename="widgets/TutWidget.cpp" line="350"/>
+        <location filename="widgets/TutWidget.cpp" line="542"/>
         <source>sound_%1.akao</source>
         <translation>sound_%1.akao</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="348"/>
-        <location filename="widgets/TutWidget.cpp" line="493"/>
-        <location filename="widgets/TutWidget.cpp" line="531"/>
+        <location filename="widgets/TutWidget.cpp" line="350"/>
+        <location filename="widgets/TutWidget.cpp" line="489"/>
+        <location filename="widgets/TutWidget.cpp" line="543"/>
         <source>Final Fantasy Sound (*.akao)</source>
         <translation>Final Fantasy Sound (*.akao)</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="355"/>
-        <location filename="widgets/TutWidget.cpp" line="382"/>
+        <location filename="widgets/TutWidget.cpp" line="357"/>
+        <location filename="widgets/TutWidget.cpp" line="384"/>
         <source>Tutorial used in scripts</source>
         <translation>スクリプト内の解説</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="355"/>
+        <location filename="widgets/TutWidget.cpp" line="357"/>
         <source>Insert a tutorial here will shift the IDs of the tutorials that follows, this may be a problem.
 Are you sure you want to continue?</source>
         <translation>ここに解説を挿入すると以降の解説の ID がずれるためトラブルの原因になるかもしれません。
 挿入を実行してもかまいませんか？</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="382"/>
+        <location filename="widgets/TutWidget.cpp" line="384"/>
         <source>This tutorial may be used by one or more scripts on this field.
 Delete can cause errors.
 Are you sure you want to continue?</source>
@@ -6905,7 +7431,7 @@
 それでも削除しますか？</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="382"/>
+        <location filename="widgets/TutWidget.cpp" line="384"/>
         <source>This tutorial is used by one or more scripts on this field.
 Remove will replace calls to this tutorial with calls to the tutorial that follows.
 Are you sure you want to continue?</source>
@@ -6914,47 +7440,57 @@
 それでも削除しますか？</translation>
     </message>
     <message>
+        <location filename="widgets/TutWidget.cpp" line="490"/>
+        <source>PSF MIDI file (*.minipsf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="widgets/TutWidget.cpp" line="496"/>
+        <source>%1.akao</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/TutWidget.cpp" line="500"/>
         <source>Export</source>
         <translation type="unfinished">エクスポート</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="506"/>
-        <location filename="widgets/TutWidget.cpp" line="544"/>
-        <location filename="widgets/TutWidget.cpp" line="549"/>
+        <location filename="widgets/TutWidget.cpp" line="511"/>
+        <location filename="widgets/TutWidget.cpp" line="556"/>
+        <location filename="widgets/TutWidget.cpp" line="561"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="506"/>
+        <location filename="widgets/TutWidget.cpp" line="511"/>
         <source>Opening error file</source>
         <translation type="unfinished">オープン エラー</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="544"/>
+        <location filename="widgets/TutWidget.cpp" line="556"/>
         <source>Opening Error File</source>
         <translation type="unfinished">オープン エラー</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="549"/>
+        <location filename="widgets/TutWidget.cpp" line="561"/>
         <source>File too large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="217"/>
+        <location filename="widgets/TutWidget.cpp" line="219"/>
         <source>Tuto %1</source>
         <translatorcomment>Tuto %1</translatorcomment>
         <translation>説明 %1</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="489"/>
-        <location filename="widgets/TutWidget.cpp" line="527"/>
+        <location filename="widgets/TutWidget.cpp" line="493"/>
+        <location filename="widgets/TutWidget.cpp" line="539"/>
         <source>tuto_%1.tutps</source>
         <translation>tuto_%1.tutps</translation>
     </message>
     <message>
-        <location filename="widgets/TutWidget.cpp" line="490"/>
-        <location filename="widgets/TutWidget.cpp" line="528"/>
+        <location filename="widgets/TutWidget.cpp" line="494"/>
+        <location filename="widgets/TutWidget.cpp" line="540"/>
         <source>Tuto Final Fantasy VII PS (*.tutps)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6962,14 +7498,14 @@
 <context>
     <name>VarManager</name>
     <message>
-        <location filename="widgets/VarManager.cpp" line="24"/>
+        <location filename="widgets/VarManager.cpp" line="25"/>
         <source>Variable manager</source>
         <oldsource>Gestionnaire de variables</oldsource>
         <translatorcomment>Variable manager</translatorcomment>
         <translation type="unfinished">変数マネージャー</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="36"/>
+        <location filename="widgets/VarManager.cpp" line="35"/>
         <source>Rename</source>
         <oldsource>Renommer</oldsource>
         <translatorcomment>Rename</translatorcomment>
@@ -6983,21 +7519,21 @@
         <translation type="unfinished">アドレス</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="75"/>
+        <location filename="widgets/VarManager.cpp" line="74"/>
         <source>Addresses Used</source>
         <oldsource>Adresses utilisées</oldsource>
         <translatorcomment>Adresses used</translatorcomment>
         <translation type="unfinished">アドレスに適用</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="265"/>
+        <location filename="widgets/VarManager.cpp" line="264"/>
         <source>Error</source>
         <oldsource>Erreur</oldsource>
         <translatorcomment>Error</translatorcomment>
         <translation type="unfinished">エラー</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="273"/>
+        <location filename="widgets/VarManager.cpp" line="272"/>
         <source>Searching</source>
         <oldsource>Recherche</oldsource>
         <translatorcomment>Searching</translatorcomment>
@@ -7019,60 +7555,60 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="62"/>
+        <location filename="widgets/VarManager.cpp" line="61"/>
         <source>Var banks 08, 09 and 10 are temporary and do not appear in the game save. &lt;br/&gt;Other banks are stored in pair: for example 01-02 is in the same memory location, but the first is used to store 8-bit values and the second is used to store 16-bit values.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="76"/>
+        <location filename="widgets/VarManager.cpp" line="75"/>
         <source>Save</source>
         <translation type="unfinished">保存</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="265"/>
+        <location filename="widgets/VarManager.cpp" line="264"/>
         <source>Save Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="273"/>
+        <location filename="widgets/VarManager.cpp" line="272"/>
         <source>Searching, it may take a minute...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="327"/>
+        <location filename="widgets/VarManager.cpp" line="333"/>
         <source>rw</source>
         <translation>rw</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="329"/>
+        <location filename="widgets/VarManager.cpp" line="335"/>
         <source>r</source>
         <translation>r</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="331"/>
+        <location filename="widgets/VarManager.cpp" line="337"/>
         <source>w</source>
         <translation>w</translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="334"/>
+        <location filename="widgets/VarManager.cpp" line="340"/>
         <source>bitfield</source>
         <oldsource>bits</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="337"/>
+        <location filename="widgets/VarManager.cpp" line="343"/>
         <source>1 Byte</source>
         <oldsource>1 octet</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="340"/>
+        <location filename="widgets/VarManager.cpp" line="346"/>
         <source>2 Bytes</source>
         <oldsource>2 octets</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/VarManager.cpp" line="343"/>
+        <location filename="widgets/VarManager.cpp" line="349"/>
         <source>2 Signed Bytes</source>
         <oldsource>2 octets signés</oldsource>
         <translation type="unfinished"></translation>
@@ -7137,7 +7673,8 @@
     </message>
     <message>
         <location filename="widgets/WalkmeshManager.cpp" line="47"/>
-        <source>Reset</source>
+        <source>Reset Camera</source>
+        <oldsource>Reset</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7322,14 +7859,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="widgets/WalkmeshManager.cpp" line="394"/>
         <source>Up</source>
-        <translation type="unfinished">上に</translation>
+        <translation type="obsolete">上に</translation>
     </message>
     <message>
-        <location filename="widgets/WalkmeshManager.cpp" line="396"/>
         <source>Down</source>
-        <translation type="unfinished">下に</translation>
+        <translation type="obsolete">下に</translation>
     </message>
     <message>
         <location filename="widgets/WalkmeshManager.cpp" line="398"/>
@@ -7388,7 +7923,8 @@
     </message>
     <message>
         <location filename="widgets/WalkmeshManager.cpp" line="473"/>
-        <source>Field scale:</source>
+        <source>Field map scale:</source>
+        <oldsource>Field scale:</oldsource>
         <translation type="unfinished">フィールド スケール :</translation>
     </message>
     <message>
@@ -7428,6 +7964,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="widgets/WalkmeshManager.cpp" line="394"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="widgets/WalkmeshManager.cpp" line="396"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="widgets/WalkmeshManager.cpp" line="410"/>
         <source>Background layer 3 height</source>
         <oldsource>Largeur couche 3 décor</oldsource>
@@ -7486,259 +8032,253 @@
 <context>
     <name>Window</name>
     <message>
-        <location filename="Window.cpp" line="95"/>
+        <location filename="Window.cpp" line="97"/>
         <source>&amp;Find...</source>
         <oldsource>&amp;Zones...</oldsource>
         <translatorcomment>&amp;Walkmesh...</translatorcomment>
         <translation type="unfinished">検索(&amp;F)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="91"/>
+        <location filename="Window.cpp" line="93"/>
         <source>&amp;Background...</source>
         <translatorcomment>&amp;Background...</translatorcomment>
         <translation>背景(&amp;B)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="126"/>
+        <location filename="Window.cpp" line="127"/>
         <source>&amp;Configuration...</source>
         <oldsource>Configuration...</oldsource>
         <translation type="unfinished">構成設定(&amp;C)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="60"/>
+        <location filename="Window.cpp" line="62"/>
         <source>&amp;File</source>
         <translation type="unfinished">ファイル(&amp;F)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="62"/>
+        <location filename="Window.cpp" line="64"/>
         <source>&amp;Open...</source>
         <translation type="unfinished">開く(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="63"/>
+        <location filename="Window.cpp" line="65"/>
         <source>Open &amp;Directory...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="64"/>
+        <location filename="Window.cpp" line="66"/>
         <source>&amp;Recent files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="68"/>
+        <location filename="Window.cpp" line="70"/>
         <source>&amp;Save</source>
         <translation>保存(&amp;S)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="69"/>
+        <location filename="Window.cpp" line="71"/>
         <source>Save &amp;As...</source>
         <translation type="unfinished">名前を付けて保存(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="70"/>
         <source>&amp;Export the current field...</source>
-        <translation type="unfinished">現在のファイルをエクスポート(&amp;E)...</translation>
+        <translation type="obsolete">現在のファイルをエクスポート(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="71"/>
+        <location filename="Window.cpp" line="73"/>
         <source>&amp;Mass Export...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="72"/>
-        <source>&amp;Import the current field...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Window.cpp" line="74"/>
+        <location filename="Window.cpp" line="76"/>
+        <location filename="Window.cpp" line="406"/>
+        <location filename="Window.cpp" line="1567"/>
         <source>Archive Mana&amp;ger...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="76"/>
+        <location filename="Window.cpp" line="78"/>
         <source>R&amp;un FF7</source>
         <oldsource>Run FF7</oldsource>
         <translation type="unfinished">FF7 を実行 (&amp;U)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="81"/>
+        <location filename="Window.cpp" line="83"/>
         <source>C&amp;lose</source>
         <translation type="unfinished">閉じる(&amp;L)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="82"/>
+        <location filename="Window.cpp" line="84"/>
         <source>E&amp;xit</source>
         <translation type="unfinished">終了(&amp;X)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="85"/>
+        <location filename="Window.cpp" line="87"/>
         <source>T&amp;ools</source>
         <translation type="unfinished">ツール(&amp;O)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="86"/>
+        <location filename="Window.cpp" line="88"/>
         <source>&amp;Texts...</source>
         <translation type="unfinished">テキスト(&amp;T)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="87"/>
         <source>Field &amp;Models...</source>
-        <translation type="unfinished">3Dモデル(&amp;M)...</translation>
+        <translation type="obsolete">3Dモデル(&amp;M)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="88"/>
+        <location filename="Window.cpp" line="90"/>
         <source>Encounte&amp;rs...</source>
         <translation type="unfinished">エンカウント(&amp;E)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="89"/>
+        <location filename="Window.cpp" line="91"/>
         <source>Tutorials/&amp;Sounds...</source>
         <translation type="unfinished">解説/サウンド(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="90"/>
+        <location filename="Window.cpp" line="92"/>
         <source>&amp;Walkmesh...</source>
         <translation type="unfinished">ウォーク メッシュ(&amp;W)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="92"/>
+        <location filename="Window.cpp" line="94"/>
         <source>M&amp;iscellaneous...</source>
         <translation type="unfinished">各種情報(&amp;I)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="94"/>
+        <location filename="Window.cpp" line="96"/>
         <source>Variable Mana&amp;ger...</source>
         <translation type="unfinished">変数マネージャー(&amp;G)...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="96"/>
-        <source>Miscellaneous Oper&amp;ations...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Window.cpp" line="100"/>
+        <location filename="Window.cpp" line="101"/>
         <source>&amp;Settings</source>
         <translation type="unfinished">設定(&amp;S)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="102"/>
+        <location filename="Window.cpp" line="103"/>
         <source>&amp;Japanese Characters</source>
         <translation type="unfinished">日本語版文字コードを使用 (&amp;J)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="106"/>
+        <location filename="Window.cpp" line="107"/>
         <source>&amp;Language</source>
         <translation type="unfinished">言語(&amp;L)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="109"/>
+        <location filename="Window.cpp" line="110"/>
         <source>English (default)</source>
         <translation type="unfinished">English (デフォルト)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="118"/>
+        <location filename="Window.cpp" line="119"/>
         <source>English</source>
         <translation type="unfinished">Japanese (日本語)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="129"/>
+        <location filename="Window.cpp" line="130"/>
         <source>Main &amp;toolbar</source>
         <translation type="unfinished">メイン ツールバー(&amp;T)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="134"/>
-        <location filename="Window.cpp" line="438"/>
+        <location filename="Window.cpp" line="135"/>
+        <location filename="Window.cpp" line="480"/>
         <source>Open a file</source>
         <translation type="unfinished">ファイルを開く</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="136"/>
-        <location filename="Window.cpp" line="358"/>
+        <location filename="Window.cpp" line="137"/>
+        <location filename="Window.cpp" line="389"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="139"/>
+        <location filename="Window.cpp" line="140"/>
         <source>Find</source>
         <translation type="unfinished">検索</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="256"/>
-        <source>&amp;View</source>
-        <translation type="unfinished">表示(&amp;V)</translation>
+        <location filename="Window.cpp" line="144"/>
+        <source>Text editor</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="259"/>
-        <source>Field List</source>
+        <location filename="Window.cpp" line="146"/>
+        <source>Model loader editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="262"/>
+        <location filename="Window.cpp" line="150"/>
+        <source>Walkmesh editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="284"/>
+        <source>&amp;View</source>
+        <translation type="unfinished">表示(&amp;V)</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="290"/>
         <source>Background Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="326"/>
+        <location filename="Window.cpp" line="354"/>
         <source>Settings changed</source>
         <translation type="unfinished">設定の変更</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="327"/>
+        <location filename="Window.cpp" line="355"/>
         <source>Restart the program for the settings to take effect.</source>
         <translation>プログラムを再起動して設定の変更を適用してください。</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="356"/>
+        <location filename="Window.cpp" line="387"/>
         <source>
 
 Edited files:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="358"/>
+        <location filename="Window.cpp" line="389"/>
         <source>Would you like to save changes of %1?%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="430"/>
+        <location filename="Window.cpp" line="472"/>
         <source>Compatible Files (*.lgp *.DAT *.bin *.iso *.img)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="431"/>
+        <location filename="Window.cpp" line="473"/>
         <source>Lgp Files (*.lgp)</source>
         <translation type="unfinished">Lgp ファイル (*.lgp)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="432"/>
-        <location filename="Window.cpp" line="946"/>
-        <location filename="Window.cpp" line="1077"/>
-        <location filename="Window.cpp" line="1188"/>
+        <location filename="Window.cpp" line="474"/>
+        <location filename="Window.cpp" line="1015"/>
+        <location filename="Window.cpp" line="1292"/>
         <source>DAT File (*.DAT)</source>
         <translation type="unfinished">DAT ファイル (*.DAT)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="433"/>
-        <source>PC Field File (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Window.cpp" line="434"/>
+        <location filename="Window.cpp" line="476"/>
         <source>Disc Image (*.bin *.iso *.img)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="486"/>
+        <location filename="Window.cpp" line="528"/>
         <source>Select a folder containing the Final Fantasy VII field files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="494"/>
+        <location filename="Window.cpp" line="536"/>
         <source>File Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="495"/>
+        <location filename="Window.cpp" line="537"/>
         <source>What type of file to look for?
  - Playstation field files (&quot;EXAMPLE.DAT&quot;)
  - PC Field File (&quot;example&quot;)
@@ -7746,275 +8286,308 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="499"/>
+        <location filename="Window.cpp" line="541"/>
         <source>PS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="500"/>
+        <location filename="Window.cpp" line="542"/>
         <source>PC</source>
         <translation type="unfinished">PC</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="535"/>
+        <location filename="Window.cpp" line="584"/>
         <source>Cancel</source>
         <translatorcomment>アンドゥ</translatorcomment>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="535"/>
+        <location filename="Window.cpp" line="584"/>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="558"/>
+        <location filename="Window.cpp" line="613"/>
         <source>Opening...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="577"/>
-        <location filename="Window.cpp" line="975"/>
+        <location filename="Window.cpp" line="632"/>
         <source>Nothing found!</source>
         <translation type="unfinished">見つかりませんでした！</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="581"/>
+        <location filename="Window.cpp" line="636"/>
         <source>The file already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="584"/>
-        <location filename="Window.cpp" line="978"/>
+        <location filename="Window.cpp" line="639"/>
+        <location filename="Window.cpp" line="1047"/>
         <source>The file is inaccessible</source>
         <translation type="unfinished">ファイルにアクセスできません</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="587"/>
-        <location filename="Window.cpp" line="981"/>
+        <location filename="Window.cpp" line="642"/>
+        <location filename="Window.cpp" line="1050"/>
         <source>Can not create temporary file</source>
         <translation type="unfinished">一時ファイルが作成できません</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="590"/>
-        <source>Unable to remove the file</source>
+        <location filename="Window.cpp" line="654"/>
+        <location filename="Window.cpp" line="1335"/>
+        <source>Invalid file</source>
+        <translation type="unfinished">無効なファイル</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="657"/>
+        <source>This error should not appear, thank you for reporting it</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="566"/>
+        <location filename="Window.cpp" line="661"/>
+        <location filename="Window.cpp" line="1068"/>
+        <location filename="Window.cpp" line="1193"/>
+        <location filename="Window.cpp" line="1237"/>
+        <location filename="Window.cpp" line="1265"/>
+        <location filename="Window.cpp" line="1337"/>
+        <location filename="Window.cpp" line="1365"/>
+        <source>Error</source>
+        <translation type="unfinished">エラー</translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="72"/>
+        <source>&amp;Export the current map...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="593"/>
-        <source>Failed to rename file.</source>
+        <location filename="Window.cpp" line="74"/>
+        <source>&amp;Import to current map...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="596"/>
-        <source>Failed to copy file</source>
+        <location filename="Window.cpp" line="89"/>
+        <source>Map &amp;Models...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="599"/>
-        <location filename="Window.cpp" line="1238"/>
-        <source>Invalid file</source>
-        <translation type="unfinished">無効なファイル</translation>
+        <location filename="Window.cpp" line="98"/>
+        <source>B&amp;atch processing...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="602"/>
-        <source>This error should not appear, thank you for reporting it</source>
+        <location filename="Window.cpp" line="287"/>
+        <source>Map List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="606"/>
-        <location filename="Window.cpp" line="999"/>
-        <location filename="Window.cpp" line="1113"/>
-        <location filename="Window.cpp" line="1145"/>
-        <location filename="Window.cpp" line="1173"/>
-        <location filename="Window.cpp" line="1240"/>
-        <location filename="Window.cpp" line="1268"/>
-        <source>Error</source>
-        <translation type="unfinished">エラー</translation>
+        <location filename="Window.cpp" line="475"/>
+        <source>PC field File (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="648"/>
+        <source>Failed to rename the file, check write permissions.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="844"/>
-        <location filename="Window.cpp" line="1436"/>
+        <location filename="Window.cpp" line="651"/>
+        <source>Failed to copy the file, check write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="902"/>
+        <location filename="Window.cpp" line="1555"/>
         <source>Author: %1</source>
         <translation type="unfinished">作者: %1</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="923"/>
+        <location filename="Window.cpp" line="992"/>
         <source>Compilation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="923"/>
+        <location filename="Window.cpp" line="992"/>
         <source>Error Compiling Scripts:
 scene %1 (%2), group %3 (%4), script %5, line %6: %7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="939"/>
+        <location filename="Window.cpp" line="1008"/>
         <source>Save Directory As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="944"/>
+        <location filename="Window.cpp" line="1013"/>
         <source>Lgp File (*.lgp)</source>
         <translation type="unfinished">Lgp ファイル (*.lgp)</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="948"/>
+        <location filename="Window.cpp" line="1017"/>
         <source>Iso File (*.iso *.bin *.img)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="952"/>
+        <location filename="Window.cpp" line="1021"/>
         <source>Save As</source>
         <translation type="unfinished">名前を付けて保存</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="957"/>
+        <location filename="Window.cpp" line="1026"/>
         <source>Saving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="984"/>
-        <source>Unable to remove the file, check write permissions.</source>
+        <location filename="Window.cpp" line="1149"/>
+        <location filename="Window.cpp" line="1291"/>
+        <source>PC Field Map (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="987"/>
-        <source>Unable to rename the file, check write permissions.</source>
+        <location filename="Window.cpp" line="1150"/>
+        <source>Data DAT File (*.DAT)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="990"/>
-        <source>Unable to copy the file, check write permissions.</source>
+        <location filename="Window.cpp" line="1151"/>
+        <source>Textures MIM File (*.MIM)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="993"/>
-        <source>Invalid archive</source>
+        <location filename="Window.cpp" line="1152"/>
+        <location filename="Window.cpp" line="1293"/>
+        <source>Uncompressed PC Field Map (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="996"/>
-        <source>This feature is not complete</source>
+        <location filename="Window.cpp" line="1188"/>
+        <source>Archive is inaccessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1076"/>
-        <location filename="Window.cpp" line="1189"/>
-        <source>PC Field (*)</source>
+        <location filename="Window.cpp" line="645"/>
+        <location filename="Window.cpp" line="1053"/>
+        <source>Unable to remove the file, check write permissions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1078"/>
-        <location filename="Window.cpp" line="1191"/>
-        <source>Uncompressed PC Field (*)</source>
+        <location filename="Window.cpp" line="1044"/>
+        <source>No maps found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1090"/>
+        <location filename="Window.cpp" line="1056"/>
+        <source>Unable to rename the file, check write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1059"/>
+        <source>Unable to copy the file, check write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1062"/>
+        <source>Invalid archive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1065"/>
+        <source>This feature is not complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Window.cpp" line="1164"/>
         <source>Export the current file</source>
         <translation type="unfinished">現在のファイルをエクスポート</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1108"/>
         <source>Lgp archive is inaccessible</source>
         <oldsource>lgp archive is inaccessible</oldsource>
-        <translation type="unfinished">Lgp アーカイブにアクセスできません</translation>
+        <translation type="obsolete">Lgp アーカイブにアクセスできません</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1109"/>
-        <location filename="Window.cpp" line="1237"/>
+        <location filename="Window.cpp" line="1189"/>
+        <location filename="Window.cpp" line="1334"/>
         <source>Error reopening file</source>
         <translation type="unfinished">ファイルの再読み込みに失敗</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1110"/>
+        <location filename="Window.cpp" line="1190"/>
         <source>Unable to create the new file</source>
         <translation type="unfinished">新規ファイルを作成できません</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1111"/>
+        <location filename="Window.cpp" line="1191"/>
         <source>Not yet implemented!</source>
         <translation type="unfinished">まだ実装されていません！</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1127"/>
+        <location filename="Window.cpp" line="1207"/>
         <source>Export...</source>
         <translation type="unfinished">エクスポート...</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1145"/>
+        <location filename="Window.cpp" line="1237"/>
         <source>An error occured when exporting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1164"/>
+        <location filename="Window.cpp" line="1256"/>
         <source>Import...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1173"/>
+        <location filename="Window.cpp" line="1265"/>
         <source>An error occurred when importing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1190"/>
+        <location filename="Window.cpp" line="1294"/>
         <source>Uncompressed DAT File (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1198"/>
+        <location filename="Window.cpp" line="1303"/>
         <source>Import a file</source>
         <translation type="unfinished">ファイルのインポート</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1217"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Window.cpp" line="1217"/>
-        <source>The background importation algorithm give bad results in-game, you have been warned!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Window.cpp" line="1268"/>
+        <location filename="Window.cpp" line="1365"/>
         <source>Final Fantasy VII couldn&apos;t be launched
 %1</source>
         <translation>Final Fantasy VII を起動できません。
 %1</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1362"/>
-        <location filename="Window.cpp" line="1440"/>
+        <location filename="Window.cpp" line="1481"/>
+        <location filename="Window.cpp" line="1559"/>
         <source>Opening error</source>
         <translation type="unfinished">オープン エラー</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1362"/>
+        <location filename="Window.cpp" line="1481"/>
         <source>Can not open encounters!</source>
         <translation type="unfinished">エンカウントが開けません！</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1440"/>
+        <location filename="Window.cpp" line="1559"/>
         <source>Can not open miscellaneous informations!</source>
         <translation type="unfinished">各種情報が開けません！</translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1464"/>
-        <source>Applying...</source>
+        <location filename="Window.cpp" line="1570"/>
+        <source>Go back to field map editor...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1529"/>
-        <source>By myst6re&lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Thanks to:&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;/ul&gt;</source>
-        <oldsource>By myst6re&lt;br/&gt;&lt;a href=&quot;https://github.com/myst6re/makoureactor/&quot;&gt;github.com/myst6re/makoureactor&lt;/a&gt;&lt;br/&gt;&lt;br/&gt;Thanks to :&lt;ul style=&quot;margin:0&quot;&gt;&lt;li&gt;Squall78&lt;/li&gt;&lt;li&gt;Synergy Blades&lt;/li&gt;&lt;li&gt;Akari&lt;/li&gt;&lt;li&gt;Asa&lt;/li&gt;&lt;li&gt;Aali&lt;/li&gt;&lt;/ul&gt;</oldsource>
+        <location filename="Window.cpp" line="1590"/>
+        <source>Applying...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Window.cpp" line="1536"/>
         <source>Close</source>
-        <translation type="unfinished">閉じる</translation>
+        <translation type="obsolete">閉じる</translation>
     </message>
 </context>
 </TS>
diff -Nru makoureactor-1.7.2/Makou_Reactor.pro makoureactor-1.8.0/Makou_Reactor.pro
--- makoureactor-1.7.2/Makou_Reactor.pro	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Makou_Reactor.pro	2020-08-08 18:46:56.000000000 +0000
@@ -1,23 +1,24 @@
 TEMPLATE = app
 TARGET = makoureactor
 
-QT += core gui opengl
-greaterThan(QT_MAJOR_VERSION, 4) {
-    QT += widgets
-    CONFIG += c++11
-}
-lessThan(QT_MAJOR_VERSION, 5) {
-    # Compatibility layer
-    INCLUDEPATH += compat
-    # Enabling c++11
-    QMAKE_CXXFLAGS += -std=c++0x
-}
+QT += core gui opengl widgets
+CONFIG += c++11
 
 # Input
 HEADERS += \
     Window.h \
     Parameters.h \
     Data.h \
+    core/PsfFile.h \
+    core/field/BackgroundTilesFile.h \
+    core/field/MaplistFile.h \
+    widgets/AboutDialog.h \
+    widgets/ArchivePreview.h \
+    widgets/EmptyFieldWidget.h \
+    widgets/HelpWidget.h \
+    widgets/LgpWidget.h \
+    widgets/PsfDialog.h \
+    widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.h \
     widgets/WalkmeshWidget.h \
     widgets/WalkmeshManager.h \
     widgets/VertexWidget.h \
@@ -38,7 +39,6 @@
     widgets/MassImportDialog.h \
     widgets/MassExportDialog.h \
     widgets/Listwidget.h \
-    widgets/LgpDialog.h \
     widgets/KeyEditorDialog.h \
     widgets/ImportDialog.h \
     widgets/HexLineEdit.h \
@@ -154,9 +154,19 @@
 
 SOURCES += \
     Window.cpp \
+    core/PsfFile.cpp \
+    core/field/BackgroundTilesFile.cpp \
+    core/field/MaplistFile.cpp \
     txt.cpp \
     main.cpp \
     Data.cpp \
+    widgets/AboutDialog.cpp \
+    widgets/ArchivePreview.cpp \
+    widgets/EmptyFieldWidget.cpp \
+    widgets/HelpWidget.cpp \
+    widgets/LgpWidget.cpp \
+    widgets/PsfDialog.cpp \
+    widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp \
     widgets/WalkmeshWidget.cpp \
     widgets/WalkmeshManager.cpp \
     widgets/VertexWidget.cpp \
@@ -177,7 +187,6 @@
     widgets/MassImportDialog.cpp \
     widgets/MassExportDialog.cpp \
     widgets/Listwidget.cpp \
-    widgets/LgpDialog.cpp \
     widgets/KeyEditorDialog.cpp \
     widgets/ImportDialog.cpp \
     widgets/HexLineEdit.cpp \
@@ -339,7 +348,6 @@
 OTHER_FILES += Makou_Reactor.rc \
     deploy.bat \
     vars.cfg \
-    compat/QtWidgets \
     .travis.yml \
     README.md \
     .clang-format \
diff -Nru makoureactor-1.7.2/Makou_Reactor.qrc makoureactor-1.8.0/Makou_Reactor.qrc
--- makoureactor-1.7.2/Makou_Reactor.qrc	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Makou_Reactor.qrc	2020-08-08 18:46:56.000000000 +0000
@@ -45,5 +45,7 @@
         <file>images/icon-char-7.png</file>
         <file>images/icon-char-8.png</file>
         <file>vars.cfg</file>
+        <file>images/text-editor.png</file>
+        <file>images/cursor.png</file>
     </qresource>
 </RCC>
diff -Nru makoureactor-1.7.2/Parameters.h makoureactor-1.8.0/Parameters.h
--- makoureactor-1.7.2/Parameters.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Parameters.h	2020-08-08 18:46:56.000000000 +0000
@@ -16,9 +16,11 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 #define PROG_NAME			"Makou Reactor"
-#define PROG_VERSION		"1.7.2"
+#define PROG_VERSION		"1.8.0"
 #define PROG_FULLNAME		QString("%1 %2").arg(PROG_NAME, PROG_VERSION)
 
-#define RC_PRODUCT_VERSION			1,7,2,0
+#define RC_PRODUCT_VERSION			1,8,0,0
 #define RC_FILE_DESCRIPTION_STR		"Makou Reactor FF7 Field Editor"
 #define RC_COMPANY_NAME_STR			"myst6re"
+
+//#define OPENGL_DEBUG 1
diff -Nru makoureactor-1.7.2/README.md makoureactor-1.8.0/README.md
--- makoureactor-1.7.2/README.md	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/README.md	2020-08-08 18:46:56.000000000 +0000
@@ -6,10 +6,13 @@
 
 ![Makou Reactor](images/logo-shinra.png)
 
-Final Fantasy VII field archive editor.
+Final Fantasy VII field archive editor ([Forum](http://forums.qhimm.com/index.php?topic=9658.0)).
 
 ## Installing
 
+Makou Reactor can be downloaded as a simple ZIP archive, or via repositories
+when available:
+
  - **Windows**: Download the last release on [GitHub](https://github.com/myst6re/makoureactor/releases).
  - **MacOSX**: Download the latest release on [GitHub](https://github.com/myst6re/makoureactor/releases)
  - **Debian/Ubuntu**: Add sithlord48's [Stable Release](https://launchpad.net/~sithlord48/+archive/ubuntu/ff7) or [Daily Builds](https://launchpad.net/~sithlord48/+archive/ubuntu/ff7-daily) ppa to install the makoureactor package
@@ -17,11 +20,21 @@
  - **Other Linux**: Download the latest release on [GitHub](https://github.com/myst6re/makoureactor/releases)
 
 
+## Contributing
+
+You are welcome to contribute on this project, feel free to open issues and
+PR on [GitHub](https://github.com/myst6re/makoureactor).
+Ensure that you have commited in `develop` branch, otherwise I will not accept your
+request.
+
 ## Building
 
+If you are a developer and you want to build this software, follow the
+instructions below.
+
 ### Requirements
 
- - Qt 4.8 or Qt 5
+ - Qt 5.4+
  - GLUT
  - zlib
 
@@ -72,9 +85,3 @@
 qmake /path/to/Makou_Reactor.pro
 make
 ~~~
-
-## How to contribute
-
-Pull requests are welcome on [GitHub](https://github.com/myst6re/makoureactor).
-Ensure that you have commited in `develop` branch, otherwise I will not accept your
-request.
diff -Nru makoureactor-1.7.2/.travis.yml makoureactor-1.8.0/.travis.yml
--- makoureactor-1.7.2/.travis.yml	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/.travis.yml	2020-08-08 18:46:56.000000000 +0000
@@ -1,44 +1,70 @@
 language: cpp
+sudo: required
+dist: xenial
+osx_image: xcode12
 
 os:
-  - linux
-  - osx
-
-install:
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-         lsb_release -a
-      && sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
-      && sudo apt-add-repository -y ppa:canonical-qt5-edgers/ubuntu1204-qt5
-      && sudo apt-get -qq update
-      && sudo apt-get -qq install -y --force-yes g++-4.9 libc6-i386 freeglut3-dev qtbase5-dev
-      && export CXX="g++-4.9"
-      ;
-    else
-         brew update > /dev/null
-      && brew install homebrew/x11/freeglut
-      && brew install qt5
-      && chmod -R 755 /usr/local/opt/qt5/*
-      ;
-    fi
+ - linux
+ - osx
+matrix:
+ exclude:
+# Only do coverity or coverage build on Linux when the compiler is gcc
+  - os: linux
+    compiler: clang
+    env: COVERITY=1
+    env: COVERAGE=1
+# Don't build with clang on Linux
+  - os: linux
+    compiler: clang
+# Don't build with gcc on OSX
+  - os: osx
+    compiler: gcc
 
 before_script:
-  - if [ "${TRAVIS_OS_NAME}" != "linux" ]; then
-         QTDIR="/usr/local/opt/qt5"
-      && export PATH="$QTDIR/bin:$PATH"
-      ;
-    fi
-  - mkdir -p build
-  - cd build
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-        qmake -qt=qt5 -config release ..
-        ;
-    else
-        qmake -config release ..
-        ;
-    fi
+- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+    lsb_release -a;
+    sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test;
+    sudo apt-add-repository -y ppa:beineri/opt-qt-5.15.0-xenial;
+    sudo apt-get -qq update;
+    sudo apt-get -qq install -y g++-5 freeglut3-dev qt5-default qt515tools qt515base;
+    export CXX="g++-5";
+    source /opt/qt*/bin/qt*-env.sh; 
+  else
+    brew update > /dev/null;
+    brew install homebrew/x11/freeglut;
+    brew install qt5;
+    chmod -R 755 /usr/local/opt/qt5/*;
+    QTDIR="/usr/local/opt/qt5";
+    export PATH="$QTDIR/bin:$PATH";
+  fi
 
 script:
-  - make -j2
+- mkdir -p build
+- cd build
+- qmake -config release ..
+- make -j2
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    make INSTALL_ROOT=appdir install; find appdir/; 
+    mv appdir/usr/share/makoureactor/*.qm appdir/usr/bin/;
+    rm -rf appdir/usr/share/makoureactor;
+    wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"; 
+    chmod a+x linuxdeployqt*.AppImage; 
+    unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH; 
+    ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs; 
+    ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage;
+  fi
+- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+    mv ../*.qm makoureactor.app/Contents/MacOS/; 
+    macdeployqt makoureactor.app/ -dmg;  
+  fi
+after_success:
+- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+    find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ; 
+    bash ./upload.sh Makou*.AppImage*;
+  else
+    bash ./upload.sh *.dmg*;
+  fi
 
 before_deploy:
   - DEPLOY_DIR="makoureactor-$(git describe --tags)-${TRAVIS_OS_NAME}64"
@@ -60,11 +86,18 @@
 deploy:
   provider: releases
   api_key:
-    secure: "g4SNxnp5gaEg3KPXOsgEiAW1t1ObzDr+Nm9ZkQBvqpDwM6K5skfUL1FGiBpQeWRiaVYymbY1ukn+rIFH36vJWl1+MK+6YYS4EvLY6o+pgHXzqeiM/NeC4qd2HRzQxDo4T5Ox5tVzTavrDR+fOuo/iMolx/IfnQaJ+m/csTYYdm0="
+    secure: "B4xjY+hcZOob6hGLx8b5Ykxk+8sN9M+XwfnuhRReR1YRFvXZdcUUiL/VusDM0iapUGhkuvbO0AQEeLPaC69uBNdxQsBJFGFMzrHZGEtuBFl44SJB+lZGRTVemj3AZ4f5aQvTkKFbt7M+/sjkWa6ZP6EHdrAN2XCp4emrwKBApO4="
+
   file: "$DEPLOY_ARCHIVE"
   skip_cleanup: true
   on:
     tags: true
+    branch: deploy
+
+branches:
+  except:
+    - coverity_scan
+    - continuous
 
 env:
   global:
diff -Nru makoureactor-1.7.2/txt.cpp makoureactor-1.8.0/txt.cpp
--- makoureactor-1.7.2/txt.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/txt.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -33,7 +33,7 @@
 	"–","—","“","”","‘","’","÷","◊","ÿ","Ÿ","","¤","‹","›","fi","fl",
 	"■","▪","‚","„","‰","Â","Ê","Á","Ë","È","Í","Î","Ï","Ì","Ó","Ô",
 	"","Ò","Ù","Û","","","","","","","","","","","","",
-	"{CHOICE}","\t","{, }","{.\"}","{…\"}","","","\n","\n{NEW PAGE}\n","\n{NEW PAGE 2}\n","{CLOUD}","{BARRET}","{TIFA}","{AERIS}","{RED XIII}","{YUFFIE}",
+	"{CHOICE}","\t","{, }","{.\"}","{…\"}","","","\n","\n{NEW PAGE}\n","\n{NEW PAGE 2}\n","{CLOUD}","{BARRET}","{TIFA}","{AERITH}","{RED XIII}","{YUFFIE}",
 	"{CAIT SITH}","{VINCENT}","{CID}","{MEMBER 1}","{MEMBER 2}","{MEMBER 3}","{CIRCLE}","{TRIANGLE}","{SQUARE}","{CROSS}",""/*jp_fa*/,""/*jp_fb*/,""/*jp_fc*/,""/*jp_fd*/,""/*jp_fe*/,""/*end*/
 };
 
@@ -53,7 +53,7 @@
 	"『","』","．","＋","Ａ","Ｂ","Ｃ","Ｄ","Ｅ","Ｆ","Ｇ","Ｈ","Ｉ","Ｊ","Ｋ","Ｌ",
 	"Ｍ","Ｎ","Ｏ","Ｐ","Ｑ","Ｒ","Ｓ","Ｔ","Ｕ","Ｖ","Ｗ","Ｘ","Ｙ","Ｚ","・","＊",
 	"ー","～","…","％","／","：","＆","【","】","♥","→","α","β","「","」","（",
-	"）","－","＝","","","","⑬","\n","\n{NEW PAGE}\n","\n{NEW PAGE 2}\n","{CLOUD}","{BARRET}","{TIFA}","{AERIS}","{RED XIII}","{YUFFIE}",
+	"）","－","＝","","","","⑬","\n","\n{NEW PAGE}\n","\n{NEW PAGE 2}\n","{CLOUD}","{BARRET}","{TIFA}","{AERITH}","{RED XIII}","{YUFFIE}",
 	"{CAIT SITH}","{VINCENT}","{CID}","{MEMBER 1}","{MEMBER 2}","{MEMBER 3}","{CIRCLE}","{TRIANGLE}","{SQUARE}","{CROSS}","","","","","",""
 };
 
diff -Nru makoureactor-1.7.2/widgets/AboutDialog.cpp makoureactor-1.8.0/widgets/AboutDialog.cpp
--- makoureactor-1.7.2/widgets/AboutDialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/AboutDialog.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,39 @@
+#include "AboutDialog.h"
+#include "../Parameters.h"
+#include "../Data.h"
+
+AboutDialog::AboutDialog(QWidget *parent)
+    : QDialog(parent, Qt::Dialog | Qt::CustomizeWindowHint)
+{
+	QLabel *image = new QLabel(this);
+	image->setPixmap(QPixmap(":/images/reactor.png"));
+
+	QLabel *desc1 = new QLabel(QString("<h1 style=\"text-align:center\">%1</h1>").arg(PROG_FULLNAME) % tr("By Jérôme &lt;myst6re&gt; Arzel <br/><a href=\"https://github.com/myst6re/makoureactor/\">"
+	                "github.com/myst6re/makoureactor</a>"), this);
+	desc1->setTextInteractionFlags(Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard);
+	desc1->setTextFormat(Qt::RichText);
+	desc1->setOpenExternalLinks(true);
+
+	QLabel *desc2 = new QLabel(tr("Thanks to:<ul style=\"margin:0\"><li>Squall78</li>"
+	                              "<li>Synergy Blades</li><li>TrueOdin</li><li>Akari</li><li>Asa</li><li>Aali</li>"
+	                              "<li>DLPB</li></ul>"), this);
+	desc2->setTextInteractionFlags(Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard);
+	desc2->setTextFormat(Qt::RichText);
+	desc2->setOpenExternalLinks(true);
+
+	QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal, this);
+	buttonBox->addButton(QDialogButtonBox::Close);
+	connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
+
+	QLabel *desc3 = new QLabel(QString("Qt %1").arg(QT_VERSION_STR), this);
+	QPalette pal = desc3->palette();
+	pal.setColor(QPalette::WindowText, Data::color(Data::ColorGreyForeground));
+	desc3->setPalette(pal);
+
+	QGridLayout *layout = new QGridLayout(this);
+	layout->addWidget(desc1, 0, 0, 1, 2);
+	layout->addWidget(desc2, 1, 0);
+	layout->addWidget(image, 1, 1, Qt::AlignRight);
+	layout->addWidget(desc3, 2, 0, 1, 2);
+	layout->addWidget(buttonBox, 3, 0, 1, 2);
+}
diff -Nru makoureactor-1.7.2/widgets/AboutDialog.h makoureactor-1.8.0/widgets/AboutDialog.h
--- makoureactor-1.7.2/widgets/AboutDialog.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/AboutDialog.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef ABOUTDIALOG_H
+#define ABOUTDIALOG_H
+
+#include <QtWidgets>
+
+class AboutDialog : public QDialog
+{
+	Q_OBJECT
+public:
+	explicit AboutDialog(QWidget *parent = nullptr);
+
+signals:
+
+};
+
+#endif // ABOUTDIALOG_H
diff -Nru makoureactor-1.7.2/widgets/AnimEditorDialog.cpp makoureactor-1.8.0/widgets/AnimEditorDialog.cpp
--- makoureactor-1.7.2/widgets/AnimEditorDialog.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/AnimEditorDialog.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,17 +19,17 @@
 #include "core/Config.h"
 #include "Data.h"
 
-AnimEditorDialog::AnimEditorDialog(int animID, const QGLWidget *shareWidget, QWidget *parent) :
+AnimEditorDialog::AnimEditorDialog(int animID, QWidget *parent) :
 	QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint)
 {
 	setWindowTitle(tr("Animation Selector"));
 	QWidget *modelWidget;
-	if(Config::value("OpenGL", true).toBool()) {
-		fieldModel = new FieldModel(0, shareWidget);
+	if (Config::value("OpenGL", true).toBool()) {
+		fieldModel = new FieldModel();
 		fieldModel->setFixedSize(304, 214);
 		modelWidget = fieldModel;
 	} else {
-		fieldModel = 0;
+		fieldModel = nullptr;
 		modelWidget = new QWidget(this);
 	}
 
@@ -44,7 +44,7 @@
 	layout->addWidget(modelWidget, 0, 1);
 	layout->addWidget(buttonBox, 1, 0, 1, 2);
 
-	if(Data::currentModelID != -1) {
+	if (Data::currentModelID != -1) {
 		connect(aList, SIGNAL(currentRowChanged(int)), SLOT(changeModelAnimation()));
 	}
 	aList->setCurrentRow(animID);
@@ -54,7 +54,7 @@
 
 void AnimEditorDialog::changeModelAnimation()
 {
-//	if(fieldModel)
+//	if (fieldModel)
 //		fieldModel->load(Data::currentHrcNames->value(Data::currentModelID), Data::currentAnimNames->value(Data::currentModelID).value(chosenAnimation()), true);
 }
 
diff -Nru makoureactor-1.7.2/widgets/AnimEditorDialog.h makoureactor-1.8.0/widgets/AnimEditorDialog.h
--- makoureactor-1.7.2/widgets/AnimEditorDialog.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/AnimEditorDialog.h	2020-08-08 18:46:56.000000000 +0000
@@ -25,7 +25,7 @@
 {
     Q_OBJECT
 public:
-	explicit AnimEditorDialog(int animID, const QGLWidget *shareWidget=0, QWidget *parent=0);
+	explicit AnimEditorDialog(int animID, QWidget *parent=nullptr);
 	int chosenAnimation();
 private slots:
 	void changeModelAnimation();
diff -Nru makoureactor-1.7.2/widgets/ApercuBG.cpp makoureactor-1.8.0/widgets/ApercuBG.cpp
--- makoureactor-1.7.2/widgets/ApercuBG.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ApercuBG.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -18,7 +18,7 @@
 #include "ApercuBG.h"
 
 ApercuBG::ApercuBG(QWidget *parent) :
-	QLabel(parent), _field(0), _error(false)
+	QLabel(parent), _field(nullptr), _error(false)
 {
 	setAutoFillBackground(true);
 	setAlignment(Qt::AlignCenter);
@@ -27,20 +27,25 @@
 	QPalette pal = palette();
 	pal.setColor(QPalette::Active, QPalette::Dark, Qt::black);
 	pal.setColor(QPalette::Inactive, QPalette::Dark, Qt::black);
-	pal.setColor(QPalette::Disabled, QPalette::Dark, pal.color(QPalette::Disabled, QPalette::Text));
+	pal.setColor(QPalette::Disabled, QPalette::Dark, pal.color(QPalette::Mid));
 	setPalette(pal);
 }
 
 void ApercuBG::fill(Field *field, bool reload)
 {
-	if(!reload && _field == field) {
+	if (!reload && _field == field) {
+		return;
+	}
+
+	if (!field->isOpen()) {
+		clear();
 		return;
 	}
 
 	_field = field;
 	QImage image = _field->background()->openBackground();
 
-	if(image.isNull()) {
+	if (image.isNull()) {
 		_background = errorPixmap(contentsRect().size());
 		setCursor(Qt::ArrowCursor);
 		_error = true;
@@ -55,13 +60,13 @@
 
 void ApercuBG::drawBackground()
 {
-	if(!_field) {
+	if (!_field) {
 		return;
 	}
 
 	QSize contentsSize = contentsRect().size();
 
-	if(_background.size() != contentsSize) {
+	if (_background.size() != contentsSize) {
 		setPixmap(_background.scaled(contentsSize, Qt::KeepAspectRatio));
 	} else {
 		setPixmap(_background);
@@ -102,7 +107,7 @@
 {
 	QLabel::mouseReleaseEvent(e);
 
-	if(e->button() == Qt::LeftButton && !_error) {
+	if (e->button() == Qt::LeftButton && !_error) {
 		emit clicked();
 	}
 }
@@ -111,7 +116,7 @@
 {
 	Q_UNUSED(e);
 
-	if(!_background.isNull() &&
+	if (!_background.isNull() &&
 	        (!pixmap() || contentsRect().size() != pixmap()->size())) {
 		setUpdatesEnabled(false);
 		drawBackground(); // Call setPixmap() -> update() which must be prevented
diff -Nru makoureactor-1.7.2/widgets/ApercuBGLabel.cpp makoureactor-1.8.0/widgets/ApercuBGLabel.cpp
--- makoureactor-1.7.2/widgets/ApercuBGLabel.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ApercuBGLabel.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -26,7 +26,7 @@
 {
 	QLabel::paintEvent(e);
 
-	if(isEnabled() && _showSave) {
+	if (isEnabled() && _showSave) {
 		QPainter painter(this);
 		painter.drawPixmap(0, 0, QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton).pixmap(32));
 		painter.end();
@@ -53,7 +53,7 @@
 {
 	QLabel::mousePressEvent(e);
 
-	if(e->button() == Qt::LeftButton &&
+	if (e->button() == Qt::LeftButton &&
 	        e->x() >= 0 && e->x() < 32 &&
 	        e->y() >= 0 && e->y() < 32) {
 		emit saveRequested();
diff -Nru makoureactor-1.7.2/widgets/ArchivePreview.cpp makoureactor-1.8.0/widgets/ArchivePreview.cpp
--- makoureactor-1.7.2/widgets/ArchivePreview.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/ArchivePreview.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,154 @@
+/****************************************************************************
+ ** Makou Reactor Final Fantasy VII Field Script Editor
+ ** Copyright (C) 2009-2012 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#include "ArchivePreview.h"
+#include "core/Config.h"
+
+ArchivePreview::ArchivePreview(QWidget *parent) :
+      QStackedWidget(parent)
+{
+	setAutoFillBackground(true);
+	QPalette pal = palette();
+	pal.setColor(QPalette::Active, QPalette::Dark, pal.color(QPalette::Mid));
+	pal.setColor(QPalette::Inactive, QPalette::Dark, pal.color(QPalette::Mid));
+	pal.setColor(QPalette::Disabled, QPalette::Dark, pal.color(QPalette::Midlight));
+
+	setBackgroundRole(QPalette::Dark);
+	setPalette(pal);
+
+	addWidget(new QWidget(this));
+	addWidget(imageWidget());
+	addWidget(textWidget());
+	addWidget(modelWidget());
+
+	clearPreview();
+}
+
+QWidget *ArchivePreview::imageWidget()
+{
+	QWidget *ret = new QWidget(this);
+
+	imageSelect = new QComboBox(ret);
+	palSelect = new QComboBox(ret);
+
+	scrollArea = new QScrollArea(ret);
+	scrollArea->setAlignment(Qt::AlignCenter);
+	scrollArea->setFrameShape(QFrame::NoFrame);
+
+	QVBoxLayout *layout = new QVBoxLayout(ret);
+	layout->setContentsMargins(QMargins());
+	layout->addWidget(imageSelect, 0, Qt::AlignCenter);
+	layout->addWidget(palSelect, 0, Qt::AlignCenter);
+	layout->addWidget(scrollArea);
+
+	connect(imageSelect, SIGNAL(currentIndexChanged(int)), SIGNAL(currentImageChanged(int)));
+	connect(palSelect, SIGNAL(currentIndexChanged(int)), SIGNAL(currentPaletteChanged(int)));
+
+	return ret;
+}
+
+QWidget *ArchivePreview::textWidget()
+{
+	QPlainTextEdit *textEdit = new QPlainTextEdit(this);
+	textEdit->setReadOnly(true);
+	textEdit->setFrameShape(QFrame::NoFrame);
+	return textEdit;
+}
+
+QWidget *ArchivePreview::modelWidget()
+{
+	if (Config::value("OpenGL", true).toBool()) {
+		return new FieldModel(this);
+	}
+	return new QWidget(this);
+}
+
+void ArchivePreview::clearPreview()
+{
+	setCurrentIndex(EmptyPage);
+}
+
+void ArchivePreview::imagePreview(const QPixmap &image, const QString &name,
+                                   int palID, int palCount, int imageID,
+                                   int imageCount)
+{
+	setCurrentIndex(ImagePage);
+	_lbl = new ApercuBGLabel();
+	_lbl->setPixmap(image);
+	scrollArea->setWidget(_lbl);
+
+	this->_name = name;
+
+	connect(_lbl, SIGNAL(saveRequested()), SLOT(saveImage()));
+
+	imageSelect->blockSignals(true);
+	imageSelect->clear();
+	if (imageCount > 1) {
+		imageSelect->setVisible(true);
+		for (int i=0; i<imageCount; ++i) {
+			imageSelect->addItem(tr("Image %1").arg(i));
+		}
+		imageSelect->setCurrentIndex(imageID);
+	} else {
+		imageSelect->setVisible(false);
+	}
+	imageSelect->blockSignals(false);
+
+	palSelect->blockSignals(true);
+	palSelect->clear();
+	if (palCount > 1) {
+		palSelect->setVisible(true);
+		for (int i=0; i<palCount; ++i) {
+			palSelect->addItem(tr("Palette %1").arg(i));
+		}
+		palSelect->setCurrentIndex(palID);
+	} else {
+		palSelect->setVisible(false);
+	}
+	palSelect->blockSignals(false);
+}
+
+void ArchivePreview::saveImage()
+{
+	QString path = Config::value("saveBGPath").toString();
+	if (!path.isEmpty()) {
+		path.append("/");
+	}
+	path = QFileDialog::getSaveFileName(this, tr("Save Background"),
+	                                    path + this->_name + ".png",
+	                                    tr("PNG image (*.png);;JPG image (*.jpg);;BMP image (*.bmp);;Portable Pixmap (*.ppm)"));
+	if (path.isNull())	return;
+
+	_lbl->pixmap()->save(path);
+
+	int index = path.lastIndexOf('/');
+	Config::setValue("saveBGPath", index == -1 ? path : path.left(index));
+}
+
+void ArchivePreview::textPreview(const QString &text)
+{
+	setCurrentIndex(TextPage);
+	((QPlainTextEdit *)currentWidget())->setPlainText(text);
+}
+
+void ArchivePreview::modelPreview(FieldModelFile *fieldModel)
+{
+	if (Config::value("OpenGL", true).toBool()) {
+		setCurrentIndex(ModelPage);
+		((FieldModel *)currentWidget())->setFieldModelFile(fieldModel);
+	}
+}
diff -Nru makoureactor-1.7.2/widgets/ArchivePreview.h makoureactor-1.8.0/widgets/ArchivePreview.h
--- makoureactor-1.7.2/widgets/ArchivePreview.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/ArchivePreview.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,52 @@
+/****************************************************************************
+ ** Deling Final Fantasy VIII Field Editor
+ ** Copyright (C) 2009-2012 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#ifndef ARCHIVEPREVIEWWIDGET_H
+#define ARCHIVEPREVIEWWIDGET_H
+
+#include <QtWidgets>
+#include "ApercuBGLabel.h"
+#include "FieldModel.h"
+
+class ArchivePreview : public QStackedWidget
+{
+	Q_OBJECT
+public:
+	enum Pages { EmptyPage = 0, ImagePage, TextPage, ModelPage };
+	explicit ArchivePreview(QWidget *parent = nullptr);
+	void clearPreview();
+	void imagePreview(const QPixmap &image, const QString &name = QString(),
+	                  int palID = 0, int palCount = 0, int imageID = 0,
+	                  int imageCount = 0);
+	void textPreview(const QString &text);
+	void modelPreview(FieldModelFile *fieldModel);
+signals:
+	void currentImageChanged(int);
+	void currentPaletteChanged(int);
+public slots:
+	void saveImage();
+private:
+	QWidget *imageWidget();
+	QWidget *textWidget();
+	QWidget *modelWidget();
+	QScrollArea *scrollArea;
+	QComboBox *imageSelect, *palSelect;
+	ApercuBGLabel *_lbl;
+	QString _name;
+};
+
+#endif // ARCHIVEPREVIEWWIDGET_H
diff -Nru makoureactor-1.7.2/widgets/BGDialog.cpp makoureactor-1.8.0/widgets/BGDialog.cpp
--- makoureactor-1.7.2/widgets/BGDialog.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/BGDialog.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -37,7 +37,7 @@
 	QPalette pal = imageBox->palette();
 	pal.setColor(QPalette::Active, QPalette::Dark, Qt::black);
 	pal.setColor(QPalette::Inactive, QPalette::Dark, Qt::black);
-	pal.setColor(QPalette::Disabled, QPalette::Dark, pal.color(QPalette::Disabled, QPalette::Text));
+	pal.setColor(QPalette::Disabled, QPalette::Dark, pal.color(QPalette::Mid));
 	imageBox->setPalette(pal);
 
 	parametersWidget = new QComboBox(this);
@@ -90,7 +90,7 @@
 
 void BGDialog::fill(Field *field, bool reload)
 {
-	if((!reload && this->field == field) || !field)	return;
+	if ((!reload && this->field == field) || !field)	return;
 
 	this->field = field;
 
@@ -126,7 +126,7 @@
 
 void BGDialog::fillWidgets()
 {
-	if(!field)	return;
+	if (!field)	return;
 
 	QHash<quint8, quint8> usedParams;
 	bool layerExists[] = {false, false, false};
@@ -141,11 +141,11 @@
 	params.clear();
 	sections.clear();
 
-	if(field->background()->usedParams(usedParams, layerExists, &usedIDs)) {
+	if (field->background()->usedParams(usedParams, layerExists, &usedIDs)) {
 
 		QList<quint8> usedParamsList = usedParams.keys();
-		qSort(usedParamsList);
-		foreach(const quint8 param, usedParamsList) {
+		std::sort(usedParamsList.begin(), usedParamsList.end());
+		for (const quint8 param : qAsConst(usedParamsList)) {
 			parametersWidget->addItem(tr("Parameter %1").arg(param), param);
 		}
 		parametersWidget->setEnabled(parametersWidget->count());
@@ -153,9 +153,9 @@
 		QListWidgetItem *item;
 
 		QList<quint16> usedIDsList = usedIDs.toList();
-		qSort(usedIDsList);
+		std::sort(usedIDsList.begin(), usedIDsList.end());
 		int sectionID = 0;
-		foreach(const quint16 ID, usedIDsList) {
+		for (const quint16 ID : qAsConst(usedIDsList)) {
 			item = new QListWidgetItem(tr("Section %1").arg(sectionID++));
 			item->setData(Qt::UserRole, ID);
 			item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
@@ -170,7 +170,7 @@
 		layers[2] = layerExists[1];
 		layers[3] = layerExists[2];
 
-		for(quint8 layerID = 0 ; layerID < 4 ; ++layerID) {
+		for (quint8 layerID = 0; layerID < 4; ++layerID) {
 			if (layers[layerID]) {
 				item = new QListWidgetItem(tr("Layer %1").arg(layerID));
 				item->setData(Qt::UserRole, layerID);
@@ -203,7 +203,7 @@
 
 	layersWidget->setVisible(page1);
 	sectionsWidget->setVisible(!page1);
-	if(page1) {
+	if (page1) {
 		layerChanged();
 	} else {
 		sectionChanged();
@@ -216,8 +216,8 @@
 	quint8 states = allparams.value(parameter);
 	QListWidgetItem *item;
 	statesWidget->clear();
-	for(int i=0 ; i<8 ; ++i) {
-		if((states >> i) & 1) {
+	for (int i=0; i<8; ++i) {
+		if ((states >> i) & 1) {
 			item = new QListWidgetItem(tr("State %1").arg(i));
 			item->setData(Qt::UserRole, 1 << i);
 			item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
@@ -230,7 +230,7 @@
 void BGDialog::layerChanged()
 {
 	QList<QListWidgetItem *> items = layersWidget->selectedItems();
-	if(items.isEmpty()) {
+	if (items.isEmpty()) {
 		zWidget->setValue(0);
 		zWidget->setEnabled(false);
 		return;
@@ -239,8 +239,8 @@
 	zWidget->setReadOnly(false);
 	int layer = items.first()->data(Qt::UserRole).toInt();
 	int zValue = z[layer-2];
-	if(zValue == -1) {
-		switch(layer) {
+	if (zValue == -1) {
+		switch (layer) {
 		case 2:
 			zValue = 4096;
 			break;
@@ -256,7 +256,7 @@
 void BGDialog::sectionChanged()
 {
 	QList<QListWidgetItem *> items = sectionsWidget->selectedItems();
-	if(items.isEmpty()) {
+	if (items.isEmpty()) {
 		zWidget->setValue(0);
 		zWidget->setEnabled(false);
 		return;
@@ -272,7 +272,7 @@
 	bool enabled = item->data(Qt::CheckStateRole).toBool();
 	int parameter = parametersWidget->itemData(parametersWidget->currentIndex()).toInt(), state = item->data(Qt::UserRole).toInt();
 
-	if(enabled)
+	if (enabled)
 		params.insert(parameter, params.value(parameter) | state);
 	else
 		params.insert(parameter, params.value(parameter) & ~state);
@@ -306,11 +306,11 @@
 
 void BGDialog::changeZ(int value)
 {
-	if(tabBar->currentIndex() != 0) {
+	if (tabBar->currentIndex() != 0) {
 		return;
 	}
 	QList<QListWidgetItem *> items = layersWidget->selectedItems();
-	if(items.isEmpty()) return;
+	if (items.isEmpty()) return;
 	z[items.first()->data(Qt::UserRole).toInt()-2] = value;// z[layer - 2]
 
 	updateBG();
@@ -319,13 +319,13 @@
 void BGDialog::saveImage()
 {
 	QString path = Config::value("saveBGPath").toString();
-	if(!path.isEmpty()) {
+	if (!path.isEmpty()) {
 		path.append("/");
 	}
 	path = QFileDialog::getSaveFileName(this, tr("Save Background"),
 	                                    path + field->name() + ".png",
 	                                    tr("PNG image (*.png);;JPG image (*.jpg);;BMP image (*.bmp);;Portable Pixmap (*.ppm)"));
-	if(path.isNull())	return;
+	if (path.isNull())	return;
 
 	background().save(path);
 
@@ -346,8 +346,8 @@
 
 QImage BGDialog::background(bool *bgWarning)
 {
-	if(tabBar->currentIndex() == 0) {
-		return field->background()->openBackground(params, z, layers, NULL, bgWarning);
+	if (tabBar->currentIndex() == 0) {
+		return field->background()->openBackground(params, z, layers, nullptr, bgWarning);
 	} else {
 		bool layers[4] = { false, true, false, false };
 		return field->background()->openBackground(params, z, layers, &sections, bgWarning);
@@ -356,19 +356,19 @@
 
 void BGDialog::updateBG()
 {
-	if(!field)	return;
+	if (!field)	return;
 
 	bool bgWarning;
 	QImage img = background(&bgWarning);
 
-	if(tabBar->currentIndex() == 0) {
-		img = field->background()->openBackground(params, z, layers, NULL, &bgWarning);
+	if (tabBar->currentIndex() == 0) {
+		img = field->background()->openBackground(params, z, layers, nullptr, &bgWarning);
 	} else {
 		bool layers[4] = { false, true, false, false };
 		img = field->background()->openBackground(params, z, layers, &sections, &bgWarning);
 	}
 
-	if(img.isNull()) {
+	if (img.isNull()) {
 		image->setPixmap(QPixmap::fromImage(img));
 		bgWarning = false;
 	} else {
@@ -382,26 +382,26 @@
 
 void BGDialog::resizeEvent(QResizeEvent *event)
 {
-	if(event->type() == QEvent::Resize) {
+	if (event->type() == QEvent::Resize) {
 		updateBG();
 	}
 }
 
 bool BGDialog::eventFilter(QObject *obj, QEvent *event)
 {
-	if(event->type() == QEvent::Wheel && obj == imageBox->viewport()) {
+	if (event->type() == QEvent::Wheel && obj == imageBox->viewport()) {
 		QWheelEvent *wheelEvent = static_cast<QWheelEvent *>(event);
-		if(wheelEvent->modifiers() == Qt::CTRL) {
+		if (wheelEvent->modifiers() == Qt::CTRL) {
 			const float step = 0.25;
-			if(zoomFactor == 0) {
+			if (zoomFactor == 0) {
 				zoomFactor = 0.25;
-			} else if(wheelEvent->delta() > 0) {
-				if(zoomFactor >= 4){
+			} else if (wheelEvent->angleDelta().y() > 0) {
+				if (zoomFactor >= 4){
 					return false; // cap zoom in at 400%
 				} else {
 					zoomFactor += step;
 				}
-			} else if(wheelEvent->delta() < 0) {
+			} else if (wheelEvent->angleDelta().y() < 0) {
 				if (zoomFactor <= 0.25){
 					return false; // cap zoom in at 25%
 				} else {
diff -Nru makoureactor-1.7.2/widgets/BGDialog.h makoureactor-1.8.0/widgets/BGDialog.h
--- makoureactor-1.7.2/widgets/BGDialog.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/BGDialog.h	2020-08-08 18:46:56.000000000 +0000
@@ -44,7 +44,7 @@
 	void tryToRepairBG();
 	void updateBG();
 private:
-	QImage background(bool *bgWarning = NULL);
+	QImage background(bool *bgWarning = nullptr);
 	void fillWidgets();
 
 	Field *field;
diff -Nru makoureactor-1.7.2/widgets/ColorDisplay.cpp makoureactor-1.8.0/widgets/ColorDisplay.cpp
--- makoureactor-1.7.2/widgets/ColorDisplay.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ColorDisplay.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -47,7 +47,7 @@
 	_colors = colors;
 	setMouseTracking(_colors.size() > 1);
 	update();
-	if(!_colors.isEmpty()) {
+	if (!_colors.isEmpty()) {
 		setToolTip(QColor(_colors.first()).name());
 	}
 }
@@ -69,7 +69,7 @@
 
 int ColorDisplay::cellWidth(int width) const
 {
-	if(_colors.isEmpty()) {
+	if (_colors.isEmpty()) {
 		return COLOR_DISPLAY_MIN_CELL_SIZE;
 	}
 	QSize minSize = minimumSizeHint();
@@ -82,7 +82,7 @@
 
 int ColorDisplay::cellHeight(int height) const
 {
-	if(_colors.isEmpty()) {
+	if (_colors.isEmpty()) {
 		return COLOR_DISPLAY_MIN_CELL_SIZE;
 	}
 	QSize minSize = minimumSizeHint();
@@ -110,13 +110,13 @@
 	          cellFullWidth = cellS.width() + COLOR_DISPLAY_BORDER_WIDTH,
 	          cellFullHeight = cellS.height() + COLOR_DISPLAY_BORDER_WIDTH;
 
-	for(int i = 0 ; i < size ; ++i) {
+	for (int i = 0; i < size; ++i) {
 		const int x = i * cellFullWidth;
 		painter.drawRect(x, 0, cellFullWidth, cellFullHeight);
 		QColor color;
-		if(_colors.isEmpty()) {
+		if (_colors.isEmpty()) {
 			color = Qt::transparent;
-		} else if(isEnabled()) {
+		} else if (isEnabled()) {
 			color = QColor(_colors.at(i));
 		} else {
 			const int gray = qGray(_colors.at(i));
@@ -128,7 +128,7 @@
 	}
 
 	// Red frame
-	if(isEnabled() && !isReadOnly() && _hover) {
+	if (isEnabled() && !isReadOnly() && _hover) {
 		painter.setPen(palette().color(QPalette::Mid));
 		const QPoint cursorPos = mapFromGlobal(cursor().pos());
 		const int x = colorId(cursorPos) * cellFullWidth;
@@ -164,17 +164,17 @@
 
 void ColorDisplay::mouseReleaseEvent(QMouseEvent *event)
 {
-	if(isReadOnly()) {
+	if (isReadOnly()) {
 		return;
 	}
 
 	const int colorIndex = colorId(event->pos());
-	if(colorIndex >= _colors.size()) {
+	if (colorIndex >= _colors.size()) {
 		return;
 	}
 	QColor color = QColorDialog::getColor(_colors.at(colorIndex), this,
 	                                      tr("Choose a new color"));
-	if(color.isValid()) {
+	if (color.isValid()) {
 		_colors.replace(colorIndex, color.rgb());
 		emit colorEdited(colorIndex, color.rgb());
 	}
diff -Nru makoureactor-1.7.2/widgets/ConfigWindow.cpp makoureactor-1.8.0/widgets/ConfigWindow.cpp
--- makoureactor-1.7.2/widgets/ConfigWindow.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ConfigWindow.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,6 +19,7 @@
 #include "Data.h"
 #include "core/Config.h"
 #include "TextPreview.h"
+#include "widgets/FontManager.h"
 
 ConfigWindow::ConfigWindow(QWidget *parent)
 	: QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint)
@@ -46,22 +47,33 @@
 	charPath = new QLabel(dependances);
 	charButton = new QPushButton(tr("Change"), dependances);
 
+	encodingEdit = new QPushButton(tr("Edit..."), dependances);
+	encodingEdit->setEnabled(false);
+
 	QGridLayout *dependLayout = new QGridLayout(dependances);
-	dependLayout->addWidget(listFF7, 0, 0, 3, 2);
-	dependLayout->addWidget(ff7ButtonMod, 0, 2);
-	dependLayout->addWidget(ff7ButtonRem, 1, 2);
+	dependLayout->addWidget(listFF7, 0, 0, 3, 3);
+	dependLayout->addWidget(ff7ButtonMod, 0, 3);
+	dependLayout->addWidget(ff7ButtonRem, 1, 3);
 	dependLayout->setRowStretch(2, 1);
 	dependLayout->addWidget(kernelAuto, 3, 0);
-	dependLayout->addWidget(kernelPath, 3, 1);
-	dependLayout->addWidget(kernelButton, 3, 2);
+	dependLayout->addWidget(kernelPath, 3, 1, 1, 2);
+	dependLayout->addWidget(kernelButton, 3, 3);
 	dependLayout->addWidget(windowAuto, 4, 0);
 	dependLayout->addWidget(windowPath, 4, 1);
-	dependLayout->addWidget(windowButton, 4, 2);
+	dependLayout->addWidget(encodingEdit, 4, 2, Qt::AlignRight);
+	dependLayout->addWidget(windowButton, 4, 3);
 	dependLayout->addWidget(charAuto, 5, 0);
-	dependLayout->addWidget(charPath, 5, 1);
-	dependLayout->addWidget(charButton, 5, 2);
+	dependLayout->addWidget(charPath, 5, 1, 1, 2);
+	dependLayout->addWidget(charButton, 5, 3);
 	dependLayout->setColumnStretch(1, 1);
 
+	QGroupBox *theme = new QGroupBox(tr("Theme"), this);
+
+	darkMode = new QCheckBox(tr("Dark mode"), theme);
+
+	QGridLayout *themeLayout = new QGridLayout(theme);
+	themeLayout->addWidget(darkMode, 0, 0);
+
 	QGroupBox *openGL = new QGroupBox(tr("OpenGL"), this);
 
 	disableOGL = new QCheckBox(tr("Disable OpenGL"), openGL);
@@ -81,10 +93,12 @@
 	//optiText = new QCheckBox(trUtf8("Optimiser automatiquement les duos de caract\xc3\xa8res \xc2\xab .  \xc2\xbb, \xc2\xab .\" \xc2\xbb et \xc2\xab \xe2\x80\xa6\" \xc2\xbb."));
 	//optiText->hide();//TODO
 
-	japEnc = new QCheckBox(tr("Japanese Characters"), textEditor);
+	encodings = new QComboBox(textEditor);
+	encodings->addItem(tr("Latin"));
+	encodings->addItem(tr("Japanese"));
 
 	listCharNames = new QComboBox(textEditor);
-	for(int i=0 ; i<9 ; ++i) {
+	for (int i=0; i<9; ++i) {
 		listCharNames->addItem(QIcon(QString(":/images/icon-char-%1.png").arg(i)), Data::char_names.at(i));
 	}
 
@@ -107,15 +121,17 @@
 	windowPreviewLayout->setColumnStretch(3, 1);
 
 	QGridLayout *textEditorLayout = new QGridLayout(textEditor);
-	textEditorLayout->addWidget(japEnc, 0, 0, 1, 2);
+	textEditorLayout->addWidget(new QLabel(tr("Encoding")), 0, 0, 1, 3);
+	textEditorLayout->addWidget(encodings, 0, 3, 1, 3);
+	//textEditorLayout->addWidget(encodingEdit, 0, 4, 1, 2);
 	// windowPreviewLayout->addWidget(optiText, 1, 0, 1, 2);
-	textEditorLayout->addLayout(windowPreviewLayout, 1, 0, 4, 2);
-	textEditorLayout->addWidget(listCharNames, 0, 2, 1, 2);
-	textEditorLayout->addWidget(charNameEdit, 1, 2, 1, 2);
-	textEditorLayout->addWidget(new QLabel(tr("Autosize: margin right")), 3, 2);
-	textEditorLayout->addWidget(autoSizeMarginEdit, 3, 3);
-	textEditorLayout->addWidget(new QLabel(tr("{SPACED CHARACTERS} width")), 4, 2);
-	textEditorLayout->addWidget(spacedCharactersWidthEdit, 4, 3);
+	textEditorLayout->addLayout(windowPreviewLayout, 1, 0, 4, 6);
+	textEditorLayout->addWidget(listCharNames, 0, 6, 1, 6);
+	textEditorLayout->addWidget(charNameEdit, 1, 6, 1, 6);
+	textEditorLayout->addWidget(new QLabel(tr("Autosize: margin right")), 3, 6, 1, 3);
+	textEditorLayout->addWidget(autoSizeMarginEdit, 3, 9, 1, 3);
+	textEditorLayout->addWidget(new QLabel(tr("{SPACED CHARACTERS} width")), 4, 6, 1, 3);
+	textEditorLayout->addWidget(spacedCharactersWidthEdit, 4, 9, 1, 3);
 	textEditorLayout->setRowStretch(2, 1);
 
 	QGroupBox *scriptEditor = new QGroupBox(tr("Script Editor"), this);
@@ -138,7 +154,8 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(dependances, 0, 0, 1, 2);
-	layout->addWidget(openGL, 1, 0, 1, 2);
+	layout->addWidget(theme, 1, 0);
+	layout->addWidget(openGL, 1, 1);
 	layout->addWidget(textEditor, 2, 0, 1, 2);
 	layout->addWidget(scriptEditor, 3, 0);
 	layout->addWidget(misc, 3, 1);
@@ -160,6 +177,7 @@
 	connect(windowColorReset, SIGNAL(released()), SLOT(resetColor()));
 	connect(listCharNames, SIGNAL(currentIndexChanged(int)), SLOT(fillCharNameEdit()));
 	connect(charNameEdit, SIGNAL(textEdited(QString)), SLOT(setCharName(QString)));
+	connect(encodingEdit, SIGNAL(released()), SLOT(editEncoding()));
 	connect(buttonBox, SIGNAL(accepted()), SLOT(accept()));
 	connect(buttonBox, SIGNAL(rejected()), SLOT(reject()));
 
@@ -178,60 +196,63 @@
 	QTreeWidgetItem *selectedItem = 0;
 	QMapIterator<Data::FF7Version, QString> it(ff7PathList);
 
-	while(it.hasNext()) {
+	while (it.hasNext()) {
 		it.next();
 
 		const QString &ff7Path = it.value();
 
 		QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(QDir::toNativeSeparators(ff7Path)));
-		if(ff7Path.compare(Data::ff7AppPath(), Qt::CaseInsensitive) == 0) {
+		if (ff7Path.compare(Data::ff7AppPath(), Qt::CaseInsensitive) == 0) {
 			selectedItem = item;
 		}
 		item->setData(0, Qt::UserRole, int(it.key()));
 		listFF7->addTopLevelItem(item);
 	}
-	if(selectedItem)	listFF7->setCurrentItem(selectedItem);
+	if (selectedItem)	listFF7->setCurrentItem(selectedItem);
 
-	if(kernel_path.isEmpty()) {
+	if (kernel_path.isEmpty()) {
 		kernel_path = Data::ff7KernelPath() % "/kernel2.bin";
 		kernelAutoChange(false);
 	} else {
 		kernelAuto->setChecked(true);
 	}
 
-	if(window_path.isEmpty()) {
+	if (window_path.isEmpty()) {
 		window_path = Data::ff7KernelPath() % "/window.bin";
 		windowAutoChange(false);
 	} else {
 		windowAuto->setChecked(true);
 	}
 
-	if(char_path.isEmpty()) {
+	if (char_path.isEmpty()) {
 		char_path = Data::ff7DataPath() % "/field/char.lgp";
 		charAutoChange(false);
 	} else {
 		charAuto->setChecked(true);
 	}
 
+	darkMode->setChecked(Config::value("dark_theme", false).toBool());
 	disableOGL->setChecked(!Config::value("OpenGL", true).toBool());
 
 	kernelPath->setText(QDir::toNativeSeparators(QDir::cleanPath(kernel_path)));
 	windowPath->setText(QDir::toNativeSeparators(QDir::cleanPath(window_path)));
 	charPath->setText(QDir::toNativeSeparators(QDir::cleanPath(char_path)));
 
+	encodingEdit->setDisabled(window_path.isEmpty());
+
 	windowColorTopLeft = Config::value("windowColorTopLeft", qRgb(0,88,176)).toInt();
 	windowColorTopRight = Config::value("windowColorTopRight", qRgb(0,0,80)).toInt();
 	windowColorBottomLeft = Config::value("windowColorBottomLeft", qRgb(0,0,128)).toInt();
 	windowColorBottomRight = Config::value("windowColorBottomRight", qRgb(0,0,32)).toInt();
 
 	//optiText->setChecked(!Config::value("dontOptimizeTexts", false).toBool());
-	japEnc->setChecked(Config::value("jp_txt", false).toBool());
+	encodings->setCurrentIndex(Config::value("jp_txt", false).toBool() ? 1 : 0);
 	expandedByDefault->setChecked(Config::value("scriptItemExpandedByDefault", false).toBool());
 	lzsNotCheck->setChecked(Config::value("lzsNotCheck", false).toBool());
 
 	setWindowColors();
 
-	for(int charId=0 ; charId<9; ++charId) {
+	for (int charId=0; charId<9; ++charId) {
 		customNames << Config::value(QString("customCharName%1").arg(charId), Data::char_names.at(charId)).toString();
 	}
 
@@ -240,10 +261,14 @@
 	autoSizeMarginEdit->setValue(Config::value("autoSizeMarginRight", 14).toInt());
 	spacedCharactersWidthEdit->setValue(Config::value("spacedCharactersWidth", 13).toInt());
 
-	for(int j=0 ; j<listFF7->topLevelItemCount() ; ++j) {
-		QCoreApplication::processEvents();
+	QTimer::singleShot(0, this, SLOT(showIcons()));
+}
+
+void ConfigWindow::showIcons()
+{
+	for (int j=0; j<listFF7->topLevelItemCount(); ++j) {
 		QTreeWidgetItem *item = listFF7->topLevelItem(j);
-		if(item == NULL)	break;
+		if (item == nullptr)	break;
 		item->setIcon(0, QFileIconProvider().icon(QFileInfo(item->text(0))));
 	}
 }
@@ -251,9 +276,9 @@
 void ConfigWindow::changeFF7ListButtonsState()
 {
 	QTreeWidgetItem *item = listFF7->currentItem();
-	if(item) {
+	if (item) {
 		Data::FF7Version id = Data::FF7Version(item->data(0, Qt::UserRole).toInt());
-		if(id == Data::Custom) {
+		if (id == Data::Custom) {
 			ff7ButtonRem->setEnabled(true);
 			ff7ButtonMod->setText(tr("Edit"));
 		} else {
@@ -265,8 +290,8 @@
 		ff7ButtonMod->setText(tr("Add"));
 	}
 
-	for(int i=0 ; i<listFF7->topLevelItemCount() ; ++i) {
-		if(listFF7->topLevelItem(i)->data(0, Qt::UserRole).toInt() == int(Data::Custom)) {
+	for (int i=0; i<listFF7->topLevelItemCount(); ++i) {
+		if (listFF7->topLevelItem(i)->data(0, Qt::UserRole).toInt() == int(Data::Custom)) {
 			ff7ButtonMod->setEnabled(item == listFF7->topLevelItem(i));
 			return;
 		}
@@ -278,12 +303,12 @@
 {
 	QTreeWidgetItem *item = listFF7->currentItem();
 	QString currentPath;
-	if(item) {
+	if (item) {
 		Data::FF7Version id = Data::FF7Version(item->data(0, Qt::UserRole).toInt());
-		if(id == Data::Custom) {
+		if (id == Data::Custom) {
 			// Modify
 			QString path = QFileDialog::getOpenFileName(this, tr("Find ff7.exe"), item->text(0), tr("EXE files (*.exe)"));
-			if(!path.isNull()) {
+			if (!path.isNull()) {
 				Config::setValue("customFF7Path", path);
 				item->setText(0, QDir::toNativeSeparators(path));
 			}
@@ -293,7 +318,7 @@
 	}
 	// Add
 	QString path = QFileDialog::getOpenFileName(this, tr("Find ff7.exe"), currentPath, tr("EXE files (*.exe)"));
-	if(!path.isNull()) {
+	if (!path.isNull()) {
 		Config::setValue("customFF7Path", path);
 		QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(QDir::toNativeSeparators(path)));
 		item->setData(0, Qt::UserRole, int(Data::Custom));
@@ -306,9 +331,9 @@
 void ConfigWindow::removeCustomFF7Path()
 {
 	QTreeWidgetItem *item = listFF7->currentItem();
-	if(item) {
+	if (item) {
 		Data::FF7Version id = Data::FF7Version(item->data(0, Qt::UserRole).toInt());
-		if(id == Data::Custom) {
+		if (id == Data::Custom) {
 			// Remove
 			Config::setValue("customFF7Path", QString());
 			delete item;
@@ -338,21 +363,23 @@
 void ConfigWindow::changeKernelPath()
 {
 	QString path = QFileDialog::getOpenFileName(this, tr("Find kernel2.bin"), QDir::fromNativeSeparators(kernelPath->text()), tr("Bin Files (*.bin);;All Files (*)"));
-	if(!path.isNull())
+	if (!path.isNull())
 		kernelPath->setText(QDir::toNativeSeparators(path));
 }
 
 void ConfigWindow::changeWindowPath()
 {
 	QString path = QFileDialog::getOpenFileName(this, tr("Find window.bin"), QDir::fromNativeSeparators(windowPath->text()), tr("Bin Files (*.bin);;All Files (*)"));
-	if(!path.isNull())
+	if (!path.isNull()) {
 		windowPath->setText(QDir::toNativeSeparators(path));
+		encodingEdit->setDisabled(path.isEmpty());
+	}
 }
 
 void ConfigWindow::changeCharPath()
 {
-	QString path = QFileDialog::getOpenFileName(this, tr("Find char.lgp"), QDir::fromNativeSeparators(charPath->text()), tr("Lgp Archives (*.lgp);;All Files(*)"));
-	if(!path.isNull())
+	QString path = QFileDialog::getOpenFileName(this, tr("Find char.lgp"), QDir::fromNativeSeparators(charPath->text()), tr("Lgp Archives (*.lgp);;All Files (*)"));
+	if (!path.isNull())
 		charPath->setText(QDir::toNativeSeparators(path));
 }
 
@@ -362,20 +389,20 @@
 	QRgb color=0;
 	QObject *send = sender();
 
-	if(send == windowColor1)		color = windowColorTopLeft;
-	else if(send == windowColor2)	color = windowColorTopRight;
-	else if(send == windowColor3)	color = windowColorBottomLeft;
-	else if(send == windowColor4)	color = windowColorBottomRight;
+	if (send == windowColor1)		color = windowColorTopLeft;
+	else if (send == windowColor2)	color = windowColorTopRight;
+	else if (send == windowColor3)	color = windowColorBottomLeft;
+	else if (send == windowColor4)	color = windowColorBottomRight;
 
 	coul = QColorDialog::getColor(color, this);
-	if(!coul.isValid())		return;
+	if (!coul.isValid())		return;
 
 	color = coul.rgb();
 
-	if(send == windowColor1)		windowColorTopLeft = color;
-	else if(send == windowColor2)	windowColorTopRight = color;
-	else if(send == windowColor3)	windowColorBottomLeft = color;
-	else if(send == windowColor4)	windowColorBottomRight = color;
+	if (send == windowColor1)		windowColorTopLeft = color;
+	else if (send == windowColor2)	windowColorTopRight = color;
+	else if (send == windowColor3)	windowColorBottomLeft = color;
+	else if (send == windowColor4)	windowColorBottomRight = color;
 
 	setWindowColors();
 }
@@ -392,7 +419,7 @@
 void ConfigWindow::fillCharNameEdit()
 {
 	int charId = listCharNames->currentIndex();
-	if(charId < 0 || charId > 8) {
+	if (charId < 0 || charId > 8) {
 		return;
 	}
 
@@ -402,7 +429,7 @@
 void ConfigWindow::setCharName(const QString &charName)
 {
 	int charId = listCharNames->currentIndex();
-	if(charId < 0 || charId > 8) {
+	if (charId < 0 || charId > 8) {
 		return;
 	}
 
@@ -434,35 +461,46 @@
 	windowPreview->setPixmap(pix);
 }
 
+void ConfigWindow::editEncoding()
+{
+	FontManager dialog(this);
+	dialog.exec();
+}
+
 void ConfigWindow::accept()
 {
+	bool needsRestart = false;
 	QTreeWidgetItem *currentSelectedFF7Path = listFF7->currentItem();
 	int currentFF7Path = 0;
-	if(currentSelectedFF7Path) {
+	if (currentSelectedFF7Path) {
 		currentFF7Path = currentSelectedFF7Path->data(0, Qt::UserRole).toInt();
-	} else if(listFF7->topLevelItemCount() > 0) {
+	} else if (listFF7->topLevelItemCount() > 0) {
 		currentFF7Path = listFF7->topLevelItem(0)->data(0, Qt::UserRole).toInt();
 	}
 	Config::setValue("FF7ExePathToUse", currentFF7Path);
 	Config::setValue("kernel2Path", kernelAuto->isChecked() ? QDir::fromNativeSeparators(kernelPath->text()) : QString());
 	Config::setValue("windowBinPath", windowAuto->isChecked() ? QDir::fromNativeSeparators(windowPath->text()) : QString());
 	Config::setValue("charPath", charAuto->isChecked() ? QDir::fromNativeSeparators(charPath->text()) : QString());
-	if(!disableOGL->isChecked() != Config::value("OpenGL", true).toBool()) {
+	if (darkMode->isChecked() != Config::value("dark_theme", false).toBool()) {
+		Config::setValue("dark_theme", darkMode->isChecked());
+		needsRestart = true;
+	}
+	if (!disableOGL->isChecked() != Config::value("OpenGL", true).toBool()) {
 		Config::setValue("OpenGL", !disableOGL->isChecked());
-		QMessageBox::information(this, tr("Information"), tr("You must restart Makou Reactor to apply all changes."));
+		needsRestart = true;
 	}
 	Config::setValue("windowColorTopLeft", windowColorTopLeft);
 	Config::setValue("windowColorTopRight", windowColorTopRight);
 	Config::setValue("windowColorBottomLeft", windowColorBottomLeft);
 	Config::setValue("windowColorBottomRight", windowColorBottomRight);
 	//Config::setValue("dontOptimizeTexts", !optiText->isChecked());
-	Config::setValue("jp_txt", japEnc->isChecked());
+	Config::setValue("jp_txt", encodings->currentIndex() == 1);
 	Config::setValue("scriptItemExpandedByDefault", expandedByDefault->isChecked());
 	Config::setValue("lzsNotCheck", lzsNotCheck->isChecked());
 
-	for(int charId=0 ; charId<9; ++charId) {
+	for (int charId=0; charId<9; ++charId) {
 		const QString &customName = customNames.at(charId);
-		if(!customName.isEmpty() && customName != Data::char_names.at(charId)) {
+		if (!customName.isEmpty() && customName != Data::char_names.at(charId)) {
 			Config::setValue(QString("customCharName%1").arg(charId), customName);
 		} else {
 			Config::remove(QString("customCharName%1").arg(charId));
@@ -472,6 +510,10 @@
 	Config::setValue("autoSizeMarginRight", autoSizeMarginEdit->value());
 	Config::setValue("spacedCharactersWidth", spacedCharactersWidthEdit->value());
 
+	if (needsRestart) {
+		QMessageBox::information(this, tr("Information"), tr("You must restart Makou Reactor to apply all changes."));
+	}
+
 	Data::loadKernel2Bin(); // Reload kernel2.bin data
 	Data::loadWindowBin(); // Reload window.bin data
 	Data::refreshFF7Paths(); // Refresh ff7 paths
diff -Nru makoureactor-1.7.2/widgets/ConfigWindow.h makoureactor-1.8.0/widgets/ConfigWindow.h
--- makoureactor-1.7.2/widgets/ConfigWindow.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ConfigWindow.h	2020-08-08 18:46:56.000000000 +0000
@@ -37,12 +37,14 @@
 	QCheckBox *kernelAuto, *windowAuto, *charAuto;
 	QLabel *kernelPath, *windowPath, *charPath;
 	QPushButton *ff7ButtonMod, *ff7ButtonRem, *kernelButton, *windowButton, *charButton;
-	QCheckBox *disableOGL;
+	QCheckBox *darkMode, *disableOGL;
 	QPushButton *windowColor1, *windowColor2, *windowColor3, *windowColor4, *windowColorReset;
 	QLabel *windowPreview;
-	QCheckBox *japEnc, *expandedByDefault, *lzsNotCheck;
+	QCheckBox *expandedByDefault, *lzsNotCheck;
+	QComboBox *encodings;
 	QRgb windowColorTopLeft, windowColorTopRight, windowColorBottomLeft, windowColorBottomRight;
 	QStringList customNames;
+	QPushButton *encodingEdit;
 private slots:
 	void changeFF7ListButtonsState();
 	void modifyCustomFF7Path();
@@ -57,6 +59,8 @@
 	void resetColor();
 	void fillCharNameEdit();
 	void setCharName(const QString &charName);
+	void editEncoding();
+	void showIcons();
 protected:
 	void accept();
 };
diff -Nru makoureactor-1.7.2/widgets/EmptyFieldWidget.cpp makoureactor-1.8.0/widgets/EmptyFieldWidget.cpp
--- makoureactor-1.7.2/widgets/EmptyFieldWidget.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/EmptyFieldWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,16 @@
+#include "EmptyFieldWidget.h"
+
+EmptyFieldWidget::EmptyFieldWidget(QWidget *parent) : QWidget(parent)
+{
+	QPushButton *createNewMapButton = new QPushButton("Create new map");
+	QPushButton *importMapButton = new QPushButton("Import existing map...");
+
+	QVBoxLayout *layout = new QVBoxLayout(this);
+	layout->addStretch(1);
+	layout->addWidget(createNewMapButton);
+	layout->addWidget(importMapButton);
+	layout->addStretch(1);
+
+	connect(createNewMapButton, SIGNAL(released()), SIGNAL(createMapClicked()));
+	connect(importMapButton, SIGNAL(released()), SIGNAL(importMapClicked()));
+}
diff -Nru makoureactor-1.7.2/widgets/EmptyFieldWidget.h makoureactor-1.8.0/widgets/EmptyFieldWidget.h
--- makoureactor-1.7.2/widgets/EmptyFieldWidget.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/EmptyFieldWidget.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef EMPTYFIELDWIDGET_H
+#define EMPTYFIELDWIDGET_H
+
+#include <QtWidgets>
+
+class EmptyFieldWidget : public QWidget
+{
+	Q_OBJECT
+public:
+	explicit EmptyFieldWidget(QWidget *parent = nullptr);
+
+signals:
+	void createMapClicked();
+	void importMapClicked();
+};
+
+#endif // EMPTYFIELDWIDGET_H
diff -Nru makoureactor-1.7.2/widgets/EncounterTableWidget.cpp makoureactor-1.8.0/widgets/EncounterTableWidget.cpp
--- makoureactor-1.7.2/widgets/EncounterTableWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/EncounterTableWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -45,7 +45,7 @@
 	specialBattleNames << tr("Back Attack 1") << tr("Back Attack 2") << tr("Side Attack") << tr("Attack From Both Sides");
 
 	int row=3;
-	for(int i=0 ; i<10 ; ++i) {
+	for (int i=0; i<10; ++i) {
 		layout->addWidget(new QLabel(i>=6 ? specialBattleNames.at(i-6) : tr("Battle %1").arg(i+1), this), row, 0);
 		QSpinBox *spinBox = new QSpinBox(this);
 		spinBox->setRange(0, 1023);
@@ -58,17 +58,17 @@
 
 		++row;
 
-		if(row == 8) {
+		if (row == 9) {
 			layout->addWidget(probaLabel, row, 0, 1, 3);
 			++row;
-		} else if(row == 13) {
+		} else if (row == 14) {
 			layout->addWidget(probaLabel2, row, 0, 1, 3);
 			++row;
 		}
 	}
 
 	connect(mainRate, SIGNAL(valueChanged(int)), SLOT(changePercent()));
-	foreach(QSpinBox *battleProba, battleProbas)
+	for (QSpinBox *battleProba : qAsConst(battleProbas))
 		connect(battleProba, SIGNAL(valueChanged(int)), SLOT(changeProbaCount()));
 
 	changePercent();
@@ -78,7 +78,7 @@
 QList<int> EncounterTableWidget::battleIdsValues()
 {
 	QList<int> ids;
-	foreach(QSpinBox *battleId, battleIds) {
+	for (QSpinBox *battleId : qAsConst(battleIds)) {
 		ids.append(battleId->value());
 	}
 	return ids;
@@ -87,7 +87,7 @@
 QList<int> EncounterTableWidget::battleProbasValues()
 {
 	QList<int> probas;
-	foreach(QSpinBox *battleProba, battleProbas) {
+	for (QSpinBox *battleProba : qAsConst(battleProbas)) {
 		probas.append(battleProba->value());
 	}
 	return probas;
@@ -100,14 +100,14 @@
 
 void EncounterTableWidget::setBattleIdsValues(const QList<int> &ids)
 {
-	for(int i=0 ; i<10 ; ++i) {
+	for (int i=0; i<10; ++i) {
 		battleIds.at(i)->setValue(ids.at(i));
 	}
 }
 
 void EncounterTableWidget::setBattleProbasValues(const QList<int> &probas)
 {
-	for(int i=0 ; i<10 ; ++i) {
+	for (int i=0; i<10; ++i) {
 		battleProbas.at(i)->setValue(probas.at(i));
 	}
 }
@@ -134,7 +134,7 @@
 void EncounterTableWidget::changeProbaCount()
 {
 	qint16 points = 64;
-	for(quint8 i=0 ; i<6 ; ++i) {
+	for (quint8 i=0; i<6; ++i) {
 		points -= battleProbas.at(i)->value();
 	}
 
@@ -142,7 +142,7 @@
 	probaLabel->setText(tr("Remaining probability points: %1").arg(points));
 
 	points = 64;
-	for(quint8 i=6 ; i<10 ; ++i) {
+	for (quint8 i=6; i<10; ++i) {
 		points -= battleProbas.at(i)->value();
 	}
 
diff -Nru makoureactor-1.7.2/widgets/EncounterWidget.cpp makoureactor-1.8.0/widgets/EncounterWidget.cpp
--- makoureactor-1.7.2/widgets/EncounterWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/EncounterWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -56,12 +56,12 @@
 	group->setRateValue(encounterTable.rate);
 
 	QList<int> probas, ids;
-	for(int i=0 ; i<6 ; ++i) {
+	for (int i=0; i<6; ++i) {
 		probas.append(PROBABILITY(encounterTable.enc_standard[i]));
 		ids.append(BATTLE_ID(encounterTable.enc_standard[i]));
 	}
 
-	for(int i=0 ; i<4 ; ++i) {
+	for (int i=0; i<4; ++i) {
 		probas.append(PROBABILITY(encounterTable.enc_special[i]));
 		ids.append(BATTLE_ID(encounterTable.enc_special[i]));
 	}
@@ -77,11 +77,11 @@
 
 	QList<int> battleProbas = group->battleProbasValues(), battleIds = group->battleIdsValues();
 
-	for(int i=0 ; i<6 ; ++i) {
+	for (int i=0; i<6; ++i) {
 		encounterTable.enc_standard[i] = (battleProbas.at(i) << 10) | battleIds.at(i);
 	}
 
-	for(int i=0 ; i<4 ; ++i) {
+	for (int i=0; i<4; ++i) {
 		encounterTable.enc_special[i] = (battleProbas.at(6+i) << 10) | battleIds.at(6+i);
 	}
 
diff -Nru makoureactor-1.7.2/widgets/FieldList.cpp makoureactor-1.8.0/widgets/FieldList.cpp
--- makoureactor-1.7.2/widgets/FieldList.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FieldList.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -3,9 +3,9 @@
 #include "core/field/FieldPC.h"
 
 FieldList::FieldList(QWidget *parent) :
-    QTreeWidget(parent), _fieldArchive(0)
+      QTreeWidget(parent), _fieldArchive(nullptr)
 {
-	// qreal scale = qApp->desktop()->logicalDpiX() / 96.0;
+	qreal scale = qApp->desktop()->logicalDpiX() / 96.0;
 	QFont font;
 	font.setPointSize(8);
 
@@ -17,7 +17,7 @@
 	setSortingEnabled(true);
 	setAutoScroll(false);
 	setColumnWidth(1, 0);
-	setFont(font);
+	//setFont(font);
 	sortByColumn(1, Qt::AscendingOrder);
 
 	_lineSearch = new QLineEdit(parent);
@@ -27,86 +27,118 @@
 	connect(_lineSearch, SIGNAL(textEdited(QString)), SLOT(filterMap(QString)));
 	connect(_lineSearch, SIGNAL(returnPressed()), SLOT(filterMap()));
 
-	/* QAction *add_A = new QAction(QIcon(":/images/plus.png"), tr("Add field"), this);
+	QAction *rename_A = new QAction(tr("Rename field"), this);
+	rename_A->setShortcut(QKeySequence("F2"));
+	rename_A->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+	QAction *add_A = new QAction(QIcon(":/images/plus.png"), tr("Add field"), this);
 	add_A->setShortcut(QKeySequence("Ctrl++"));
 	add_A->setShortcutContext(Qt::WidgetWithChildrenShortcut);
 	QAction *del_A = new QAction(QIcon(":/images/minus.png"), tr("Delete field"), this);
 	del_A->setShortcut(QKeySequence(Qt::Key_Delete));
 	del_A->setShortcutContext(Qt::WidgetWithChildrenShortcut);
 
+	connect(this, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), SLOT(rename(QTreeWidgetItem *, int)));
+	connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), SLOT(evidence(QTreeWidgetItem*,QTreeWidgetItem*)));
+
+	connect(rename_A, SIGNAL(triggered()), SLOT(rename()));
+	connect(add_A, SIGNAL(triggered()), SLOT(add()));
+	connect(del_A, SIGNAL(triggered()), SLOT(del()));
+
+	this->addAction(rename_A);
+	this->addAction(add_A);
+	this->addAction(del_A);
+
 	_toolBar = new QToolBar(tr("&Field List Toolbar"));
 	_toolBar->setIconSize(QSize(14*scale,14*scale));
 	_toolBar->addAction(add_A);
 	add_A->setStatusTip(tr("Add a field"));
 	_toolBar->addAction(del_A);
 	del_A->setStatusTip(tr("Remove a field"));
-	_toolBar->hide();
 
-	// connect(add_A, SIGNAL(triggered()), SLOT(add()));
-	// connect(del_A, SIGNAL(triggered()), SLOT(del()));
+	enableActions(false);
+}
+
+void FieldList::evidence(QTreeWidgetItem *current, QTreeWidgetItem *previous)
+{
+	if (current) {
+		QColor color = Data::color(Data::ColorEvidence);
+		current->setBackground(0, color);
+		current->setBackground(1, color);
+	}
 
-	setMinimumWidth(_toolBar->sizeHint().width()); */
+	if (previous) {
+		previous->setBackground(0, QBrush());
+		previous->setBackground(1, QBrush());
+	}
 }
 
 void FieldList::setEnabled(bool enabled)
 {
 	QTreeWidget::setEnabled(enabled);
 	_lineSearch->setEnabled(enabled);
-	// _toolBar->setEnabled(enabled);
+	enableActions(enabled);
+}
+
+void FieldList::enableActions(bool enabled)
+{
+	_toolBar->setEnabled(enabled);
+	setContextMenuPolicy(enabled ? Qt::ActionsContextMenu : Qt::NoContextMenu);
 }
 
-QTreeWidgetItem *FieldList::createItem(Field *f, int fieldID)
+QTreeWidgetItem *FieldList::createItem(Field *f, int mapID)
 {
 	const QString &name = f->name();
 	QString id;
-	int index = Data::field_names.indexOf(name);
-	if(index != -1) {
+	int index = Data::maplist().indexOf(name);
+	if (index != -1) {
 		id = QString("%1").arg(index, 3);
 	} else {
-		id = "~";
+		id = "  ~";
 	}
 
 	QTreeWidgetItem *item = new QTreeWidgetItem(QStringList() << name << id);
-	item->setData(0, Qt::UserRole, fieldID);
+	item->setData(0, Qt::UserRole, mapID);
+
+	if (!f->io() || index == -1) {
+		item->setForeground(0, Qt::darkGray);
+		item->setForeground(1, Qt::darkGray);
+	}
+
 	return item;
 }
 
 void FieldList::adjustWidth()
 {
 	resizeColumnToContents(0);
-
-	setMinimumWidth(columnWidth(0) +
-	                columnWidth(1));
 }
 
 void FieldList::fill(FieldArchive *fieldArchive)
 {
 	QList<QTreeWidgetItem *> items;
+	FieldArchiveIterator it(*fieldArchive);
 
-	for(int fieldID = 0 ; fieldID < fieldArchive->size() ; ++fieldID) {
-		Field *f = fieldArchive->field(fieldID, false);
-		if(f) {
-			items.append(createItem(f, fieldID));
+	while (it.hasNext()) {
+		Field *f = it.next(false);
+		if (f) {
+			items.append(createItem(f, it.mapId()));
 		}
 	}
 
 	_fieldArchive = fieldArchive;
 
-	// TODO: not implemented
-	/* if(_fieldArchive->isPS()) {
-		_toolBar->setEnabled(false);
-	} */
+	setEnabled(true);
+	enableActions(_fieldArchive->isPC());
 
-	if(!items.isEmpty()) {
+	if (!items.isEmpty()) {
 		addTopLevelItems(items);
 		adjustWidth();
 	}
 }
 
-int FieldList::currentFieldId() const
+int FieldList::currentMapId() const
 {
 	QList<QTreeWidgetItem *> selectedItems = this->selectedItems();
-	if(selectedItems.isEmpty()) {
+	if (selectedItems.isEmpty()) {
 		return -1;
 	}
 
@@ -115,7 +147,7 @@
 
 FieldArchive::Sorting FieldList::getFieldSorting()
 {
-	switch(sortColumn()) {
+	switch (sortColumn()) {
 	case 0:
 		return FieldArchive::SortByName;
 	default:
@@ -127,91 +159,154 @@
 {
 	QList<QTreeWidgetItem *> items = findItems(name.isNull() ? _lineSearch->text() : name,
 	                                           Qt::MatchStartsWith);
-	if(!items.isEmpty()) {
+	if (!items.isEmpty()) {
 		scrollToItem(items.first(), QAbstractItemView::PositionAtTop);
 	}
 }
 
-void FieldList::add()
+void FieldList::rename(QTreeWidgetItem *item, int column)
 {
-	if(!_fieldArchive) {
+	if (item == nullptr || column != 0) {
 		return;
 	}
 
-	QStringList filter;
-	if(_fieldArchive->isPC()) {
-		filter.append(tr("PC Field File (*)"));
-	} else {
-		filter.append(tr("DAT File (*.DAT)"));
+	item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
+	editItem(item, 0);
+	item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+	connect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int)), SLOT(renameOK(QTreeWidgetItem *, int)));
+}
+
+void FieldList::renameOK(QTreeWidgetItem *item, int column)
+{
+	if (column != 1) {
+		return;
 	}
 
-	QString filePath = QFileDialog::getOpenFileName(this, tr("Add a field"),
-	                                                QString(),
-	                                                filter.join(";;"));
-	if(filePath.isNull()) {
+	disconnect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(renameOK(QTreeWidgetItem *, int)));
+	QString newName = item->text(1).left(8);
+
+	if (newName.isEmpty()) {
+		QMessageBox::warning(this, tr("Name not filled"),
+		                     tr("Please set a new field name."));
+		return;
+	} else if (Data::maplist().contains(newName)) {
+		QMessageBox::warning(this,
+		                     tr("Name already present in archive"),
+		                     tr("Please choose another name."));
 		return;
 	}
 
-	if(_fieldArchive->isPC()) {
-		FieldPC *field = new FieldPC("", _fieldArchive->io());
-		if(field->open(filePath, false, true) == 0) {
-			InfFile *inf = field->inf();
-			QString newName;
-			if(inf && inf->isOpen()) {
-				newName = inf->mapName();
-			} else {
-				newName = QFileInfo(filePath).baseName();
-			}
-
-			// Name set by user
-			while(newName.isEmpty() || Data::field_names.contains(newName)){
-				bool ok;
-				newName = QInputDialog::getText(this, tr("Choose a name"),
-				                                tr("Field name:"),
-				                                QLineEdit::Normal, newName,
-				                                &ok);
-				if(!ok) {
-					return;
-				}
-				if(newName.isEmpty()) {
-					QMessageBox::warning(this, tr("Name not filled"),
-					                     tr("Please set a new field name."));
-				} else if(Data::field_names.contains(newName)) {
-					QMessageBox::warning(this, tr("Name already present in archive"),
-					                     tr("Please choose another name."));
-				}
-			}
-
-			field->setName(newName);
-			int fieldID;
-			FieldArchiveIO::ErrorCode err = _fieldArchive->addField(field,
-			                                                        filePath,
-			                                                        fieldID); // ref
-			switch(err){
-			case FieldArchiveIO::NotImplemented:
-				QMessageBox::warning(this, tr("Error"), tr("Not implemented."));
-				break;
-			case FieldArchiveIO::FieldExists:
-				QMessageBox::warning(this, tr("Error"), tr("Field with this name already exist."));
-				break;
-			case FieldArchiveIO::Ok:
-				break;
-			default:
-				QMessageBox::warning(this, tr("Error"), tr("Unknown error."));
-				break;
-			}
-
-			addTopLevelItem(createItem(field, fieldID));
-			adjustWidth();
-		} else {
-			QMessageBox::warning(this, tr("Error"), tr("Cannot open file."));
+	item->setText(1, newName);
+
+	Field *f = _fieldArchive->field(currentMapId());
+	if (f) {
+		f->setName(newName);
+		InfFile *inf = f->inf();
+		if (inf != nullptr) {
+			inf->setMapName(newName);
 		}
-	} else {
-		// TODO
 	}
+
+	emit changed();
+}
+
+void FieldList::add()
+{
+	if (!_fieldArchive) {
+		return;
+	}
+
+	if (!_fieldArchive->isPC()) {
+		QMessageBox::warning(this, tr("Error"), tr("Not implemented for PS."));
+		return;
+	}
+
+	QString newName;
+
+	// Name set by user
+	while (newName.isEmpty() || Data::maplist().contains(newName)){
+		bool ok;
+		newName = QInputDialog::getText(this, tr("Choose a name"),
+		                                tr("Field name:"),
+		                                QLineEdit::Normal, newName,
+		                                &ok);
+		if (!ok) {
+			return;
+		}
+		if (newName.isEmpty()) {
+			QMessageBox::warning(this, tr("Name not filled"),
+			                     tr("Please set a new field name."));
+		} else if (Data::maplist().contains(newName)) {
+			QMessageBox::warning(this,
+			                     tr("Name already present in archive"),
+			                     tr("Please choose another name."));
+		}
+	}
+
+	FieldPC *field = new FieldPC(newName);
+	field->initEmpty();
+	int mapID; // ref
+	_fieldArchive->addNewField(field, mapID);
+
+	QTreeWidgetItem *item = createItem(field, mapID);
+	addTopLevelItem(item);
+	adjustWidth();
+	setCurrentItem(item);
+	scrollToItem(item, QAbstractItemView::PositionAtTop);
+	setFocus();
+	emit changed();
 }
 
 void FieldList::del()
 {
-	
+	if (!_fieldArchive->isPC()) {
+		QMessageBox::warning(this, tr("Error"), tr("Not implemented for PS."));
+		return;
+	}
+
+	if (topLevelItemCount() == 0) {
+		return;
+	}
+
+	QList<QTreeWidgetItem *> selected = selectedItems();
+
+	if (selected.isEmpty()) {
+		return;
+	}
+
+	QString msg = tr("Are you sure you want to remove %1?\n"
+	                 "Other maps can refer to it!")
+	                  .arg(selected.size() == 1
+	                           ? tr("the selected field")
+	                           : tr("the selected fields"));
+	QMessageBox::StandardButton but = QMessageBox::warning(
+	    this, tr("Delete"), msg, QMessageBox::Yes | QMessageBox::Cancel);
+
+	if (but == QMessageBox::Cancel) {
+		return;
+	}
+
+	int lastIndex = -1;
+
+	blockSignals(true);
+
+	for (QTreeWidgetItem *item : qAsConst(selected)) {
+		int mapID = item->data(0, Qt::UserRole).toInt();
+		_fieldArchive->delField(mapID);
+		lastIndex = qMax(lastIndex, indexOfTopLevelItem(item));
+		delete item;
+	}
+
+	blockSignals(false);
+
+	emit fieldDeleted();
+
+	QTreeWidgetItem *itemToFocus = topLevelItem(lastIndex);
+
+	if (itemToFocus != nullptr) {
+		adjustWidth();
+		setCurrentItem(itemToFocus);
+		scrollToItem(itemToFocus, QAbstractItemView::PositionAtTop);
+		setFocus();
+	}
 }
diff -Nru makoureactor-1.7.2/widgets/FieldList.h makoureactor-1.8.0/widgets/FieldList.h
--- makoureactor-1.7.2/widgets/FieldList.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FieldList.h	2020-08-08 18:46:56.000000000 +0000
@@ -9,7 +9,7 @@
 	Q_OBJECT
 public:
 	explicit FieldList(QWidget *parent = 0);
-	int currentFieldId() const;
+	int currentMapId() const;
 	inline QToolBar *toolBar() {
 		return _toolBar;
 	}
@@ -18,14 +18,26 @@
 		return _lineSearch;
 	}
 	void setEnabled(bool enabled);
+	void enableActions(bool enabled);
 public slots:
+	inline void rename() {
+		rename(currentItem(), 1);
+	}
+	void rename(QTreeWidgetItem *item, int column);
+	void renameOK(QTreeWidgetItem *item, int column);
 	void fill(FieldArchive *fieldArchive);
 	void filterMap(const QString &name = QString());
 private slots:
+	void evidence(QTreeWidgetItem *current, QTreeWidgetItem *previous);
 	void add();
 	void del();
+
+signals:
+	void changed();
+	void fieldDeleted();
+
 private:
-	static QTreeWidgetItem *createItem(Field *f, int fieldID);
+	static QTreeWidgetItem *createItem(Field *f, int mapID);
 	void adjustWidth();
 
 	QLineEdit *_lineSearch;
diff -Nru makoureactor-1.7.2/widgets/FieldModel.cpp makoureactor-1.8.0/widgets/FieldModel.cpp
--- makoureactor-1.7.2/widgets/FieldModel.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FieldModel.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -16,14 +16,30 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 #include "FieldModel.h"
+#include "Parameters.h"
 #include "core/field/FieldModelFilePS.h"
 
-FieldModel::FieldModel(QWidget *parent, const QGLWidget *shareWidget) :
-	QGLWidget(parent, shareWidget), blockAll(false), distance(-0.25/*-35*/),
-	animationID(0), currentFrame(0), animated(true), data(0),
+FieldModel::FieldModel(QWidget *parent) :
+    QOpenGLWidget(parent), blockAll(false), distance(-0.25/*-35*/),
+    animationID(0), currentFrame(0), animated(true), data(nullptr),
 	xRot(270*16), yRot(90*16), zRot(0)
 {
 	connect(&timer, SIGNAL(timeout()), SLOT(animate()));
+
+	QSurfaceFormat format;
+	format.setRenderableType(QSurfaceFormat::OpenGL);
+	// asks for a OpenGL 2.1 debug context using the Core profile
+	format.setVersion(2, 1);
+	format.setProfile(QSurfaceFormat::CoreProfile);
+#ifdef OPENGL_DEBUG
+	format.setOption(QSurfaceFormat::DebugContext);
+#endif
+
+	QOpenGLContext *context = new QOpenGLContext;
+	context->setFormat(format);
+	context->create();
+
+	setFormat(format);
 }
 
 FieldModel::~FieldModel()
@@ -33,10 +49,10 @@
 void FieldModel::clear()
 {
 	currentFrame = 0;
-	data = 0;
+	data = nullptr;
 	timer.stop();
 //	glClearColor(0.0,0.0,0.0,0.0);
-	updateGL();
+	update();
 }
 
 void FieldModel::setFieldModelFile(FieldModelFile *fieldModel, int animID)
@@ -44,8 +60,8 @@
 	currentFrame = 0;
 	data = fieldModel;
 	animationID = animID;
-	if(data && data->isValid()) {
-		updateGL();
+	if (data && data->isValid()) {
+		update();
 		updateTimer();
 	}
 }
@@ -60,14 +76,14 @@
 {
 	if (animationID != animID) {
 		animationID = animID;
-		updateGL();
+		update();
 		updateTimer();
 	}
 }
 
 void FieldModel::updateTimer()
 {
-	if(animated && data && frameCount() > 1) {
+	if (animated && data && frameCount() > 1) {
 		timer.start(30);
 	} else {
 		timer.stop();
@@ -88,6 +104,7 @@
 
 void FieldModel::initializeGL()
 {
+	initializeOpenGLFunctions();
 	// GLfloat ambient[] = {0.8f, 0.8f, 0.8f, 1.0f};
 	// glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient);
 
@@ -100,47 +117,46 @@
 	glDisable(GL_CULL_FACE);
 	glDisable(GL_LIGHTING);
 	glEnable(GL_BLEND);
+	glEnable(GL_TEXTURE_2D);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 //	gluPerspective(70, (double)width()/(double)height(), 0.001, 1000.0);
 }
 
-void FieldModel::drawP(QGLWidget *glWidget, FieldModelFile *data, float scale,
+void FieldModel::drawP(FieldModelFile *data, float scale,
                        const FieldModelBone &bone,
-                       GLuint &texture_id, quint64 &lastTexID,
-                       float globalColor[3])
+                       const QHash<void *, QOpenGLTexture *> &textures,
+                       float globalColor[3], QOpenGLTexture *&texture)
 {
 	if (scale == 0.0f) {
 		return;
 	}
 
-	foreach(FieldModelPart *part, bone.parts()) {
+	int curPolyType = 0;
 
-		foreach(FieldModelGroup *g, part->groups()) {
-			if(g->hasTexture()) {
-				if(texture_id != (GLuint)-1) {
-					glWidget->deleteTexture(texture_id);
-				} else {
-					glEnable(GL_TEXTURE_2D);
+	for (FieldModelPart *part : bone.parts()) {
+		for (FieldModelGroup *g : part->groups()) {
+			if (g->hasTexture()) {
+				QOpenGLTexture *tex = textures.value(data->textureIdForGroup(g));
+
+				if (tex) {
+					if (texture && tex != texture) {
+						texture->release(0);
+					}
+					tex->bind(0);
+					texture = tex;
 				}
-				texture_id = glWidget->bindTexture(data->loadedTexture(g),
-				                                   GL_TEXTURE_2D, GL_RGBA,
-				                                   QGLContext::MipmapBindOption);
-			} else if(!g->hasTexture() && texture_id != (GLuint)-1) {
-				glWidget->deleteTexture(texture_id);
-				glDisable(GL_TEXTURE_2D);
-				texture_id = -1;
-				lastTexID = quint64(-1);
+			} else if (texture) {
+				texture->release(0);
+				texture = nullptr;
 			}
 
-			int curPolyType = 0;
-
-			foreach(const Poly *p, g->polygons()) {
-				if(curPolyType != p->count()) {
-					if(curPolyType != 0) {
+			for (const Poly *p : g->polygons()) {
+				if (curPolyType != p->count()) {
+					if (curPolyType != 0) {
 						glEnd();
 					}
 
-					if(p->count() == 3) {
+					if (p->count() == 3) {
 						glBegin(GL_TRIANGLES);
 					} else {
 						glBegin(GL_QUADS);
@@ -148,17 +164,17 @@
 					curPolyType = p->count();
 				}
 
-				if(p->isMonochrome()) {
+				if (p->isMonochrome()) {
 					const QRgb &color = p->color();
 					glColor3ub(qRed(color) * globalColor[0],
 					           qGreen(color) * globalColor[1],
 					           qBlue(color) * globalColor[2]);
 				}
 
-				for(quint16 j=0 ; j<(quint8)p->count() ; ++j) {
+				for (int j=0; j<p->count(); ++j) {
 					const PolyVertex &vertex = p->vertex(j);
 
-					if(!p->isMonochrome()) {
+					if (!p->isMonochrome()) {
 						QRgb color = p->color(j);
 						// TODO: color projector effect
 						/* float spot = qMax(vertex.x * 0.0f + vertex.y * 0.0f + (1.0 - (vertex.z/scale)) * -1.0f, 0.0f);
@@ -172,7 +188,7 @@
 						           qBlue(color) * globalColor[2]);
 					}
 
-					if(g->hasTexture() && p->hasTexture()) {
+					if (g->hasTexture() && p->hasTexture()) {
 						const TexCoord &coord = p->texCoord(j);
 						glTexCoord2d(coord.x, coord.y);
 					}
@@ -181,8 +197,9 @@
 				}
 			}
 
-			if(curPolyType != 0) {
+			if (curPolyType != 0) {
 				glEnd();
+				curPolyType = 0;
 			}
 		}
 	}
@@ -191,19 +208,26 @@
 void FieldModel::mouseMoveEvent(QMouseEvent *event)
 {
 	int dx = event->x() - lastPos.x();
-	int dy = event->y() - lastPos.y();
+	    //dy = event->y() - lastPos.y();
+
+	bool needsUpdate = false;
 
 	if (event->buttons() & Qt::LeftButton) {
-		setXRotation(xRot + 8 * dy);
+		needsUpdate |= setXRotation(xRot + 8 * dx);
 		//setYRotation(yRot + 8 * dx);
 	}
-	else if (event->buttons() & Qt::RightButton) {
+	if (event->buttons() & Qt::RightButton) {
 		//setXRotation(xRot + 8 * dy);
-		setZRotation(zRot + 8 * dx);
+		needsUpdate |= setZRotation(zRot + 8 * dx);
+	}
+	if (event->buttons() & Qt::MidButton) {
+		needsUpdate |= setYRotation(yRot + 8 * dx);
 	}
-	else {
-		setYRotation(yRot + 8 * dx);
+
+	if (needsUpdate) {
+		update();
 	}
+
 	lastPos = event->pos();
 }
 
@@ -215,31 +239,37 @@
 		angle -= 360 * 16;
 }
 
-void FieldModel::setXRotation(int angle)
+bool FieldModel::setXRotation(int angle)
 {
 	qNormalizeAngle(angle);
 	if (angle != xRot) {
 		xRot = angle;
-		updateGL();
+		return true;
 	}
+
+	return false;
 }
 
-void FieldModel::setYRotation(int angle)
+bool FieldModel::setYRotation(int angle)
 {
 	qNormalizeAngle(angle);
 	if (angle != yRot) {
 		yRot = angle;
-		updateGL();
+		return true;
 	}
+
+	return false;
 }
 
-void FieldModel::setZRotation(int angle)
+bool FieldModel::setZRotation(int angle)
 {
 	qNormalizeAngle(angle);
 	if (angle != zRot) {
 		zRot = angle;
-		updateGL();
+		return true;
 	}
+
+	return false;
 }
 
 void FieldModel::resetCamera()
@@ -248,7 +278,7 @@
 	xRot = 270*16;
 	yRot = 90*16;
 	zRot = 0;
-	updateGL();
+	update();
 }
 
 void FieldModel::resizeGL(int width, int height)
@@ -263,16 +293,16 @@
 	glMatrixMode(GL_MODELVIEW);
 }
 
-void FieldModel::paintModel(QGLWidget *glWidget, FieldModelFile *data,
-                            int animationID, int currentFrame, float scale)
+void FieldModel::paintModel(FieldModelFile *data, int animationID,
+                            int currentFrame, float scale)
 {
-	if(!data || !data->isValid() || scale == 0.0f) {
+	if (!data || !data->isValid() || scale == 0.0f) {
 		return;
 	}
 
 	float globalColor[] = { 1.0f, 1.0f, 1.0f };
 
-	/* if(!data->translateAfter()) { // TODO: for PC too
+	/* if (!data->translateAfter()) { // TODO: for PC too
 		FieldModelFilePS *filePS = static_cast<FieldModelFilePS *>(data);
 		globalColor[0] = qRed(filePS->globalColor()) / 255.0f;
 		globalColor[1] = qGreen(filePS->globalColor()) / 255.0f;
@@ -281,37 +311,45 @@
 
 	QStack<int> parent;
 	int i;
-	GLuint texture_id = -1;
-	quint64 lastTexID = quint64(-1);
+	QHash<void *, QOpenGLTexture *> textures;
+	QHashIterator<void *, QImage> it(data->loadedTextures());
 
-	if(data->boneCount() <= 1) {
-		drawP(glWidget, data, scale, data->bone(0), texture_id, lastTexID,
-		      globalColor);
-		if(texture_id != (GLuint)-1) {
-			glWidget->deleteTexture(texture_id);
-			glDisable(GL_TEXTURE_2D);
-		}
+	while (it.hasNext()) {
+		it.next();
+		QOpenGLTexture *tex = new QOpenGLTexture(it.value());
+		tex->setMinificationFilter(QOpenGLTexture::NearestMipMapLinear);
+		tex->setMagnificationFilter(QOpenGLTexture::Nearest);
+		textures.insert(it.key(), tex);
+	}
+
+	QOpenGLTexture *texture = nullptr;
+
+	if (data->boneCount() <= 1) {
+		drawP(data, scale, data->bone(0), textures, globalColor, texture);
+
+		qDeleteAll(textures);
 		return;
 	}
 
 	if (animationID >= data->animationCount()) {
+		qDeleteAll(textures);
 		return;
 	}
 
 	QList<PolyVertex> rot = data->animation(animationID).rotations(currentFrame);
 	parent.push(-1);
 
-	for(i = 0 ; i < data->boneCount() ; ++i) {
+	for (i = 0; i < data->boneCount(); ++i) {
 		const FieldModelBone &bone = data->bone(i);
 
-		while(!parent.isEmpty() && parent.top() != bone.parent()) {
+		while (!parent.isEmpty() && parent.top() != bone.parent()) {
 			parent.pop();
 			glPopMatrix();
 		}
 		parent.push(i);
 		glPushMatrix();
 
-		if(!data->translateAfter()) {
+		if (!data->translateAfter()) {
 			glTranslatef(0.0, 0.0, bone.size() / scale);
 		}
 
@@ -322,23 +360,19 @@
 			glRotatef(rotation.z, 0.0, 0.0, 1.0);
 		}
 
-		drawP(glWidget, data, scale, bone, texture_id, lastTexID,
-		      globalColor);
+		drawP(data, scale, bone, textures, globalColor, texture);
 
-		if(data->translateAfter()) {
+		if (data->translateAfter()) {
 			glTranslatef(0.0, 0.0, bone.size() / scale);
 		}
 	}
 
-	if(texture_id != (GLuint)-1) {
-		glWidget->deleteTexture(texture_id);
-		glDisable(GL_TEXTURE_2D);
-	}
-
-	while(!parent.isEmpty() && parent.top() != -1) {
+	while (!parent.isEmpty() && parent.top() != -1) {
 		parent.pop();
 		glPopMatrix();
 	}
+
+	qDeleteAll(textures);
 }
 
 void FieldModel::paintGL()
@@ -347,15 +381,21 @@
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 
-	if(!data || !data->isValid())	return;
+	if (!data || !data->isValid())	return;
+
+#ifdef OPENGL_DEBUG
+	QOpenGLContext *ctx = QOpenGLContext::currentContext();
+	QOpenGLDebugLogger *logger = new QOpenGLDebugLogger(this);
+	logger->initialize();
+#endif
 
 	//scale the view port if the window manager is scaling
 	int scale = 1;
-	if(qApp->desktop()->physicalDpiX() > 140) {
+	if (qApp->desktop()->physicalDpiX() > 140) {
 		scale = 2;
 	}
 
-	resizeGL(width() * scale, height() * scale); // hack (?)
+	resize(width() * scale, height() * scale); // hack (?)
 
 	gluLookAt(distance,0,0,0,0,0,0,0,1);
 //	glTranslatef(distance, 0.0f, 0.0f);
@@ -367,8 +407,6 @@
 	glRotatef(yRot / 16.0, 0.0, 1.0, 0.0);
 	glRotatef(zRot / 16.0, 0.0, 0.0, 1.0);
 
-//	qDebug() << (xRot / 16.0) << (yRot / 16.0) << (zRot / 16.0);
-
 //	glBegin(GL_LINES);
 //	glColor3f(0.0, 0.0, 1.0);
 //	glVertex3f(0.0, 0.0, 0.0);
@@ -391,29 +429,39 @@
 //	glEnd();
 
 	paintModel();
+
+#ifdef OPENGL_DEBUG
+	const QList<QOpenGLDebugMessage> messages = logger->loggedMessages();
+	for (const QOpenGLDebugMessage &message : messages) {
+		qDebug() << message;
+	}
+#endif
 }
 
 void FieldModel::wheelEvent(QWheelEvent *event)
 {
-	distance += double(event->delta())/4096.0;
-	updateGL();
+	distance += double(event->angleDelta().y())/4096.0;
+	update();
 }
 
 void FieldModel::mousePressEvent(QMouseEvent *event)
 {
 	lastPos = event->pos();
-	if(event->button() == Qt::MidButton) {
+	if (event->button() == Qt::MidButton) {
 		resetCamera();
 	}
 }
 
 void FieldModel::animate()
 {
-	if(data && data->isValid() && isVisible()) {
+	if (data && data->isValid() && isVisible()) {
 		int count = frameCount();
-		if(count > 0) {
+		if (count > 0) {
 			currentFrame = (currentFrame + 1) % count;
-			updateGL();
+			update();
+		} else if (currentFrame != 0) {
+			currentFrame = 0;
+			update();
 		}
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/FieldModel.h makoureactor-1.8.0/widgets/FieldModel.h
--- makoureactor-1.7.2/widgets/FieldModel.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FieldModel.h	2020-08-08 18:46:56.000000000 +0000
@@ -19,7 +19,6 @@
 #define FIELDMODEL_H
 
 #include <QtWidgets>
-#include <QGLWidget>
 #ifdef Q_OS_MAC
 #include <OpenGL/glu.h>
 #else
@@ -28,30 +27,32 @@
 #include "core/field/FieldModelFile.h"
 #include "core/field/FieldPC.h"
 
-class FieldModel : public QGLWidget
+class FieldModel : public QOpenGLWidget, protected QOpenGLFunctions
 {
 	Q_OBJECT
 public:
-	FieldModel(QWidget *parent=0, const QGLWidget *shareWidget=0);
+	FieldModel(QWidget *parent=nullptr);
 	virtual ~FieldModel();
 	void setIsAnimated(bool animate);
 	void setAnimationID(int animID);
 	void clear();
 	int boneCount() const;
 	int frameCount() const;
-	static void paintModel(QGLWidget *glWidget, FieldModelFile *data, int animationID, int currentFrame=0, float scale=1.0f);
+	static void paintModel(FieldModelFile *data, int animationID,
+	                       int currentFrame=0, float scale=1.0f);
 public slots:
 	void setFieldModelFile(FieldModelFile *fieldModel, int animationID = 0);
 private slots:
 	void animate();
 private:
 	void updateTimer();
-	inline void paintModel() { paintModel(this, data, animationID, currentFrame); }
-	static void drawP(QGLWidget *glWidget, FieldModelFile *data, float scale, const FieldModelBone &bone,
-					  GLuint &texture_id, quint64 &lastTexID, float globalColor[3]);
-	void setXRotation(int angle);
-	void setYRotation(int angle);
-	void setZRotation(int angle);
+	inline void paintModel() { paintModel(data, animationID, currentFrame); }
+	static void drawP(FieldModelFile *data, float scale, const FieldModelBone &bone,
+	                  const QHash<void *, QOpenGLTexture *> &textures,
+	                  float globalColor[3], QOpenGLTexture *&texture);
+	bool setXRotation(int angle);
+	bool setYRotation(int angle);
+	bool setZRotation(int angle);
 	void resetCamera();
 
 	bool blockAll;
@@ -67,6 +68,7 @@
 	int yRot;
 	int zRot;
 	QPoint lastPos;
+	QOpenGLShaderProgram *program;
 protected:
 	void initializeGL();
 	void resizeGL(int w, int h);
diff -Nru makoureactor-1.7.2/widgets/FontGrid.cpp makoureactor-1.8.0/widgets/FontGrid.cpp
--- makoureactor-1.7.2/widgets/FontGrid.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FontGrid.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -44,17 +44,17 @@
 	QLine *linesV = new QLine[lineCountV],
 	      *linesH = new QLine[lineCountH];
 
-	for(int i=0 ; i<lineCountV ; ++i) {
+	for (int i=0; i<lineCountV; ++i) {
 		linesV[i].setPoints(QPoint(i*cellSize, 0), QPoint(i*cellSize, height()));
 	}
 
-	for(int i=0 ; i<lineCountH ; ++i) {
+	for (int i=0; i<lineCountH; ++i) {
 		linesH[i].setPoints(QPoint(0, i*cellSize), QPoint(width(), i*cellSize));
 	}
 
 	QPainter p(this);
 
-	if(isEnabled()) {
+	if (isEnabled()) {
 		p.setBrush(Qt::black);
 		p.drawRect(0, 0, width(), height());
 	}
@@ -67,31 +67,31 @@
 	delete[] linesV;
 	delete[] linesH;
 
-	if(_windowBinFile) {
+	if (_windowBinFile) {
 		int charCount=_windowBinFile->tableSize(_currentTable);
 
 		// Draw odd characters (optimization to reduce the number of palette change)
-		for(int i=0, x2=0, y2=0 ; i<charCount ; i+=2) {
+		for (int i=0, x2=0, y2=0; i<charCount; i+=2) {
 			p.drawImage(QPoint(1+padding+x2*cellSize, 1+padding+y2*cellSize), _windowBinFile->letter(_currentTable, i, _color));
 			x2+=2;
-			if(x2 == _letterCountH) {
+			if (x2 == _letterCountH) {
 				++y2;
 				x2 = 0;
 			}
 		}
 
 		// Draw even characters
-		for(int i=1, x2=1, y2=0 ; i<charCount ; i+=2) {
+		for (int i=1, x2=1, y2=0; i<charCount; i+=2) {
 			p.drawImage(QPoint(1+padding+x2*cellSize, 1+padding+y2*cellSize), _windowBinFile->letter(_currentTable, i, _color));
 			x2+=2;
-			if(x2 == _letterCountH + 1) {
+			if (x2 == _letterCountH + 1) {
 				++y2;
 				x2 = 1;
 			}
 		}
 	}
 
-	if(isEnabled()) {
+	if (isEnabled()) {
 		// Draw selection frame
 		p.setPen(hasFocus() ? Qt::red : QColor(0xff,0x7f,0x7f));
 
@@ -111,7 +111,7 @@
 QPoint FontGrid::getPos(int letter)
 {
 	const int cellSize = 15;
-	if(letter > _letterCountH*_letterCountV)		return QPoint();
+	if (letter > _letterCountH*_letterCountV)		return QPoint();
 	return QPoint((letter % _letterCountH) * cellSize, (letter / _letterCountH) * cellSize);
 }
 
@@ -128,7 +128,7 @@
 void FontGrid::mousePressEvent(QMouseEvent *e)
 {
 	int letter = getLetter(e->pos());
-	if(letter < _letterCountH*_letterCountV) {
+	if (letter < _letterCountH*_letterCountV) {
 		setLetter(letter);
 		emit letterClicked(letter);
 	}
@@ -139,31 +139,31 @@
 {
 	int letter;
 
-	switch(e->key()) {
+	switch (e->key()) {
 	case Qt::Key_Left:
 		letter = _letter - 1;
-		if(letter >= 0) {
+		if (letter >= 0) {
 			setLetter(letter);
 			emit letterClicked(letter);
 		}
 		break;
 	case Qt::Key_Right:
 		letter = _letter + 1;
-		if(letter < _letterCountH*_letterCountV) {
+		if (letter < _letterCountH*_letterCountV) {
 			setLetter(letter);
 			emit letterClicked(letter);
 		}
 		break;
 	case Qt::Key_Up:
 		letter = _letter - _letterCountH;
-		if(letter >= 0) {
+		if (letter >= 0) {
 			setLetter(letter);
 			emit letterClicked(letter);
 		}
 		break;
 	case Qt::Key_Down:
 		letter = _letter + _letterCountH;
-		if(letter < _letterCountH*_letterCountV) {
+		if (letter < _letterCountH*_letterCountV) {
 			setLetter(letter);
 			emit letterClicked(letter);
 		}
diff -Nru makoureactor-1.7.2/widgets/FontLetter.cpp makoureactor-1.8.0/widgets/FontLetter.cpp
--- makoureactor-1.7.2/widgets/FontLetter.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FontLetter.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -18,7 +18,8 @@
 #include "FontLetter.h"
 
 FontLetter::FontLetter(QWidget *parent) :
-	FontDisplay(parent), _pixelIndex(0), readOnly(false), startDrag(false), startDrag2(false)
+	FontDisplay(parent), _pixelIndex(0), readOnly(false), startDrag(false),
+	startDrag2(false)
 {
 	setFixedSize(sizeHint());
 	setMouseTracking(true);
@@ -51,7 +52,7 @@
 
 void FontLetter::setWindowBinFile(WindowBinFile *windowBinFile)
 {
-	if(windowBinFile) {
+	if (windowBinFile) {
 		copyLetter = windowBinFile->letter(_currentTable, _letter, _color);
 	}
 	FontDisplay::setWindowBinFile(windowBinFile);
@@ -59,7 +60,7 @@
 
 void FontLetter::setLetter(int letter)
 {
-	if(_windowBinFile) {
+	if (_windowBinFile) {
 		copyLetter = _windowBinFile->letter(_currentTable, letter, _color);
 	}
 	FontDisplay::setLetter(letter);
@@ -67,8 +68,8 @@
 
 void FontLetter::reset()
 {
-	if(copyLetter.isNull() || !_windowBinFile)		return;
-//	_windowBinFile->setLetter(_currentTable, _letter, copyLetter);//TODO: setLetter
+	if (copyLetter.isNull() || !_windowBinFile)		return;
+	_windowBinFile->setLetter(_currentTable, _letter, copyLetter);
 	update();
 }
 
@@ -76,14 +77,14 @@
 {
 	QPainter p(this);
 
-	if(isEnabled()) {
+	if (isEnabled()) {
 		p.setBrush(Qt::black);
 		p.drawRect(0, 0, width(), height());
 	}
 
-	if(_windowBinFile) {
+	if (_windowBinFile) {
 		QImage letter = _windowBinFile->letter(_currentTable, _letter, _color);
-		if(!letter.isNull()) {
+		if (!letter.isNull()) {
 			p.drawImage(QPoint(0, 0), letter.scaled(QSize(12*PIXEL_SIZE, 12*PIXEL_SIZE), Qt::KeepAspectRatio));
 			int linePos = _windowBinFile->charWidth(_currentTable, _letter) * PIXEL_SIZE;
 			p.setPen(Qt::red);
@@ -99,45 +100,45 @@
 
 bool FontLetter::setPixel(const QPoint &pixel)
 {
-	Q_UNUSED(pixel)
-	//TODO: setPixel
-	/*if(!_windowBinFile)	return false;
+	if (!_windowBinFile)	return false;
 
-	if(pixel.x() >= 0 && pixel.y() >= 0 && pixel.x() < 12 && pixel.y() < 12
+	if (pixel.x() >= 0 && pixel.y() >= 0 && pixel.x() < 12 && pixel.y() < 12
 			&& _windowBinFile->setLetterPixelIndex(_currentTable, _letter, pixel, _pixelIndex)) {
 		update(QRect(pixel * PIXEL_SIZE, QSize(PIXEL_SIZE, PIXEL_SIZE)));
 		emit imageChanged(QRect(pixel, QSize(1, 1)));
 		return true;
-	}*/
+	}
+
 	return false;
 }
 
 void FontLetter::mouseMoveEvent(QMouseEvent *e)
 {
-	if(readOnly || !_windowBinFile)	return;
+	if (readOnly || !_windowBinFile)	return;
 
 	const QPoint &mousePos = e->pos();
 	int linePos = _windowBinFile->charWidth(_currentTable, _letter) * PIXEL_SIZE;
 
-	if(startDrag) {
+	if (startDrag) {
 		int newLinePos = mousePos.x() / PIXEL_SIZE;
-		if(linePos / PIXEL_SIZE != newLinePos && newLinePos < 16) {
+		if (linePos / PIXEL_SIZE != newLinePos && newLinePos < 16) {
 			_windowBinFile->setCharWidth(_currentTable, _letter, newLinePos);
 			update();
+			emit widthEdited(newLinePos);
 		}
-	} else if(startDrag2) {
+	} else if (startDrag2) {
 		setPixel(getPixel(mousePos));
 	} else {
-		if(mousePos.x() >= linePos - 1 && mousePos.x() <= linePos + 1) {
-			if(cursor().shape() != Qt::SplitHCursor) {
+		if (mousePos.x() >= linePos - 1 && mousePos.x() <= linePos + 1) {
+			if (cursor().shape() != Qt::SplitHCursor) {
 				setCursor(Qt::SplitHCursor);
 			}
 		} else {
-			if(mousePos.x() < 12 * PIXEL_SIZE && mousePos.y() < 12 * PIXEL_SIZE) {
-				if(cursor().shape() != Qt::PointingHandCursor) {
+			if (mousePos.x() < 12 * PIXEL_SIZE && mousePos.y() < 12 * PIXEL_SIZE) {
+				if (cursor().shape() != Qt::PointingHandCursor) {
 					setCursor(Qt::PointingHandCursor);
 				}
-			} else if(cursor().shape() != Qt::ArrowCursor) {
+			} else if (cursor().shape() != Qt::ArrowCursor) {
 				setCursor(Qt::ArrowCursor);
 			}
 		}
@@ -146,22 +147,22 @@
 
 void FontLetter::mousePressEvent(QMouseEvent *e)
 {
-	if(readOnly || !_windowBinFile)	return;
+	if (readOnly || !_windowBinFile)	return;
 
 	QPoint pixel = getPixel(e->pos());
 
 	int linePos = _windowBinFile->charWidth(_currentTable, _letter) * PIXEL_SIZE;
 
-	if(e->pos().x() >= linePos - 1 && e->pos().x() <= linePos + 1) {
+	if (e->pos().x() >= linePos - 1 && e->pos().x() <= linePos + 1) {
 		startDrag = true;
-	} else if(setPixel(pixel)) {
+	} else if (setPixel(pixel)) {
 		startDrag2 = true;
 	}
 }
 
 void FontLetter::mouseReleaseEvent(QMouseEvent *)
 {
-	if(readOnly)	return;
+	if (readOnly)	return;
 
 	startDrag = startDrag2 = false;
 }
diff -Nru makoureactor-1.7.2/widgets/FontLetter.h makoureactor-1.8.0/widgets/FontLetter.h
--- makoureactor-1.7.2/widgets/FontLetter.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FontLetter.h	2020-08-08 18:46:56.000000000 +0000
@@ -38,6 +38,7 @@
 	void reset();
 signals:
 	void imageChanged(const QRect &rect);
+	void widthEdited(int width);
 protected:
 	virtual QSize sizeHint() const;
 	virtual QSize minimumSizeHint() const;
diff -Nru makoureactor-1.7.2/widgets/FontManager.cpp makoureactor-1.8.0/widgets/FontManager.cpp
--- makoureactor-1.7.2/widgets/FontManager.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FontManager.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -17,16 +17,144 @@
  ****************************************************************************/
 #include "FontManager.h"
 #include "Data.h"
+#include "core/Config.h"
 
 FontManager::FontManager(QWidget *parent) :
-	QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint)
+      QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint)
 {
 	setWindowTitle(tr("Font Manager"));
+	setSizeGripEnabled(true);
+
+	/* ListWidget *listWidget = new ListWidget(this);
+	plusAction = listWidget->addAction(ListWidget::Add, tr("Add"), this, SLOT(addFont()));
+	minusAction = listWidget->addAction(ListWidget::Rem, tr("Remove"), this, SLOT(removeFont()));
+	toolbar1 = listWidget->toolBar();
+	list1 = listWidget->listWidget(); */
 
 	fontWidget = new FontWidget(this);
 	fontWidget->setWindowBinFile(&Data::windowBin);
 
+	QHBoxLayout *layout = new QHBoxLayout(this);
+	//layout->addWidget(listWidget);
+	layout->addWidget(fontWidget, 1);
+
+	//fillList1();
+	//setFont(list1->currentRow());
+
+	//connect(list1, SIGNAL(currentRowChanged(int)), SLOT(setFont(int)));
+}
+
+void FontManager::fillList1()
+{
+	QString currentEncoding = Config::value("encoding", "00").toString();
+
+	for (const QString &fontName : FF7Font::fontList()) {
+		QListWidgetItem *item;
+
+		if (fontName == "00" || fontName == "01") {
+			item = new QListWidgetItem(fontName == "00" ? tr("Latin") : tr("Japanese"));
+			item->setData(Qt::UserRole, fontName);
+			list1->addItem(item);
+		} else {
+			FF7Font *font = FF7Font::font(fontName);
+			if (font) {
+				item = new QListWidgetItem(font->name());
+				item->setData(Qt::UserRole, fontName);
+				list1->addItem(item);
+			} else {
+				continue;
+			}
+		}
+
+		if (currentEncoding == fontName) {
+			list1->setCurrentItem(item);
+		}
+	}
+}
+
+void FontManager::setFont(int id)
+{
+	QListWidgetItem *item = list1->item(id);
+
+	if (!item)	return;
+
+	QString fontName = item->data(Qt::UserRole).toString();
+
+	FF7Font *font = FF7Font::font(fontName);
+	if (font) {
+		fontWidget->setFF7Font(font);
+	}
+
+	minusAction->setEnabled(!font->isReadOnly());
+}
+
+void FontManager::addFont()
+{
+	QString name, nameId;
+
+	if (newNameDialog(name, nameId)) {
+		if (FF7Font::addFont(nameId, "TODO", name)) {
+			QListWidgetItem *item = new QListWidgetItem(name);
+			item->setData(Qt::UserRole, nameId);
+			list1->addItem(item);
+		}
+	}
+}
+
+bool FontManager::newNameDialog(QString &name, QString &nameId)
+{
+	QDialog dialog(this, Qt::Dialog | Qt::WindowCloseButtonHint);
+
+	QLineEdit *nameEdit = new QLineEdit(&dialog);
+	QLineEdit *fileNameEdit = new QLineEdit(&dialog);
+
+	QPushButton *ok = new QPushButton(tr("OK"));
+	ok->setDefault(true);
+
+	QFormLayout *formLayout = new QFormLayout;
+	formLayout->addRow(tr("&Displayed name:"), nameEdit);
+	formLayout->addRow(tr("&File name:"), fileNameEdit);
+
+	QVBoxLayout *layout = new QVBoxLayout(&dialog);
+	layout->addLayout(formLayout, 1);
+	layout->addWidget(ok, 0, Qt::AlignCenter);
+
+	connect(ok, SIGNAL(clicked()), &dialog, SLOT(accept()));
+
+	if (dialog.exec() == QDialog::Accepted) {
+		QString name1 = nameEdit->text();
+		QString name2 = QDir::cleanPath(fileNameEdit->text());
+
+		QStringList fontList = FF7Font::fontList();
+		if (name1.isEmpty() || name2.isEmpty()
+		    || fontList.contains(name1)
+		    || QFile::exists(FF7Font::fontDirPath()+"/"+name2)) {
+			QMessageBox::warning(this, tr("Choose another name"), tr("This name already exist or is invalid, "
+			                                                         "please choose another."));
+			return false;
+		}
+
+		name = name1;
+		nameId = name2;
+		return true;
+	}
+	return false;
+}
+
+void FontManager::removeFont()
+{
+	QList<QListWidgetItem *> items = list1->selectedItems();
+	if (items.isEmpty())		return;
+
+	if (QMessageBox::Yes != QMessageBox::question(this, tr("Remove font"),
+	                                              tr("Do you want to remove the selected font?"),
+	                                              QMessageBox::Yes | QMessageBox::Cancel)) {
+		return;
+	}
+
+	QListWidgetItem *item = items.first();
 
-	QVBoxLayout *layout = new QVBoxLayout(this);
-	layout->addWidget(fontWidget);
+	if (FF7Font::removeFont(item->data(Qt::UserRole).toString())) {
+		delete item;
+	}
 }
diff -Nru makoureactor-1.7.2/widgets/FontManager.h makoureactor-1.8.0/widgets/FontManager.h
--- makoureactor-1.7.2/widgets/FontManager.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FontManager.h	2020-08-08 18:46:56.000000000 +0000
@@ -20,13 +20,23 @@
 
 #include <QtWidgets>
 #include "FontWidget.h"
+#include "Listwidget.h"
 
 class FontManager : public QDialog
 {
 	Q_OBJECT
 public:
 	explicit FontManager(QWidget *parent=0);
+private slots:
+	void setFont(int id);
+	void addFont();
+	void removeFont();
 private:
+	void fillList1();
+	bool newNameDialog(QString &name, QString &nameId);
+	QToolBar *toolbar1;
+	QAction *plusAction, *minusAction;
+	QListWidget *list1;
 	FontWidget *fontWidget;
 };
 
diff -Nru makoureactor-1.7.2/widgets/FontPalette.cpp makoureactor-1.8.0/widgets/FontPalette.cpp
--- makoureactor-1.7.2/widgets/FontPalette.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FontPalette.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -94,7 +94,7 @@
 
 void FontPalette::reset()
 {
-	if(copyPalette.isEmpty())		return;
+	if (copyPalette.isEmpty())		return;
 	palette = copyPalette;
 	update();
 }
@@ -103,14 +103,14 @@
 {
 	QPainter p(this);
 
-	if(isEnabled()) {
+	if (isEnabled()) {
 		p.fillRect(0, 0, width(), height(), Qt::black);
 	}
 
 	int id=0;
 
-	foreach(const QRgb &color, palette) {
-		if(!readOnly && id == _currentColor) {
+	for (const QRgb &color : qAsConst(palette)) {
+		if (!readOnly && id == _currentColor) {
 			p.fillRect(QRect(id * (CELL_SIZE + BORDER_SIZE), 0, CELL_SIZE + 2 * BORDER_SIZE, CELL_SIZE + 2 * BORDER_SIZE), Qt::red);
 		} else {
 			p.setPen(Qt::black);
@@ -129,7 +129,7 @@
 
 void FontPalette::mousePressEvent(QMouseEvent *e)
 {
-	if(readOnly || palette.isEmpty())	return;
+	if (readOnly || palette.isEmpty())	return;
 
 	setCurrentColor(getColorId(e->pos()));
 }
diff -Nru makoureactor-1.7.2/widgets/FontWidget.cpp makoureactor-1.8.0/widgets/FontWidget.cpp
--- makoureactor-1.7.2/widgets/FontWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FontWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -34,12 +34,14 @@
 
 	selectTable = new QComboBox(this);
 
-	fromImage1 = new QPushButton(tr("From Image..."), this);
+	/* fromImage1 = new QPushButton(tr("From Image..."), this);
 	fromImage1->setVisible(false);//TODO
 	fromImage2 = new QPushButton(tr("From Image..."), this);
-	fromImage2->setVisible(false);//TODO
+	fromImage2->setVisible(false);//TODO */
 //	QPushButton *resetButton1 = new QPushButton(tr("Cancel Changes"), this);//TODO
 	textLetter = new QLineEdit(this);
+	widthLetter = new QSpinBox(this);
+	widthLetter->setRange(0, 15);
 	exportButton = new QPushButton(tr("Export..."), this);
 	importButton = new QPushButton(tr("Import..."), this);
 	resetButton2 = new QPushButton(tr("Cancel Changes"), this);
@@ -47,19 +49,21 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(fontGrid, 0, 0, 1, 2, Qt::AlignRight);
-	layout->addWidget(fontLetter, 0, 2, 2, 2, Qt::AlignLeft);
-	layout->addWidget(fromImage1, 1, 0, 1, 2, Qt::AlignLeft);
+	layout->addWidget(fontLetter, 0, 2, 2, 4, Qt::AlignLeft);
+	//layout->addWidget(fromImage1, 1, 0, 1, 2, Qt::AlignLeft);
 	layout->addWidget(selectPal, 2, 0, Qt::AlignRight);
 	layout->addWidget(selectTable, 2, 1, Qt::AlignLeft);
-	layout->addWidget(fontPalette, 2, 2, 1, 2, Qt::AlignLeft);
-	layout->addWidget(textLetter, 3, 2);
-	layout->addWidget(fromImage2, 3, 3, Qt::AlignRight);
+	layout->addWidget(fontPalette, 2, 2, 1, 4, Qt::AlignLeft);
+	layout->addWidget(new QLabel(tr("Text:")), 3, 2);
+	layout->addWidget(textLetter, 3, 3);
+	layout->addWidget(new QLabel(tr("Width:")), 3, 4);
+	layout->addWidget(widthLetter, 3, 5);
+	//layout->addWidget(fromImage2, 3, 3, Qt::AlignRight);
 //	layout->addWidget(resetButton1, 4, 0, 1, 2, Qt::AlignLeft);
 	layout->addWidget(exportButton, 4, 0, Qt::AlignLeft);
 	layout->addWidget(importButton, 4, 1, Qt::AlignLeft);
-	layout->addWidget(resetButton2, 4, 2, 1, 2, Qt::AlignRight);
+	layout->addWidget(resetButton2, 4, 2, 1, 4, Qt::AlignRight);
 	layout->setRowStretch(5, 1);
-	layout->setColumnStretch(3, 1);
 	layout->setContentsMargins(QMargins());
 
 	connect(selectPal, SIGNAL(currentIndexChanged(int)), SLOT(setColor(int)));
@@ -73,6 +77,8 @@
 	connect(resetButton2, SIGNAL(clicked()), SLOT(resetLetter()));
 	connect(fontPalette, SIGNAL(colorChanged(int)), fontLetter, SLOT(setPixelIndex(int)));
 	connect(textLetter, SIGNAL(textEdited(QString)), SLOT(editLetter(QString)));
+	connect(widthLetter, SIGNAL(valueChanged(int)), SLOT(editWidth(int)));
+	connect(fontLetter, SIGNAL(widthEdited(int)), widthLetter, SLOT(setValue(int)));
 }
 
 void FontWidget::clear()
@@ -96,9 +102,9 @@
 	fontPalette->setWindowBinFile(windowBinFile);
 	setLetter(0);
 
-	if(selectTable->count() != windowBinFile->tableCount()) {
+	if (selectTable->count() != windowBinFile->tableCount()) {
 		selectTable->clear();
-		for(int i=1 ; i<=windowBinFile->tableCount() ; ++i) {
+		for (int i=1; i<=windowBinFile->tableCount(); ++i) {
 			selectTable->addItem(tr("Table %1").arg(i));
 		}
 		selectTable->setEnabled(selectTable->count() > 1);
@@ -110,8 +116,8 @@
 	textLetter->setReadOnly(ro);
 	fontLetter->setReadOnly(ro);
 	fontPalette->setReadOnly(ro);
-	fromImage1->setDisabled(ro);
-	fromImage2->setDisabled(ro);
+	/* fromImage1->setDisabled(ro);
+	fromImage2->setDisabled(ro); */
 }
 
 void FontWidget::setColor(int i)
@@ -135,15 +141,24 @@
 
 	QByteArray ba;
 
-	if(fontGrid->currentTable() >= 1 && fontGrid->currentTable() <= 5) {
+	if (fontGrid->currentTable() >= 1 && fontGrid->currentTable() <= 5) {
 		ba.append(char(0xF9 + fontGrid->currentTable()));
 	}
 
-	if(fontGrid->currentTable() <= 5) {
-		if(ff7Font) {
-//			textLetter->setText(FF7Text(ba.append((char)i), ff7Font->tables()));//TODO: ff7Font
+	if (fontGrid->currentTable() <= 5) {
+		if (ff7Font) {
+			//TODO: ff7Font
+//			textLetter->setText(FF7Text(ba.append((char)i), ff7Font->tables()));
 		} else {
-			textLetter->setText(FF7Text(ba.append((char)i)).text(false));//TODO: jp
+			//TODO: jp
+			textLetter->setText(FF7Text(ba.append((char)i)).text(false));
+		}
+		if (fontLetter->windowBinFile()) {
+			widthLetter->setValue(
+			    fontLetter->windowBinFile()->charWidth(
+			        fontLetter->currentTable(), i
+			    )
+			);
 		}
 	}
 	resetButton2->setEnabled(false);
@@ -151,8 +166,18 @@
 
 void FontWidget::editLetter(const QString &letter)
 {
-	if(ff7Font) {
-		ff7Font->setChar(fontGrid->currentTable(), fontGrid->currentLetter(), letter);
+	if (ff7Font) {
+		ff7Font->setChar(
+		    fontGrid->currentTable(), fontGrid->currentLetter(), letter
+		);
+	}
+}
+
+void FontWidget::editWidth(int w)
+{
+	if (fontLetter->windowBinFile() && fontLetter->windowBinFile()->charWidth(fontGrid->currentTable(), fontGrid->currentLetter()) != w) {
+		fontLetter->windowBinFile()->setCharWidth(fontGrid->currentTable(), fontGrid->currentLetter(), w);
+		fontLetter->update();
 	}
 }
 
@@ -160,46 +185,45 @@
 {
 	WindowBinFile *windowBinFile = fontGrid->windowBinFile();
 
-	QString binF, tdwF, txtF, pngF, jpgF, bmpF;
+	QString binF, txtF, pngF, jpgF, bmpF;
 	QStringList filter;
-	if(windowBinFile) {
+	if (windowBinFile) {
 		filter.append(binF = tr("FF7 font file (*.bin)"));
-		filter.append(tdwF = tr("FF8 font file (*.tdw)"));
+		//filter.append(tdwF = tr("FF8 font file (*.tdw)"));
 		filter.append(pngF = tr("Image File (*.png)"));
-		filter.append(jpgF = tr("Image File (*.jpg))"));
+		filter.append(jpgF = tr("Image File (*.jpg)"));
 		filter.append(bmpF = tr("Image File (*.bmp)"));
 	}
 
-	if(ff7Font) {
+	if (ff7Font) {
 		filter.append(txtF = tr("Translation file %1 (*.txt)").arg(PROG_NAME));
 	}
 	QString selectedFilter;
 
-	QString path = QFileDialog::getSaveFileName(this, tr("Export font"), "sysfnt", filter.join(";;"), &selectedFilter);
-	if(path.isNull()) {
+	QString path = QFileDialog::getSaveFileName(this, tr("Export font"), "window", filter.join(";;"), &selectedFilter);
+	if (path.isNull()) {
 		return;
 	}
 
-	if(selectedFilter == binF) {
-		/*QByteArray data;
-		//TODO
-		if(windowBinFile->save(data)) {
+	if (selectedFilter == binF) {
+		QByteArray data;
+		if (windowBinFile->save(data)) {
 			QFile f(path);
-			if(f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+			if (f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 				f.write(data);
 				f.close();
 			} else {
-				QMessageBox::warning(this, tr("Erreur"), tr("Erreur d'ouverture du fichier. (%1)").arg(f.errorString()));
+				QMessageBox::warning(this, tr("Error"), tr("Error opening file (%1)").arg(f.errorString()));
 			}
 		} else {
-			QMessageBox::warning(this, tr("Erreur"), tr("Erreur lors de l'enregistrement."));
-		}*/
-	} else if(selectedFilter == tdwF) {
-		/*QByteArray data;
-		//TODO
-		if(windowBinFile->save(data)) {
+			QMessageBox::warning(this, tr("Error"), tr("Error saving file"));
+		}
+	} /* else if (selectedFilter == tdwF) {
+		// TODO: tdw
+		QByteArray data;
+		if (windowBinFile->save(data)) {
 			QFile f(path);
-			if(f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+			if (f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 				f.write(data);
 				f.close();
 			} else {
@@ -207,24 +231,24 @@
 			}
 		} else {
 			QMessageBox::warning(this, tr("Erreur"), tr("Erreur lors de l'enregistrement."));
-		}*/
-	} else if(selectedFilter == txtF) {
+		}
+	} */ else if (selectedFilter == txtF) {
 		QString data = ff7Font->saveTxt();
 		QFile f(path);
-		if(f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+		if (f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 			f.write(data.toUtf8());
 			f.close();
 		} else {
 			QMessageBox::warning(this, tr("Error"), tr("Error opening file (%1)").arg(f.errorString()));
 		}
-	} else if(windowBinFile &&
+	} else if (windowBinFile &&
 	          (selectedFilter == pngF ||
 	           selectedFilter == jpgF ||
 	           selectedFilter == bmpF)) {
 		char *format;
-		if(selectedFilter == pngF) {
+		if (selectedFilter == pngF) {
 			format = (char *)"PNG";
-		} else if(selectedFilter == jpgF) {
+		} else if (selectedFilter == jpgF) {
 			format = (char *)"JPG";
 		} else {
 			format = (char *)"BMP";
@@ -237,21 +261,21 @@
 {
 	WindowBinFile *windowBinFile = fontGrid->windowBinFile();
 
-	QString tdwF;
+	QString binF;
 	QStringList filter;
-	if(windowBinFile) {
-		filter.append(tdwF = tr("FF8 font file (*.tdw)"));
+	if (windowBinFile) {
+		filter.append(binF = tr("FF7 font file (*.bin)"));
 	}
 	QString selectedFilter;
 
-	QString path = QFileDialog::getOpenFileName(this, tr("Import font"), "sysfnt", filter.join(";;"), &selectedFilter);
-	if(path.isNull())		return;
+	QString path = QFileDialog::getOpenFileName(this, tr("Import font"), "window", filter.join(";;"), &selectedFilter);
+	if (path.isNull())		return;
 
-	if(selectedFilter == tdwF) {
+	if (selectedFilter == binF) {
 		QFile f(path);
-		if(f.open(QIODevice::ReadOnly)) {
+		if (f.open(QIODevice::ReadOnly)) {
 			WindowBinFile newWindowBinFile;
-			if(newWindowBinFile.open(f.readAll())) {
+			if (newWindowBinFile.open(f.readAll())) {
 				newWindowBinFile.setModified(true);
 				*windowBinFile = newWindowBinFile;
 				// FIXME: Update Data::windowBin?
diff -Nru makoureactor-1.7.2/widgets/FontWidget.h makoureactor-1.8.0/widgets/FontWidget.h
--- makoureactor-1.7.2/widgets/FontWidget.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FontWidget.h	2020-08-08 18:46:56.000000000 +0000
@@ -40,6 +40,7 @@
 	void setTable(int i);
 	void setLetter(int i);
 	void editLetter(const QString &letter);
+	void editWidth(int w);
 	void exportFont();
 	void importFont();
 	void reset();
@@ -54,6 +55,7 @@
 	QComboBox *selectPal, *selectTable;
 	QPushButton *fromImage1, *fromImage2;
 	QLineEdit *textLetter;
+	QSpinBox *widthLetter;
 	QPushButton *resetButton2;
 	FF7Font *ff7Font;
 protected:
diff -Nru makoureactor-1.7.2/widgets/FormatSelectionWidget.cpp makoureactor-1.8.0/widgets/FormatSelectionWidget.cpp
--- makoureactor-1.7.2/widgets/FormatSelectionWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/FormatSelectionWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -39,7 +39,7 @@
 void FormatSelectionWidget::setCurrentFormat(const QString &f)
 {
 	int index = extensions.indexOf(f);
-	if(index != -1) {
+	if (index != -1) {
 		format->setCurrentIndex(index);
 	}
 }
@@ -56,19 +56,19 @@
 	int size = qMin(formats.size(), format->count());
 	QString ext;
 
-	for(int i=0 ; i<size ; ++i) {
+	for (int i=0; i<size; ++i) {
 		const QString &f = formats.at(i);
 		format->setItemText(i, splitFormatString(f, ext));
 		extensions.replace(i, ext);
 	}
 
-	if(formats.size() < format->count()) {
-		for(int i=format->count()-1 ; i>=formats.size() ; --i) {
+	if (formats.size() < format->count()) {
+		for (int i=format->count()-1; i>=formats.size(); --i) {
 			format->removeItem(i);
 			extensions.removeAt(i);
 		}
-	} else if(formats.size() > format->count()) {
-		for(int i=format->count() ; i<formats.size() ; ++i) {
+	} else if (formats.size() > format->count()) {
+		for (int i=format->count(); i<formats.size(); ++i) {
 			const QString &f = formats.at(i);
 			format->addItem(splitFormatString(f, ext));
 			extensions.append(ext);
@@ -82,7 +82,7 @@
 {
 	QStringList formats;
 
-	for(int i=0 ; i<format->count() ; ++i) {
+	for (int i=0; i<format->count(); ++i) {
 		formats.append(format->itemText(i));
 	}
 
diff -Nru makoureactor-1.7.2/widgets/GrpScriptList.cpp makoureactor-1.8.0/widgets/GrpScriptList.cpp
--- makoureactor-1.7.2/widgets/GrpScriptList.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/GrpScriptList.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -66,6 +66,7 @@
 	down_A->setEnabled(false);
 
 	connect(this, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), SLOT(rename(QTreeWidgetItem *, int)));
+	connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), SLOT(evidence(QTreeWidgetItem*,QTreeWidgetItem*)));
 	connect(this, SIGNAL(itemSelectionChanged()), SLOT(upDownEnabled()));
 
 	connect(rename_A, SIGNAL(triggered()), SLOT(rename()));
@@ -104,6 +105,9 @@
 	_toolBar->addAction(down_A);
 	down_A->setStatusTip(tr("Down"));
 
+	_helpWidget = new HelpWidget(32, HelpWidget::IconWarning, this);
+	_helpWidget->hide();
+
 	enableActions(false);
 
 	setMinimumWidth(_toolBar->sizeHint().width());
@@ -114,6 +118,23 @@
 	qDeleteAll(grpScriptCopied);
 }
 
+void GrpScriptList::evidence(QTreeWidgetItem *current, QTreeWidgetItem *previous)
+{
+	if (current) {
+		QColor color = Data::color(Data::ColorEvidence);
+		qDebug() << color;
+		current->setBackground(0, color);
+		current->setBackground(1, color);
+		current->setBackground(2, color);
+	}
+
+	if (previous) {
+		previous->setBackground(0, QBrush());
+		previous->setBackground(1, QBrush());
+		previous->setBackground(2, QBrush());
+	}
+}
+
 void GrpScriptList::setEnabled(bool enabled)
 {
 	QTreeWidget::setEnabled(enabled);
@@ -124,10 +145,10 @@
 GrpScript *GrpScriptList::currentGrpScript()
 {
 	int grpScriptID = selectedID();
-	if(grpScriptID != -1) {
+	if (grpScriptID != -1) {
 		return scripts->grpScript(grpScriptID);
 	}
-	return NULL;
+	return nullptr;
 }
 
 void GrpScriptList::enableActions(bool enabled)
@@ -138,7 +159,7 @@
 
 void GrpScriptList::upDownEnabled()
 {
-	if(selectedItems().isEmpty()) {
+	if (selectedItems().isEmpty()) {
 		actions().at(DelAction)->setEnabled(false);
 		actions().at(CutAction)->setEnabled(false);
 		actions().at(CopyAction)->setEnabled(false);
@@ -155,23 +176,23 @@
 
 void GrpScriptList::fill(Section1File *scripts)
 {
-	if(scripts) {
+	if (scripts) {
 		this->scripts = scripts;
 	}
 	clear();
 
 	int i=0;
-	foreach(GrpScript *grpScript, this->scripts->grpScripts()) {
+	for (GrpScript *grpScript : this->scripts->grpScripts()) {
 		QTreeWidgetItem *item = new QTreeWidgetItem(this, QStringList() << QString("%1").arg(i++, 3) << grpScript->name() << grpScript->type());
 		item->setForeground(2, QBrush(grpScript->typeColor()));
 		item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 		item->setToolTip(0, grpScript->type());
 		QIcon icon;
 
-		if(grpScript->character() >= 0 && grpScript->character() < 9) {
+		if (grpScript->character() >= 0 && grpScript->character() < 9) {
 			icon = QIcon(QString(":/images/icon-char-%1.png").arg(grpScript->character()));
 		} else {
-			switch(grpScript->typeID()) {
+			switch (grpScript->typeID()) {
 			case GrpScript::Director:
 				icon = QIcon(":/images/main.png");
 				break;
@@ -192,7 +213,7 @@
 			}
 		}
 
-		if(!icon.isNull()) {
+		if (!icon.isNull()) {
 			item->setIcon(0, icon);
 		}
 	}
@@ -200,9 +221,11 @@
 	resizeColumnToContents(0);
 	resizeColumnToContents(1);
 
+	updateHelpWidget();
+
 	setMinimumWidth(columnWidth(0) +
 	                columnWidth(1) +
-	                fontMetrics().width("WWWWWWWW"));
+	                fontMetrics().boundingRect("WWWWWWWW").width());
 
 	actions().at(RenameAction)->setEnabled(true);
 	actions().at(AddAction)->setEnabled(topLevelItemCount() < 256);
@@ -213,16 +236,38 @@
 {
 	int grpScriptID = selectedID();
 	QTreeWidgetItem *currentItem = this->currentItem();
-	if(grpScriptID != -1 && currentItem != NULL) {
+	if (grpScriptID != -1 && currentItem != nullptr) {
 		GrpScript *currentGrpScript = scripts->grpScript(grpScriptID);
 		currentItem->setText(2, currentGrpScript->type());
 		currentItem->setForeground(2, currentGrpScript->typeColor());
+
+		updateHelpWidget();
+	}
+}
+
+void GrpScriptList::updateHelpWidget()
+{
+	_helpWidget->hide();
+	QStringList texts;
+
+	if (scripts->modelCount() > 16) {
+		_helpWidget->show();
+		texts.append(tr("You have more than 16 models in this field, "
+		                                  "the game may crash."));
+	}
+
+	if (scripts->grpScriptCount() > 48) {
+		_helpWidget->show();
+		texts.append(tr("You have more than 48 groups in this field, "
+		                                  "the game may crash."));
 	}
+
+	_helpWidget->setText(texts.join("\n"));
 }
 
 void GrpScriptList::rename(QTreeWidgetItem *item, int column)
 {
-	if(item==NULL || column != 1) {
+	if (item==nullptr || column != 1) {
 		return;
 	}
 	item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
@@ -233,7 +278,7 @@
 
 void GrpScriptList::renameOK(QTreeWidgetItem *item, int column)
 {
-	if(column != 1) {
+	if (column != 1) {
 		return;
 	}
 	disconnect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(renameOK(QTreeWidgetItem *, int)));
@@ -245,7 +290,7 @@
 
 void GrpScriptList::add()
 {
-	if(topLevelItemCount() > scripts->maxGrpScriptCount()) {
+	if (topLevelItemCount() > scripts->maxGrpScriptCount()) {
 		return;
 	}
 
@@ -260,15 +305,15 @@
 
 void GrpScriptList::del(bool totalDel)
 {
-	if(topLevelItemCount() == 0) {
+	if (topLevelItemCount() == 0) {
 		return;
 	}
 	QList<int> selectedIDs = this->selectedIDs();
-	if(selectedIDs.isEmpty()) {
+	if (selectedIDs.isEmpty()) {
 		return;
 	}
 
-	if(totalDel && QMessageBox::warning(this, tr("Delete"), tr("Are you sure you want to remove %1?\n"
+	if (totalDel && QMessageBox::warning(this, tr("Delete"), tr("Are you sure you want to remove %1?\n"
 	                                                           "Some scripts can refer to it!")
 	                                    .arg(selectedIDs.size()==1 ?
 	                                         tr("the group selected") :
@@ -277,8 +322,8 @@
 		return;
 	}
 
-	qSort(selectedIDs);
-	for(int i = selectedIDs.size()-1 ; i >= 0 ; --i) {
+	std::sort(selectedIDs.begin(), selectedIDs.end());
+	for (int i = selectedIDs.size()-1; i >= 0; --i) {
 		totalDel ? scripts->deleteGrpScript(selectedIDs.at(i)) : scripts->removeGrpScript(selectedIDs.at(i));
 	}
 
@@ -288,10 +333,10 @@
 
 	emit changed();
 
-	if(topLevelItemCount() != 0) {
-		if(selectedIDs.at(0) >= topLevelItemCount() && selectedIDs.at(0) > 0) {
+	if (topLevelItemCount() != 0) {
+		if (selectedIDs.at(0) >= topLevelItemCount() && selectedIDs.at(0) > 0) {
 			scroll(selectedIDs.at(0)-1);
-		} else if(selectedIDs.at(0) < topLevelItemCount()) {
+		} else if (selectedIDs.at(0) < topLevelItemCount()) {
 			scroll(selectedIDs.at(0));
 		}
 	}
@@ -306,12 +351,12 @@
 void GrpScriptList::copy()
 {
 	QList<int> selectedIDs = this->selectedIDs();
-	if(selectedIDs.isEmpty()) {
+	if (selectedIDs.isEmpty()) {
 		return;
 	}
 
 	clearCopiedGroups();
-	foreach(const int &id, selectedIDs) {
+	for (const int &id : qAsConst(selectedIDs)) {
 		grpScriptCopied.append(new GrpScript(*scripts->grpScript(id)));
 	}
 
@@ -320,15 +365,15 @@
 
 void GrpScriptList::paste()
 {
-	if(grpScriptCopied.isEmpty()) {
+	if (grpScriptCopied.isEmpty()) {
 		return;
 	}
 	int grpScriptID = selectedID() + 1;
-	if(grpScriptID == 0) {
+	if (grpScriptID == 0) {
 		grpScriptID = topLevelItemCount(); // Last position
 	}
 	int i = grpScriptID;
-	foreach(GrpScript *GScopied, grpScriptCopied) {
+	for (GrpScript *GScopied : qAsConst(grpScriptCopied)) {
 		scripts->insertGrpScript(i++, new GrpScript(*GScopied));
 	}
 
@@ -347,10 +392,10 @@
 void GrpScriptList::move(bool direction)
 {
 	int grpScriptID = selectedID();
-	if(grpScriptID == -1) {
+	if (grpScriptID == -1) {
 		return;
 	}
-	if(scripts->moveGrpScript(grpScriptID, direction)) {
+	if (scripts->moveGrpScript(grpScriptID, direction)) {
 		fill();
 		scroll(direction ? grpScriptID+1 : grpScriptID-1);
 		emit changed();
@@ -361,13 +406,16 @@
 
 void GrpScriptList::scroll(int id, bool focus)
 {
-	QTreeWidgetItem *item = findItem(id);
-	if(!item) {
-		return;
+	if (selectedID() != id) {
+		QTreeWidgetItem *item = findItem(id);
+		if (!item) {
+			return;
+		}
+		setCurrentItem(item);
+		scrollToItem(item, QAbstractItemView::PositionAtTop);
 	}
-	setCurrentItem(item);
-	scrollToItem(item, QAbstractItemView::PositionAtTop);
-	if(focus) {
+
+	if (focus) {
 		setFocus();
 	}
 }
@@ -375,15 +423,15 @@
 QTreeWidgetItem *GrpScriptList::findItem(int id)
 {
 	QList<QTreeWidgetItem *> items = findItems(QString("%1").arg(id, 3), Qt::MatchExactly);
-	if(items.isEmpty()) {
-		return NULL;
+	if (items.isEmpty()) {
+		return nullptr;
 	}
 	return items.first();
 }
 
 int GrpScriptList::selectedID()
 {
-	if(!currentItem() || currentItem()->text(0).isEmpty()) {
+	if (!currentItem() || currentItem()->text(0).isEmpty()) {
 		return -1;
 	}
 	return currentItem()->text(0).toInt();
@@ -393,7 +441,7 @@
 {
 	QList<int> list;
 
-	foreach(QTreeWidgetItem *item, selectedItems()) {
+	for (QTreeWidgetItem *item : selectedItems()) {
 		list.append(item->text(0).toInt());
 	}
 
diff -Nru makoureactor-1.7.2/widgets/GrpScriptList.h makoureactor-1.8.0/widgets/GrpScriptList.h
--- makoureactor-1.7.2/widgets/GrpScriptList.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/GrpScriptList.h	2020-08-08 18:46:56.000000000 +0000
@@ -20,6 +20,7 @@
 
 #include <QtWidgets>
 #include "core/field/Section1File.h"
+#include "widgets/HelpWidget.h"
 
 class GrpScriptList : public QTreeWidget
 {
@@ -31,18 +32,22 @@
 	GrpScript *currentGrpScript();
 	int selectedID();
 
-	inline QToolBar *toolBar() {
+	inline QToolBar *toolBar() const {
 		return _toolBar;
 	}
+	inline HelpWidget *helpWidget() const {
+		return _helpWidget;
+	}
 	void clearCopiedGroups();
-	void setEnabled(bool);
+	void setEnabled(bool enabled);
 
 	void fill(Section1File *scripts=0);
 	void localeRefresh();
 	void scroll(int, bool focus=true);
-	void enableActions(bool);
+	void enableActions(bool enabled);
 
 private slots:
+	void evidence(QTreeWidgetItem *current, QTreeWidgetItem *previous);
 	inline void rename() {
 		rename(currentItem(), 1);
 	}
@@ -76,11 +81,13 @@
 		DownAction = 9
 	};
 
+	void updateHelpWidget();
 	void move(bool direction);
 	QTreeWidgetItem *findItem(int id);
 	QList<int> selectedIDs();
 
 	QToolBar *_toolBar;
+	HelpWidget *_helpWidget;
 
 	Section1File *scripts;
 	QList<GrpScript *> grpScriptCopied;
diff -Nru makoureactor-1.7.2/widgets/HelpWidget.cpp makoureactor-1.8.0/widgets/HelpWidget.cpp
--- makoureactor-1.7.2/widgets/HelpWidget.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/HelpWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,65 @@
+/****************************************************************************
+ ** Hyne Final Fantasy VIII Save Editor
+ ** Copyright (C) 2013 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#include "HelpWidget.h"
+
+HelpWidget::HelpWidget(int iconExtent, const QString &text, IconType icon, QWidget *parent) :
+    QWidget(parent)
+{
+	createLayout(iconExtent, text, icon);
+}
+
+HelpWidget::HelpWidget(int iconExtent, const QString &text, QWidget *parent) :
+	QWidget(parent)
+{
+	createLayout(iconExtent, text);
+}
+
+HelpWidget::HelpWidget(int iconExtent, IconType icon, QWidget *parent) :
+    QWidget(parent)
+{
+	createLayout(iconExtent, QString(), icon);
+}
+
+HelpWidget::HelpWidget(int iconExtent, QWidget *parent) :
+	QWidget(parent)
+{
+	createLayout(iconExtent, QString());
+}
+
+void HelpWidget::createLayout(int iconExtent, const QString &text, IconType icon)
+{
+	textLabel = new QLabel(text, this);
+	textLabel->setWordWrap(true);
+	QLabel *infoIcon = new QLabel(this);
+	infoIcon->setPixmap(QApplication::style()->standardIcon(icon == IconInfo ? QStyle::SP_MessageBoxInformation : QStyle::SP_MessageBoxWarning)
+						.pixmap(iconExtent));
+	QHBoxLayout *infoLayout = new QHBoxLayout(this);
+	infoLayout->addWidget(infoIcon);
+	infoLayout->addWidget(textLabel, 1);
+	infoLayout->setContentsMargins(QMargins());
+}
+
+QString HelpWidget::text() const
+{
+	return textLabel->text();
+}
+
+void HelpWidget::setText(const QString &text)
+{
+	textLabel->setText(text);
+}
diff -Nru makoureactor-1.7.2/widgets/HelpWidget.h makoureactor-1.8.0/widgets/HelpWidget.h
--- makoureactor-1.7.2/widgets/HelpWidget.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/HelpWidget.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,43 @@
+/****************************************************************************
+ ** Hyne Final Fantasy VIII Save Editor
+ ** Copyright (C) 2013 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#ifndef HELPWIDGET_H
+#define HELPWIDGET_H
+
+#include <QtWidgets>
+
+class HelpWidget : public QWidget
+{
+	Q_OBJECT
+public:
+	enum IconType {
+		IconInfo,
+		IconWarning
+	};
+
+	HelpWidget(int iconExtent, const QString &text, IconType icon, QWidget *parent=0);
+	HelpWidget(int iconExtent, const QString &text, QWidget *parent=0);
+	HelpWidget(int iconExtent, IconType icon, QWidget *parent=0);
+	explicit HelpWidget(int iconExtent, QWidget *parent=0);
+	QString text() const;
+	void setText(const QString &text);
+private:
+	void createLayout(int iconExtent, const QString &text, IconType icon = IconInfo);
+	QLabel *textLabel;
+};
+
+#endif // HELPWIDGET_H
diff -Nru makoureactor-1.7.2/widgets/HexLineEdit.cpp makoureactor-1.8.0/widgets/HexLineEdit.cpp
--- makoureactor-1.7.2/widgets/HexLineEdit.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/HexLineEdit.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -46,7 +46,7 @@
 
 void HexLineEdit::emitDataEdited()
 {
-	if(_noEmit)		return;
+	if (_noEmit)		return;
 
 	emit dataEdited(data());
 }
diff -Nru makoureactor-1.7.2/widgets/ImportDialog.cpp makoureactor-1.8.0/widgets/ImportDialog.cpp
--- makoureactor-1.7.2/widgets/ImportDialog.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ImportDialog.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -32,7 +32,8 @@
 	model = new QCheckBox(tr("Model loader"));
 	mim = new QCheckBox(tr("Background"));
 
-	model->setEnabled(sourceSameTypeAsTarget);
+	model->setEnabled((isDat && !sourceSameTypeAsTarget) ||
+	                  (!isDat && sourceSameTypeAsTarget));
 	mim->setEnabled((isDat && !sourceSameTypeAsTarget) ||
 					(!isDat && sourceSameTypeAsTarget));
 
@@ -45,27 +46,46 @@
 	model->setChecked(model->isEnabled());
 	mim->setChecked(mim->isEnabled());
 
-	if(isDat) {
-		model->setVisible(false);
+	if (isDat) {
+		if (sourceSameTypeAsTarget) {
+			model->setVisible(false);
+		} else {
+			model->setText(model->text() + tr(" (partial: models and animations are not linked properly)"));
+			mim->setText(mim->text() + tr(" (partial: Z-depth might be a little broken)"));
+		}
 	}
 
-	pathEdit = new QLineEdit;
-	QPushButton *changePathButton = new QPushButton(tr("Change"));
+	pathEditMim = new QLineEdit;
+	QPushButton *changePathButtonMim = new QPushButton(tr("Change"));
 
-	pathWidget = new QWidget;
-	QHBoxLayout *layoutPath = new QHBoxLayout(pathWidget);
+	pathWidgetMim = new QWidget;
+	QHBoxLayout *layoutPath = new QHBoxLayout(pathWidgetMim);
 	layoutPath->addWidget(new QLabel(tr("MIM file:")));
-	layoutPath->addWidget(pathEdit);
-	layoutPath->addWidget(changePathButton);
+	layoutPath->addWidget(pathEditMim);
+	layoutPath->addWidget(changePathButtonMim);
 	layoutPath->setContentsMargins(QMargins());
 
-	if(isDat) {
-		pathWidget->setEnabled(mim->isChecked());
+	pathEditBsx = new QLineEdit;
+	QPushButton *changePathButtonBsx = new QPushButton(tr("Change"));
+
+	pathWidgetBsx = new QWidget;
+	QHBoxLayout *layoutPathBsx = new QHBoxLayout(pathWidgetBsx);
+	layoutPathBsx->addWidget(new QLabel(tr("BSX file:")));
+	layoutPathBsx->addWidget(pathEditBsx);
+	layoutPathBsx->addWidget(changePathButtonBsx);
+	layoutPathBsx->setContentsMargins(QMargins());
+
+	if (isDat) {
+		pathWidgetMim->setEnabled(mim->isChecked());
+		pathWidgetBsx->setEnabled(model->isChecked());
 		int index = path.lastIndexOf(".");
-		pathEdit->setText(index > -1 ? (path.left(index + 1) + "MIM")
-									 : path);
+		pathEditMim->setText(index > -1 ? (path.left(index + 1) + "MIM")
+		                             : path);
+		pathEditBsx->setText(index > -1 ? (path.left(index + 1) + "BSX")
+		                                : path);
 	} else {
-		pathWidget->hide();
+		pathWidgetMim->hide();
+		pathWidgetBsx->hide();
 	}
 
 	QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal);
@@ -78,8 +98,9 @@
 	layout->addWidget(encounter);
 	layout->addWidget(inf);
 	layout->addWidget(model);
+	layout->addWidget(pathWidgetBsx);
 	layout->addWidget(mim);
-	layout->addWidget(pathWidget);
+	layout->addWidget(pathWidgetMim);
 	layout->addStretch();
 
 	layout = new QVBoxLayout(this);
@@ -89,37 +110,56 @@
 
 	connect(buttonBox, SIGNAL(accepted()), SLOT(accept()));
 	connect(buttonBox, SIGNAL(rejected()), SLOT(reject()));
-	connect(changePathButton, SIGNAL(clicked()), SLOT(setAdditionalPathByUser()));
-	connect(mim, SIGNAL(toggled(bool)), pathWidget, SLOT(setEnabled(bool)));
+	connect(changePathButtonMim, SIGNAL(clicked()), SLOT(setMimPathByUser()));
+	connect(changePathButtonBsx, SIGNAL(clicked()), SLOT(setBsxPathByUser()));
+	connect(mim, SIGNAL(toggled(bool)), pathWidgetMim, SLOT(setEnabled(bool)));
+	connect(model, SIGNAL(toggled(bool)), pathWidgetBsx, SLOT(setEnabled(bool)));
 }
 
 Field::FieldSections ImportDialog::parts() const
 {
 	Field::FieldSections parts;
 
-	if(scripts->isChecked())	parts |= Field::Scripts;
-	if(akaos->isChecked())		parts |= Field::Akaos;
-	if(ca->isChecked())			parts |= Field::Camera;
-	if(id->isChecked())			parts |= Field::Walkmesh;
-	if(encounter->isChecked())	parts |= Field::Encounter;
-	if(inf->isChecked())		parts |= Field::Inf;
-	if(model->isChecked())		parts |= Field::ModelLoader;
-	if(mim->isChecked())		parts |= Field::Background;
+	if (scripts->isChecked())	parts |= Field::Scripts;
+	if (akaos->isChecked())		parts |= Field::Akaos;
+	if (ca->isChecked())			parts |= Field::Camera;
+	if (id->isChecked())			parts |= Field::Walkmesh;
+	if (encounter->isChecked())	parts |= Field::Encounter;
+	if (inf->isChecked())		parts |= Field::Inf;
+	if (model->isChecked())		parts |= Field::ModelLoader;
+	if (mim->isChecked())		parts |= Field::Background;
 
 	return parts;
 }
 
-QString ImportDialog::additionalPath() const
+QString ImportDialog::bsxPath() const
+{
+	return pathEditBsx->text();
+}
+
+QString ImportDialog::mimPath() const
+{
+	return pathEditMim->text();
+}
+
+void ImportDialog::setBsxPathByUser()
 {
-	return pathEdit->text();
+	QString path = QFileDialog::getOpenFileName(this, tr("Select the associated BSX file"), pathEditBsx->text(),
+	                                            tr("BSX File (*.BSX);;All Files (*)"));
+	if (path.isNull()) {
+		return;
+	}
+
+	pathEditBsx->setText(path);
 }
 
-void ImportDialog::setAdditionalPathByUser()
+void ImportDialog::setMimPathByUser()
 {
-	QString path = QFileDialog::getOpenFileName(this, tr("Select the associated MIM file"), pathEdit->text(), tr("MIM File (*.MIM);;All Files(*)"));
-	if(path.isNull()) {
+	QString path = QFileDialog::getOpenFileName(this, tr("Select the associated MIM file"), pathEditMim->text(),
+	                                            tr("MIM File (*.MIM);;All Files (*)"));
+	if (path.isNull()) {
 		return;
 	}
 
-	pathEdit->setText(path);
+	pathEditMim->setText(path);
 }
diff -Nru makoureactor-1.7.2/widgets/ImportDialog.h makoureactor-1.8.0/widgets/ImportDialog.h
--- makoureactor-1.7.2/widgets/ImportDialog.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ImportDialog.h	2020-08-08 18:46:56.000000000 +0000
@@ -27,9 +27,11 @@
 public:
 	explicit ImportDialog(bool sourceSameTypeAsTarget, bool isDat, const QString &path, QWidget *parent=0);
 	Field::FieldSections parts() const;
-	QString additionalPath() const;
+	QString bsxPath() const;
+	QString mimPath() const;
 private slots:
-	void setAdditionalPathByUser();
+	void setBsxPathByUser();
+	void setMimPathByUser();
 private:
 	QCheckBox *scripts;
 	QCheckBox *akaos;
@@ -39,8 +41,8 @@
 	QCheckBox *inf;
 	QCheckBox *model;
 	QCheckBox *mim;
-	QWidget *pathWidget;
-	QLineEdit *pathEdit;
+	QWidget *pathWidgetMim, *pathWidgetBsx;
+	QLineEdit *pathEditMim, *pathEditBsx;
 };
 
 #endif // IMPORTDIALOG_H
diff -Nru makoureactor-1.7.2/widgets/KeyEditorDialog.cpp makoureactor-1.8.0/widgets/KeyEditorDialog.cpp
--- makoureactor-1.7.2/widgets/KeyEditorDialog.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/KeyEditorDialog.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -25,7 +25,7 @@
 	QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
 	QVBoxLayout *layout = new QVBoxLayout(this);
 
-	for(int i=0 ; i<Data::key_names.size() ; ++i) {
+	for (int i=0; i<Data::key_names.size(); ++i) {
 		QCheckBox *checkBox = new QCheckBox(Data::key_names.at(i), this);
 		checkBox->setCheckState(((value >> i) & 1) ? Qt::Checked : Qt::Unchecked);
 		layout->addWidget(checkBox);
@@ -41,9 +41,9 @@
 	QList<QCheckBox *> all = this->findChildren<QCheckBox *>();
 	quint16 result = 0;
 	
-	for(int i=0 ; i<all.size() ; ++i)
+	for (int i=0; i<all.size(); ++i)
 	{
-		if(all.at(i)->checkState() == Qt::Checked)
+		if (all.at(i)->checkState() == Qt::Checked)
 		{
 			result |= 1 << i;
 		}
diff -Nru makoureactor-1.7.2/widgets/LgpDialog.cpp makoureactor-1.8.0/widgets/LgpDialog.cpp
--- makoureactor-1.7.2/widgets/LgpDialog.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/LgpDialog.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1009 +0,0 @@
-/****************************************************************************
- ** Makou Reactor Final Fantasy VII Field Script Editor
- ** Copyright (C) 2009-2012 Arzel Jérôme <myst6re@gmail.com>
- **
- ** This program is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** This program is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ****************************************************************************/
-#include "LgpDialog.h"
-#include "core/Config.h"
-#include "Parameters.h"
-
-IconThread::IconThread(QObject *parent) :
-	QThread(parent), abort(false)
-{
-}
-
-IconThread::~IconThread()
-{
-	QMutexLocker locker(&mutexFiles);
-	abort = true;
-	hasFilesCondition.wakeOne();
-	locker.unlock();
-	wait();
-}
-
-void IconThread::clear()
-{
-	QMutexLocker locker(&mutexFiles);
-	_files.clear();
-}
-
-void IconThread::addFile(const QString &filePath)
-{
-	QMutexLocker locker(&mutexFiles);
-	_files.enqueue(filePath);
-	hasFilesCondition.wakeAll();
-}
-
-void IconThread::run()
-{
-	forever {
-		QMutexLocker locker(&mutexFiles);
-		if(abort) {
-			return;
-		}
-		qDebug() << "IconThread::run()";
-		if(_files.isEmpty()) {
-			hasFilesCondition.wait(&mutexFiles);
-		}
-		QString path = _files.dequeue();
-		qDebug() << "IconThread::run() treat path" << path;
-		locker.unlock();
-
-		int index = path.lastIndexOf('.');
-		if(index != -1) {
-			QString type = path.mid(index + 1);
-
-			if(cacheIcon.contains(type)) {
-				emit iconLoaded(path, cacheIcon.value(type));
-			} else {
-				QFile tmp(QDir::tempPath() % "/" % PROG_NAME % "." % type);
-				if(tmp.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
-					QIcon icon = QFileIconProvider().icon(QFileInfo(tmp));
-					tmp.remove();
-
-					cacheIcon.insert(type, icon);
-
-					emit iconLoaded(path, icon);
-				} else {
-					qWarning() << "IconThread::run() cannot create tmp file" << tmp.fileName() << tmp.errorString();
-				}
-			}
-		}
-	}
-}
-
-LgpDirectoryItem *LgpItem::root()
-{
-	LgpItem *current = this;
-	while(current->parent()) {
-		current = current->parent();
-	}
-	return static_cast<LgpDirectoryItem *>(current);
-}
-
-QString LgpItem::path() const
-{
-	QString dirPath = dirName();
-
-	if(dirPath.isEmpty()) {
-		return name();
-	}
-	return dirPath + "/" + name();
-}
-
-QString LgpItem::dirName() const
-{
-	return parent() ? parent()->path() : QString();
-}
-
-int LgpItem::id() const
-{
-	if(parent()) {
-		return parent()->indexOfChild(this);
-	}
-
-	return -1;
-}
-
-qint64 LgpFileItem::fileSize()
-{
-	QIODevice *io = file();
-	if(io->open(QIODevice::ReadOnly)) {
-		return io->size();
-	}
-	return -1;
-}
-
-QIODevice *LgpFileItem::file()
-{
-	return _lgp->modifiedFile(path());
-}
-
-bool LgpFileItem::setFile(QIODevice *io)
-{
-	return _lgp->setFile(path(), io);
-}
-
-void LgpFileItem::setIcon(const QIcon &icon)
-{
-	_icon = icon;
-}
-
-const QIcon &LgpFileItem::icon() const
-{
-	return _icon;
-}
-
-bool LgpFileItem::move(const QString &destination) {
-	bool ok, sameDir;
-	QString source = path(), destFileName, destDirName;
-	int index = destination.lastIndexOf('/');
-	if(index < 0) {
-		destFileName = destination;
-	} else {
-		destDirName = destination.left(index);
-		destFileName = destination.mid(index + 1);
-	}
-
-	sameDir = dirName() == destDirName; // We don't need to move the item if the directory is the same
-
-	ok = sameDir || parent()->unrefChild(this);
-	if(ok) {
-		ok = _lgp->renameFile(source, destination);
-		if(ok) {
-			if(!sameDir) {
-				root()->addChild(destination, this);
-			} else {
-				parent()->renameChild(this, destFileName);
-			}
-		} else {
-			if(!sameDir) {
-				root()->addChild(source, this); // Cancel renaming
-			}
-			qWarning() << "cannot rename child!";
-		}
-	} else {
-		qWarning() << "cannot unref child!";
-	}
-
-	return ok;
-}
-
-void LgpFileItem::debug() const
-{
-	qDebug() << "File" << path();
-}
-
-LgpDirectoryItem::~LgpDirectoryItem()
-{
-	qDeleteAll(_childItems);
-}
-
-void LgpDirectoryItem::addChild(const QString &name, Lgp *lgp)
-{
-	addChild(name, new LgpFileItem(QString(), lgp));
-}
-
-void LgpDirectoryItem::addChild(const QString &name, LgpFileItem *item)
-{
-	int index = name.indexOf('/');
-	if(index < 0) {
-		if(_fileChilds.contains(name)) {
-			qWarning() << "LgpDirectoryItem::addChild Child already in the tree";
-			delete item;
-		} else {
-			item->setParent(this);
-			item->setName(name);
-			_fileChilds.insert(name, item);
-			_childItems.append(item);
-		}
-	} else {
-		QString dirName = name.left(index);
-		LgpDirectoryItem *dirItem;
-		if(_dirChilds.contains(dirName)) {
-			dirItem = _dirChilds.value(dirName);
-		} else {
-			dirItem = new LgpDirectoryItem(dirName, this);
-			_dirChilds.insert(dirName, dirItem);
-			_childItems.append(dirItem);
-		}
-
-		dirItem->addChild(name.mid(index + 1), item);
-	}
-}
-
-void LgpDirectoryItem::sort(SortType type, Qt::SortOrder order)
-{
-	switch(type) {
-	case ByName:
-		switch(order) {
-		case Qt::AscendingOrder:
-			std::sort(_childItems.begin(), _childItems.end(), [](LgpItem *i1, LgpItem *i2) {
-				if(i1->isDirectory()) {
-					return true;
-				}
-				if(i2->isDirectory()) {
-					return false;
-				}
-				return i1->name() > i2->name();
-			});
-			break;
-		case Qt::DescendingOrder:
-			std::sort(_childItems.begin(), _childItems.end(), [](LgpItem *i1, LgpItem *i2) {
-				if(i1->isDirectory()) {
-					return false;
-				}
-				if(i2->isDirectory()) {
-					return true;
-				}
-				return i1->name() < i2->name();
-			});
-			break;
-		}
-
-		break;
-	case BySize:
-		switch(order) {
-		case Qt::AscendingOrder:
-			std::sort(_childItems.begin(), _childItems.end(), [](LgpItem *i1, LgpItem *i2) {
-				if(i1->isDirectory() && i2->isDirectory()) {
-					return i1->name() > i2->name();
-				}
-				if(i1->isDirectory()) {
-					return true;
-				}
-				if(i2->isDirectory()) {
-					return false;
-				}
-				LgpFileItem *i1f = static_cast<LgpFileItem *>(i1),
-				            *i2f = static_cast<LgpFileItem *>(i2);
-				return i1f->fileSize() > i2f->fileSize();
-			});
-			break;
-		case Qt::DescendingOrder:
-			std::sort(_childItems.begin(), _childItems.end(), [](LgpItem *i1, LgpItem *i2) {
-				if(i1->isDirectory() && i2->isDirectory()) {
-					return i1->name() < i2->name();
-				}
-				if(i1->isDirectory()) {
-					return false;
-				}
-				if(i2->isDirectory()) {
-					return true;
-				}
-				LgpFileItem *i1f = static_cast<LgpFileItem *>(i1),
-				            *i2f = static_cast<LgpFileItem *>(i2);
-				return i1f->fileSize() < i2f->fileSize();
-			});
-			break;
-		}
-
-		break;
-	}
-}
-
-bool LgpDirectoryItem::unrefChild(LgpItem *child)
-{
-	bool ok;
-
-	if(child->isDirectory()) {
-		ok = _dirChilds.remove(child->name()) == 1;
-	} else {
-		ok = _fileChilds.remove(child->name()) == 1;
-	}
-
-	if(!ok) {
-		qWarning() << "LgpDirectoryItem::unrefChild: child not found in hash tables!" << child->isDirectory() << child->name();
-	}
-
-	return ok && _childItems.removeOne(child);
-}
-
-void LgpDirectoryItem::renameChild(LgpItem *child, const QString &destination)
-{
-	if(child->isDirectory()) {
-		LgpDirectoryItem *item = _dirChilds.take(child->name());
-		if(item) {
-			item->setName(destination);
-			_dirChilds.insert(destination, item);
-		}
-	} else {
-		LgpFileItem *item = _fileChilds.take(child->name());
-		if(item) {
-			item->setName(destination);
-			_fileChilds.insert(destination, item);
-		}
-	}
-}
-
-bool LgpDirectoryItem::removeChild(LgpItem *child)
-{
-	return removeChildren(child->id(), 1);
-}
-
-bool LgpDirectoryItem::removeChildren(int position, int count)
-{
-	if (position < 0 || position + count > _childItems.size()) {
-		return false;
-	}
-
-	for (int row = 0; row < count; ++row) {
-		LgpItem *item = _childItems.takeAt(position);
-		if(item->isDirectory()) {
-			_dirChilds.remove(item->name());
-		} else {
-			_fileChilds.remove(item->name());
-		}
-		delete item;
-	}
-
-	return true;
-}
-
-LgpItem *LgpItem::find(const QString &path)
-{
-	Q_UNUSED(path) //TODO
-	return NULL;
-}
-
-LgpItem *LgpDirectoryItem::find(const QString &path)
-{
-	QString name, rest;
-	int index = path.indexOf('/');
-
-	if(index < 0) {
-		name = path.left(index);
-		rest = path.mid(index + 1);
-	} else {
-		name = path;
-	}
-
-	//TODO
-	return NULL;
-}
-
-void LgpDirectoryItem::debug() const
-{
-	qDebug() << "Directory" << path();
-	foreach(LgpItem *item, _childItems) {
-		item->debug();
-	}
-}
-
-LgpItemModel::LgpItemModel(Lgp *lgp, QObject *parent) :
-	QAbstractItemModel(parent), _lgp(lgp)/*, iconThread(this)*/
-{
-	root = new LgpDirectoryItem("");
-	foreach(const QString &path, lgp->fileList()) {
-		root->addChild(path, lgp);
-//		iconThread.addFile(path);
-	}
-//	root->debug();
-
-//	connect(&iconThread, SIGNAL(iconLoaded(QString,QIcon)), SLOT(setIcon(QString,QIcon)));
-
-	QFileIconProvider iconProvider;
-	fileIcon = iconProvider.icon(QFileIconProvider::File);
-	directoryIcon = iconProvider.icon(QFileIconProvider::Folder);
-
-//	iconThread.start(QThread::LowPriority);
-}
-
-LgpItemModel::~LgpItemModel()
-{
-	delete root;
-}
-
-void LgpItemModel::setIcon(const QString &path, const QIcon &icon)
-{
-	LgpItem *item = root->find(path);
-	if(!item || item->isDirectory()) {
-		return;
-	}
-
-	static_cast<LgpFileItem *>(item)->setIcon(icon);
-
-	emit layoutChanged();
-}
-
-QModelIndex LgpItemModel::index(int row, int column, const QModelIndex &parent) const
-{
-	if (row < 0 || column < 0 || row >= rowCount(parent) || column >= columnCount(parent)) {
-		return QModelIndex();
-	}
-
-	LgpDirectoryItem *parentItem = static_cast<LgpDirectoryItem *>(item(parent));
-	if(!parentItem) {
-		parentItem = root;
-	}
-
-	return createIndex(row, column, parentItem->child(row));
-}
-
-LgpItem *LgpItemModel::item(const QModelIndex &index) const
-{
-	if(index.isValid()) {
-		LgpItem *item = static_cast<LgpItem *>(index.internalPointer());
-		if(item) {
-			return item;
-		}
-	}
-	return 0;
-}
-
-QModelIndex LgpItemModel::parent(const QModelIndex &index) const
-{
-	if(!index.isValid()) {
-		return QModelIndex();
-	}
-
-	LgpItem *childItem = item(index);
-	if(!childItem) {
-		return QModelIndex();
-	}
-	LgpItem *parentItem = childItem->parent();
-
-	if(parentItem == root || !parentItem) {
-		return QModelIndex();
-	}
-
-	int row = parentItem->id();
-	if(row < 0) {
-		return QModelIndex();
-	}
-
-	return createIndex(row, 0, parentItem);
-}
-
-int LgpItemModel::rowCount(const QModelIndex &parent) const
-{
-	LgpItem *parentItem = item(parent);
-	if(!parentItem) {
-		parentItem = root;
-	}
-
-	if(parentItem->isDirectory()) {
-		return static_cast<LgpDirectoryItem *>(parentItem)->childCount();
-	}
-	return 0;
-}
-
-int LgpItemModel::columnCount(const QModelIndex &parent) const
-{
-	Q_UNUSED(parent)
-	return 2;
-}
-
-QVariant LgpItemModel::data(const QModelIndex &index, int role) const
-{
-	if(!index.isValid()) {
-		return QVariant();
-	}
-
-	LgpItem *lgpItem = item(index);
-	if(!lgpItem) {
-		return QVariant();
-	}
-
-	switch(role) {
-	case Qt::EditRole:
-	case Qt::DisplayRole:
-		switch(index.column()) {
-		case 0:		return lgpItem->name();
-		case 1:
-			if(lgpItem->isDirectory()) {
-				return QString();
-			} else {
-				qint64 fileSize = static_cast<LgpFileItem *>(lgpItem)->fileSize();
-				return fileSize < 0 ? tr("?") : QString::number(fileSize);
-			}
-		default:	break;
-		}
-		break;
-	case Qt::DecorationRole:
-		if(index.column() == 0) {
-			if(lgpItem->isDirectory()) {
-				return directoryIcon;
-			} else {
-				if(static_cast<LgpFileItem *>(lgpItem)->icon().isNull()) {
-					return fileIcon;
-				} else {
-					return static_cast<LgpFileItem *>(lgpItem)->icon();
-				}
-			}
-		}
-		break;
-	case Qt::TextAlignmentRole:
-		if(index.column() == 1) {
-			return Qt::AlignRight;
-		}
-		break;
-	}
-
-	return QVariant();
-}
-
-bool LgpItemModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-	if(!index.isValid()
-			|| role != Qt::EditRole) {
-		return false;
-	}
-
-	LgpItem *lgpItem = item(index);
-
-	if(!lgpItem || lgpItem->isDirectory()) {
-		return false;
-	}
-	QString newFilename = value.toString();
-
-	if(lgpItem->path() == newFilename) {
-		return false;
-	}
-
-	bool ok = static_cast<LgpFileItem *>(lgpItem)->move(newFilename);
-
-	if(ok) {
-		emit dataChanged(index, index);
-		emit layoutChanged();
-	}
-
-	return ok;
-}
-
-void LgpItemModel::update(const QModelIndex &index)
-{
-	if(index.isValid()) {
-		emit dataChanged(index, index);
-	}
-}
-
-QVariant LgpItemModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-	switch(role) {
-	case Qt::TextAlignmentRole:
-		return Qt::AlignLeft;
-	}
-
-	if(orientation != Qt::Horizontal || role != Qt::DisplayRole) {
-		return QAbstractItemModel::headerData(section, orientation, role);
-	}
-
-	switch(section) {
-	case 0:		return tr("Name");
-	case 1:		return tr("Size");
-	default:	return QVariant();
-	}
-}
-
-void LgpItemModel::sort(int column, Qt::SortOrder order)
-{
-	return QAbstractItemModel::sort(column, order);
-
-	// FIXME: TODO
-	/* switch(column) {
-	case 0:
-		root->sort(LgpDirectoryItem::ByName, order);
-		break;
-	case 1:
-		root->sort(LgpDirectoryItem::BySize, order);
-		break;
-	default:
-		break;
-	} */
-}
-
-bool LgpItemModel::insertRow(const QString &name, QIODevice *io,
-                             const QModelIndex &parent)
-{
-	LgpItem *lgpItem = item(parent);
-
-	// Parent must be a directory
-	if(lgpItem && !lgpItem->isDirectory()) {
-		return false;
-	}
-
-	if(!lgpItem) {
-		lgpItem = root;
-	}
-
-	LgpDirectoryItem *dir = static_cast<LgpDirectoryItem *>(lgpItem);
-	QString path;
-
-	if(dir == root) {
-		path = name;
-	} else {
-		path = dir->path() + "/" + name;
-	}
-
-	if(_lgp->addFile(path, io)) {
-		int row = rowCount();
-		beginInsertRows(parent, row, row);
-		dir->addChild(path, _lgp);
-		endInsertRows();
-		return true;
-	}
-
-	return false;
-}
-
-bool LgpItemModel::insertRows(int row, int count, const QModelIndex &parent)
-{
-	beginInsertRows(parent, row, row + count - 1);
-	endInsertRows();
-
-	return true;
-}
-
-bool LgpItemModel::removeRow(const QModelIndex &index)
-{
-	LgpItem *item = this->item(index);
-	if(item && !item->isDirectory()
-	        && _lgp->removeFile(item->path())) {
-		int row = index.row();
-		beginRemoveRows(parent(index), row, row);
-		item->parent()->removeChild(item);
-		endRemoveRows();
-		return true;
-	}
-
-	return false;
-}
-
-bool LgpItemModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-	beginRemoveRows(parent, row, row + count - 1);
-	endRemoveRows();
-
-	return true;
-}
-
-LgpDialog::LgpDialog(Lgp *lgp, QWidget *parent) :
-    QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint),
-    lgp(lgp), progressDialog(0)
-{
-	setWindowTitle(tr("LGP archive manager"));
-	resize(800, 600);
-
-	_model = new LgpItemModel(lgp);
-	treeView = new QTreeView(this);
-	treeView->setModel(_model);
-	treeView->setUniformRowHeights(true);
-	treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
-	treeView->header()->setStretchLastSection(false);
-	treeView->setSortingEnabled(false); // TODO
-
-	renameButton = new QPushButton(tr("Rename"), this);
-	renameButton->setShortcut(Qt::Key_F2);
-	replaceButton = new QPushButton(tr("Replace"), this);
-	replaceButton->setShortcut(QKeySequence("Ctrl+R"));
-	extractButton = new QPushButton(tr("Extract"), this);
-	extractButton->setShortcut(QKeySequence("Ctrl+E"));
-	addButton = new QPushButton(QIcon(":/images/plus.png"), tr("Add"), this);
-	addButton->setShortcut(QKeySequence::New);
-	removeButton = new QPushButton(QIcon(":/images/minus.png"), tr("Delete"), this);
-	removeButton->setShortcut(QKeySequence::Delete);
-	packButton = new QPushButton(QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton),
-								 tr("Save"), this);
-	packButton->setEnabled(false);
-
-	QHBoxLayout *barLayout = new QHBoxLayout;
-	barLayout->addWidget(renameButton);
-	barLayout->addWidget(replaceButton);
-	barLayout->addWidget(extractButton);
-	barLayout->addWidget(addButton);
-	barLayout->addWidget(removeButton);
-	barLayout->addWidget(packButton);
-	barLayout->addStretch();
-
-	QVBoxLayout *layout = new QVBoxLayout(this);
-	layout->addLayout(barLayout);
-	layout->addWidget(treeView, 1);
-
-	connect(renameButton, SIGNAL(released()), SLOT(renameCurrent()));
-	connect(replaceButton, SIGNAL(released()), SLOT(replaceCurrent()));
-	connect(extractButton, SIGNAL(released()), SLOT(extractCurrent()));
-	connect(addButton, SIGNAL(released()), SLOT(add()));
-	connect(removeButton, SIGNAL(released()), SLOT(removeCurrent()));
-	connect(packButton, SIGNAL(released()), SLOT(pack()));
-	connect(treeView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SLOT(setButtonsState()));
-
-	setButtonsState();
-}
-
-void LgpDialog::renameCurrent()
-{
-	QModelIndex index = treeView->currentIndex();
-	if(index.isValid()) {
-		LgpItem *item = _model->item(index);
-		if(item && !item->isDirectory()) {
-			bool ok;
-			QString oldFilePath = item->path(),
-					newFilePath = QInputDialog::getText(this, tr("Rename"), tr("New Name:"), QLineEdit::Normal,
-														oldFilePath, &ok, Qt::Dialog | Qt::WindowCloseButtonHint);
-			if(!ok || newFilePath == oldFilePath) {
-				return;
-			}
-
-			if(!lgp->isNameValid(newFilePath)) {
-				QMessageBox::warning(this, tr("Error"), tr("The name '%1' is invalid, don't put special characters.")
-									 .arg(newFilePath));
-			} else if(lgp->fileExists(newFilePath)) {
-				QMessageBox::warning(this, tr("Error"), tr("A file named '%1' already exists, please choose another name.")
-									 .arg(newFilePath));
-			} else if(!_model->setData(index, newFilePath)) {
-				QMessageBox::warning(this, tr("Error"), tr("Can not Rename the file"));
-			} else {
-				treeView->scrollTo(index);
-//				emit modified();
-				packButton->setEnabled(true);
-			}
-		}
-	}
-}
-
-void LgpDialog::replaceCurrent()
-{
-	QModelIndex index = treeView->currentIndex();
-	if(index.isValid()) {
-		LgpItem *item = _model->item(index);
-		if(item && !item->isDirectory()) {
-			QString filename = item->name();
-			int indexOf = filename.lastIndexOf('.');
-			QString extension = indexOf==-1 ? QString() : filename.mid(indexOf + 1);
-			QStringList filter;
-			if(!extension.isEmpty()) {
-				filter << tr("%1 file (*.%1)").arg(extension);
-			}
-			filter << tr("All files (*)");
-
-			QString lastDir = Config::value("lgpDialogOpenDirectory").toString();
-			if(!lastDir.isEmpty()) {
-				filename = lastDir + "/" + filename;
-			}
-
-			QString path = QFileDialog::getOpenFileName(this, tr("New File"), filename, filter.join(";;"));
-			if(path.isNull()) {
-				return;
-			}
-
-			Config::setValue("lgpDialogOpenDirectory", path.left(path.lastIndexOf('/')));
-
-			if(!static_cast<LgpFileItem *>(item)->setFile(new QFile(path))) {
-				QMessageBox::warning(this, tr("Error"), tr("Can not modify the archive!"));
-			} else {
-//				emit modified();
-				packButton->setEnabled(true);
-			}
-		}
-	}
-}
-
-void LgpDialog::extractCurrent()
-{
-	QModelIndex index = treeView->currentIndex();
-	if(index.isValid()) {
-		LgpItem *item = _model->item(index);
-		if(item && !item->isDirectory()) {
-			QString filename = item->name();
-			int index = filename.lastIndexOf('.');
-			QString extension = index==-1 ? QString() : filename.mid(index + 1);
-			QStringList filter;
-			if(!extension.isEmpty()) {
-				filter.append(tr("%1 file (*.%1)").arg(extension));
-			}
-			filter.append(tr("All files (*)"));
-
-			QString lastDir = Config::value("lgpDialogSaveDirectory").toString();
-			if(!lastDir.isEmpty()) {
-				filename = lastDir + "/" + filename;
-			}
-
-			QString path = QFileDialog::getSaveFileName(this, tr("New File"), filename, filter.join(";;"));
-			if(path.isNull()) {
-				return;
-			}
-
-			Config::setValue("lgpDialogSaveDirectory", path.left(path.lastIndexOf('/')));
-
-			QIODevice *io = static_cast<LgpFileItem *>(item)->file();
-			if(io && io->open(QIODevice::ReadOnly)) {
-				QFile file(path);
-				if(file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
-					while(io->bytesAvailable()) {
-						file.write(io->read(4096));
-					}
-					if(file.error() != QFile::NoError) {
-						QMessageBox::warning(this, tr("Write error"), tr("Can not write to file (message: %1).")
-											 .arg(file.errorString()));
-					}
-					file.close();
-				} else {
-					QMessageBox::warning(this, tr("Opening error"), tr("Can not open the file (message: %1).")
-										 .arg(file.errorString()));
-				}
-				io->close();
-			}
-		}
-	}
-}
-
-void LgpDialog::add()
-{
-	QString dirName;
-	QModelIndex index = treeView->currentIndex();
-	if(index.isValid()) {
-		LgpItem *item = _model->item(index);
-		if(item) {
-			dirName = item->isDirectory() ? item->path() : item->dirName();
-		}
-	}
-
-	QString lastDir = Config::value("lgpDialogOpenDirectory").toString();
-
-	QStringList filter;
-	filter.append(tr("All files (*)"));
-	QStringList paths = QFileDialog::getOpenFileNames(this, tr("New File"), lastDir, filter.join(";;"));
-	if(paths.isEmpty()) {
-		return;
-	}
-
-	QString path = paths.first(),
-	        directory = path.left(path.lastIndexOf('/'));
-	Config::setValue("lgpDialogOpenDirectory", directory);
-
-	foreach(const QString &path, paths) {
-		QString filePath = path.mid(path.lastIndexOf('/') + 1);
-
-		if(!dirName.isEmpty()) {
-			filePath = dirName + "/" + filePath;
-		}
-
-		bool rename = false;
-		
-		do {
-			if(!lgp->isNameValid(filePath)) {
-				QMessageBox::warning(this, tr("Error"),
-									 tr("The name '%1' is invalid, don't put special characters.")
-									 .arg(filePath));
-				rename = true;
-			} else if(lgp->fileExists(filePath)) {
-				QMessageBox::warning(this, tr("Error"),
-									 tr("A file named '%1' already exists, please choose another name.")
-									 .arg(filePath));
-				rename = true;
-			} else {
-				rename = false;
-			}
-
-			if(rename) {
-				bool ok;
-				filePath = QInputDialog::getText(this, tr("Rename"),
-												 tr("New Name:"), QLineEdit::Normal,
-												 filePath, &ok,
-												 Qt::Dialog | Qt::WindowCloseButtonHint);
-				if(!ok) {
-					return;
-				}
-			}
-		} while(rename);
-
-		if(!_model->insertRow(filePath, new QFile(path))) {
-			QMessageBox::critical(this, tr("Error"),
-			                      tr("Can not add the file '%1'")
-			                      .arg(path));
-		} else {
-			treeView->scrollTo(_model->index(_model->rowCount() - 1, 0));
-	//		emit modified();
-			packButton->setEnabled(true);
-		}
-	}
-}
-
-void LgpDialog::removeCurrent()
-{
-	QModelIndex index = treeView->currentIndex();
-	if(index.isValid()) {
-		QMessageBox::StandardButton button = QMessageBox::question(this, tr("Delete ?"),
-							  tr("Are you sure you want to delete this file from the archive?"),
-							  QMessageBox::Yes | QMessageBox::Cancel);
-		if(button != QMessageBox::Yes) {
-			return;
-		}
-
-		if(_model->removeRow(index)) {
-			// emit modified();
-			packButton->setEnabled(true);
-		} else {
-			QMessageBox::warning(this, tr("Error"), tr("Cannot delete the file!"));
-		}
-	}
-}
-
-void LgpDialog::pack()
-{
-	QString path = QFileDialog::getSaveFileName(this, tr("Save as"), lgp->fileName(), tr("Lgp File (*.lgp)"));
-	if(path.isNull()) {
-		return;
-	}
-
-//	QFileInfo info1(path), info2(lgp->fileName());
-//	if(info1 == info2) {
-//		QMessageBox::warning(this, tr("Action impossible"), tr("Merci de sélectionner un autre fichier que celui actuellement ouvert par le logiciel."));
-//		return;
-//	}
-
-	progressDialog = new QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, this, Qt::Dialog | Qt::WindowCloseButtonHint);
-	progressDialog->setWindowModality(Qt::WindowModal);
-	progressDialog->setAutoClose(false);
-	progressDialog->show();
-
-	bool ok = lgp->pack(path, this);
-
-	progressDialog->hide();
-	progressDialog->deleteLater();
-	progressDialog = 0;
-
-	if(!ok) {
-		if(lgp->error() != Lgp::AbortError) {
-			QMessageBox::warning(this, tr("Error"), tr("Cannot create the archive (message: %1).")
-								 .arg(lgp->errorString()));
-		}
-	} else {
-		lgp->open();
-//		emit modified();
-		packButton->setEnabled(false);
-	}
-}
-
-bool LgpDialog::observerWasCanceled() const
-{
-	return progressDialog && progressDialog->wasCanceled();
-}
-
-void LgpDialog::setObserverMaximum(unsigned int max)
-{
-	if(progressDialog) {
-		progressDialog->setMaximum(max);
-	}
-}
-
-void LgpDialog::setObserverValue(int value)
-{
-	QApplication::processEvents();
-
-	if(progressDialog) {
-		progressDialog->setValue(value);
-	}
-}
-
-void LgpDialog::setButtonsState()
-{
-	QModelIndexList modelIndexList = treeView->selectionModel()->selectedRows();
-	LgpItem *item;
-	if(!modelIndexList.isEmpty()) {
-		item = _model->item(modelIndexList.first());
-	} else {
-		item = 0;
-	}
-	bool enabled = !modelIndexList.isEmpty() &&
-	               item &&
-	               !item->isDirectory();
-
-	renameButton->setEnabled(enabled);
-	replaceButton->setEnabled(enabled);
-	extractButton->setEnabled(enabled);
-	removeButton->setEnabled(enabled);
-}
diff -Nru makoureactor-1.7.2/widgets/LgpDialog.h makoureactor-1.8.0/widgets/LgpDialog.h
--- makoureactor-1.7.2/widgets/LgpDialog.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/LgpDialog.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,216 +0,0 @@
-/****************************************************************************
- ** Makou Reactor Final Fantasy VII Field Script Editor
- ** Copyright (C) 2009-2013 Arzel Jérôme <myst6re@gmail.com>
- **
- ** This program is free software: you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation, either version 3 of the License, or
- ** (at your option) any later version.
- **
- ** This program is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ****************************************************************************/
-#ifndef LGPDIALOG_H
-#define LGPDIALOG_H
-
-#include <QtWidgets>
-#include "core/Lgp.h"
-
-class IconThread : public QThread
-{
-	Q_OBJECT
-public:
-	explicit IconThread(QObject *parent = 0);
-	~IconThread();
-
-	void clear();
-	void addFile(const QString &filePath);
-signals:
-	void iconLoaded(const QString &filePath, const QIcon &icon) const;
-protected:
-	void run();
-private:
-	QMutex mutexFiles;
-	QWaitCondition hasFilesCondition;
-	bool abort;
-
-	QQueue<QString> _files;
-	QMap<QString, QIcon> cacheIcon;
-};
-
-class LgpDirectoryItem;
-
-class LgpItem
-{
-public:
-	explicit LgpItem(const QString &name, LgpDirectoryItem *parent = 0) :
-		_name(name), _parent(parent) {
-	}
-	virtual ~LgpItem() {
-	}
-
-	inline LgpDirectoryItem *parent() const {
-		return _parent;
-	}
-	inline void setParent(LgpDirectoryItem *parent) {
-		_parent = parent;
-	}
-
-	LgpDirectoryItem *root();
-
-	virtual bool isDirectory() const=0;
-	inline bool isFile() const {
-		return !isDirectory();
-	}
-	inline const QString &name() const {
-		return _name;
-	}
-	inline void setName(const QString &name) {
-		_name = name;
-	}
-	QString path() const;
-	QString dirName() const;
-	int id() const;
-
-	virtual LgpItem *find(const QString &path);
-
-	virtual void debug() const=0;
-private:
-	QString _name;
-	LgpDirectoryItem *_parent;
-};
-
-class LgpFileItem : public LgpItem
-{
-public:
-	LgpFileItem(const QString &name, Lgp *lgp, LgpDirectoryItem *parent = 0) :
-		LgpItem(name, parent), _lgp(lgp) {
-	}
-	virtual ~LgpFileItem() {
-	}
-
-	inline bool isDirectory() const {
-		return false;
-	}
-
-	qint64 fileSize();
-	QIODevice *file();
-	bool setFile(QIODevice *io);
-	void setIcon(const QIcon &icon);
-	const QIcon &icon() const;
-	bool move(const QString &destination);
-	void debug() const;
-
-private:
-	QIcon _icon;
-	Lgp *_lgp;
-};
-
-class LgpDirectoryItem : public LgpItem
-{
-public:
-	enum SortType {
-		ByName,
-		BySize
-	};
-
-	explicit LgpDirectoryItem(const QString &name, LgpDirectoryItem *parent = 0) :
-		LgpItem(name, parent) {
-	}
-	virtual ~LgpDirectoryItem();
-
-	inline bool isDirectory() const {
-		return true;
-	}
-
-	inline LgpItem *child(int row) {
-		return _childItems.at(row);
-	}
-
-	inline int indexOfChild(const LgpItem *child) const {
-		return _childItems.indexOf(const_cast<LgpItem *>(child));
-	}
-
-	inline int childCount() const {
-		return _childItems.size();
-	}
-
-	void sort(SortType type, Qt::SortOrder order);
-	bool unrefChild(LgpItem *child);
-	void renameChild(LgpItem *child, const QString &destination);
-	bool removeChild(LgpItem *child);
-	bool removeChildren(int position, int count);
-	void addChild(const QString &name, Lgp *lgp);
-	void addChild(const QString &name, LgpFileItem *item);
-	LgpItem *find(const QString &path);
-	void debug() const;
-private:
-	QHash<QString, LgpFileItem *> _fileChilds;
-	QHash<QString, LgpDirectoryItem *> _dirChilds;
-	QList<LgpItem *> _childItems;
-};
-
-class LgpItemModel : public QAbstractItemModel
-{
-	Q_OBJECT
-public:
-	explicit LgpItemModel(Lgp *lgp, QObject *parent=0);
-	~LgpItemModel();
-	QModelIndex index(int row, int column, const QModelIndex &parent=QModelIndex()) const;
-	QModelIndex parent(const QModelIndex &index) const;
-	int rowCount(const QModelIndex &parent=QModelIndex()) const;
-	int columnCount(const QModelIndex &parent=QModelIndex()) const;
-	QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const;
-	bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole);
-	QVariant headerData(int section, Qt::Orientation orientation, int role=Qt::DisplayRole) const;
-	void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
-	bool insertRow(const QString &name, QIODevice *io, const QModelIndex &parent=QModelIndex());
-	bool insertRows(int row, int count, const QModelIndex &parent=QModelIndex());
-	bool removeRow(const QModelIndex &index);
-	bool removeRows(int row, int count, const QModelIndex &parent=QModelIndex());
-	void update(const QModelIndex &index);
-	LgpItem *item(const QModelIndex &index) const;
-private slots:
-	void setIcon(const QString &path, const QIcon &icon);
-private:
-//	IconThread iconThread;
-	QIcon fileIcon, directoryIcon;
-	LgpDirectoryItem *root;
-	Lgp *_lgp;
-};
-
-class LgpDialog : public QDialog, ArchiveObserver
-{
-	Q_OBJECT
-public:
-	explicit LgpDialog(Lgp *lgp, QWidget *parent=0);
-
-	bool observerWasCanceled() const;
-	void setObserverMaximum(unsigned int max);
-	void setObserverValue(int value);
-signals:
-	void modified();
-private slots:
-	void renameCurrent();
-	void replaceCurrent();
-	void extractCurrent();
-	void add();
-	void removeCurrent();
-	void setButtonsState();
-	void pack();
-private:
-	Lgp *lgp;
-	QTreeView *treeView;
-	QPushButton *extractButton, *renameButton,
-	            *replaceButton, *addButton,
-	            *removeButton, *packButton;
-	QProgressDialog *progressDialog;
-	LgpItemModel *_model;
-};
-
-#endif // LGPDIALOG_H
diff -Nru makoureactor-1.7.2/widgets/LgpWidget.cpp makoureactor-1.8.0/widgets/LgpWidget.cpp
--- makoureactor-1.7.2/widgets/LgpWidget.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/LgpWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,1140 @@
+/****************************************************************************
+ ** Makou Reactor Final Fantasy VII Field Script Editor
+ ** Copyright (C) 2009-2012 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#include "LgpWidget.h"
+#include "core/Config.h"
+#include "Parameters.h"
+#include "core/TimFile.h"
+#include "core/TexFile.h"
+#include "core/field/CharArchive.h"
+
+IconThread::IconThread(QObject *parent) :
+      QThread(parent), abort(false)
+{
+}
+
+IconThread::~IconThread()
+{
+	QMutexLocker locker(&mutexFiles);
+	abort = true;
+	hasFilesCondition.wakeOne();
+	locker.unlock();
+	wait();
+}
+
+void IconThread::clear()
+{
+	QMutexLocker locker(&mutexFiles);
+	_files.clear();
+}
+
+void IconThread::addFile(const QString &filePath)
+{
+	QMutexLocker locker(&mutexFiles);
+	_files.enqueue(filePath);
+	hasFilesCondition.wakeAll();
+}
+
+void IconThread::run()
+{
+	forever {
+		QMutexLocker locker(&mutexFiles);
+		if (abort) {
+			return;
+		}
+		qDebug() << "IconThread::run()";
+		if (_files.isEmpty()) {
+			hasFilesCondition.wait(&mutexFiles);
+		}
+		QString path = _files.dequeue();
+		qDebug() << "IconThread::run() treat path" << path;
+		locker.unlock();
+
+		int index = path.lastIndexOf('.');
+		if (index != -1) {
+			QString type = path.mid(index + 1);
+
+			if (cacheIcon.contains(type)) {
+				emit iconLoaded(path, cacheIcon.value(type));
+			} else {
+				QFile tmp(QDir::tempPath() % "/" % PROG_NAME % "." % type);
+				if (tmp.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+					QIcon icon = QFileIconProvider().icon(QFileInfo(tmp));
+					tmp.remove();
+
+					cacheIcon.insert(type, icon);
+
+					emit iconLoaded(path, icon);
+				} else {
+					qWarning() << "IconThread::run() cannot create tmp file" << tmp.fileName() << tmp.errorString();
+				}
+			}
+		}
+	}
+}
+
+LgpDirectoryItem *LgpItem::root()
+{
+	LgpItem *current = this;
+	while (current->parent()) {
+		current = current->parent();
+	}
+	return static_cast<LgpDirectoryItem *>(current);
+}
+
+QString LgpItem::path() const
+{
+	QString dirPath = dirName();
+
+	if (dirPath.isEmpty()) {
+		return name();
+	}
+	return dirPath + "/" + name();
+}
+
+QString LgpItem::dirName() const
+{
+	return parent() ? parent()->path() : QString();
+}
+
+int LgpItem::id() const
+{
+	if (parent()) {
+		return parent()->indexOfChild(this);
+	}
+
+	return -1;
+}
+
+qint64 LgpFileItem::fileSize()
+{
+	QIODevice *io = file();
+	if (io->open(QIODevice::ReadOnly)) {
+		return io->size();
+	}
+	return -1;
+}
+
+QIODevice *LgpFileItem::file()
+{
+	return _lgp->modifiedFile(path());
+}
+
+bool LgpFileItem::setFile(QIODevice *io)
+{
+	return _lgp->setFile(path(), io);
+}
+
+void LgpFileItem::setIcon(const QIcon &icon)
+{
+	_icon = icon;
+}
+
+const QIcon &LgpFileItem::icon() const
+{
+	return _icon;
+}
+
+bool LgpFileItem::move(const QString &destination) {
+	bool ok, sameDir;
+	QString source = path(), destFileName, destDirName;
+	int index = destination.lastIndexOf('/');
+	if (index < 0) {
+		destFileName = destination;
+	} else {
+		destDirName = destination.left(index);
+		destFileName = destination.mid(index + 1);
+	}
+
+	sameDir = dirName() == destDirName; // We don't need to move the item if the directory is the same
+
+	ok = sameDir || parent()->unrefChild(this);
+	if (ok) {
+		ok = _lgp->renameFile(source, destination);
+		if (ok) {
+			if (!sameDir) {
+				root()->addChild(destination, this);
+			} else {
+				parent()->renameChild(this, destFileName);
+			}
+		} else {
+			if (!sameDir) {
+				root()->addChild(source, this); // Cancel renaming
+			}
+			qWarning() << "cannot rename child!";
+		}
+	} else {
+		qWarning() << "cannot unref child!";
+	}
+
+	return ok;
+}
+
+void LgpFileItem::debug() const
+{
+	qDebug() << "File" << path();
+}
+
+LgpDirectoryItem::~LgpDirectoryItem()
+{
+	qDeleteAll(_childItems);
+}
+
+void LgpDirectoryItem::addChild(const QString &name, Lgp *lgp)
+{
+	addChild(name, new LgpFileItem(QString(), lgp));
+}
+
+void LgpDirectoryItem::addChild(const QString &name, LgpFileItem *item)
+{
+	int index = name.indexOf('/');
+	if (index < 0) {
+		if (_fileChilds.contains(name)) {
+			qWarning() << "LgpDirectoryItem::addChild Child already in the tree";
+			delete item;
+		} else {
+			item->setParent(this);
+			item->setName(name);
+			_fileChilds.insert(name, item);
+			_childItems.append(item);
+		}
+	} else {
+		QString dirName = name.left(index);
+		LgpDirectoryItem *dirItem;
+		if (_dirChilds.contains(dirName)) {
+			dirItem = _dirChilds.value(dirName);
+		} else {
+			dirItem = new LgpDirectoryItem(dirName, this);
+			_dirChilds.insert(dirName, dirItem);
+			_childItems.append(dirItem);
+		}
+
+		dirItem->addChild(name.mid(index + 1), item);
+	}
+}
+
+void LgpDirectoryItem::sort(SortType type, Qt::SortOrder order)
+{
+	switch (type) {
+	case ByName:
+		switch (order) {
+		case Qt::AscendingOrder:
+			std::sort(_childItems.begin(), _childItems.end(), [](LgpItem *i1, LgpItem *i2) {
+				if (i1->isDirectory()) {
+					return true;
+				}
+				if (i2->isDirectory()) {
+					return false;
+				}
+				return i1->name() > i2->name();
+			});
+			break;
+		case Qt::DescendingOrder:
+			std::sort(_childItems.begin(), _childItems.end(), [](LgpItem *i1, LgpItem *i2) {
+				if (i1->isDirectory()) {
+					return false;
+				}
+				if (i2->isDirectory()) {
+					return true;
+				}
+				return i1->name() < i2->name();
+			});
+			break;
+		}
+
+		break;
+	case BySize:
+		switch (order) {
+		case Qt::AscendingOrder:
+			std::sort(_childItems.begin(), _childItems.end(), [](LgpItem *i1, LgpItem *i2) {
+				if (i1->isDirectory() && i2->isDirectory()) {
+					return i1->name() > i2->name();
+				}
+				if (i1->isDirectory()) {
+					return true;
+				}
+				if (i2->isDirectory()) {
+					return false;
+				}
+				LgpFileItem *i1f = static_cast<LgpFileItem *>(i1),
+				            *i2f = static_cast<LgpFileItem *>(i2);
+				return i1f->fileSize() > i2f->fileSize();
+			});
+			break;
+		case Qt::DescendingOrder:
+			std::sort(_childItems.begin(), _childItems.end(), [](LgpItem *i1, LgpItem *i2) {
+				if (i1->isDirectory() && i2->isDirectory()) {
+					return i1->name() < i2->name();
+				}
+				if (i1->isDirectory()) {
+					return false;
+				}
+				if (i2->isDirectory()) {
+					return true;
+				}
+				LgpFileItem *i1f = static_cast<LgpFileItem *>(i1),
+				            *i2f = static_cast<LgpFileItem *>(i2);
+				return i1f->fileSize() < i2f->fileSize();
+			});
+			break;
+		}
+
+		break;
+	}
+}
+
+bool LgpDirectoryItem::unrefChild(LgpItem *child)
+{
+	bool ok;
+
+	if (child->isDirectory()) {
+		ok = _dirChilds.remove(child->name()) == 1;
+	} else {
+		ok = _fileChilds.remove(child->name()) == 1;
+	}
+
+	if (!ok) {
+		qWarning() << "LgpDirectoryItem::unrefChild: child not found in hash tables!" << child->isDirectory() << child->name();
+	}
+
+	return ok && _childItems.removeOne(child);
+}
+
+void LgpDirectoryItem::renameChild(LgpItem *child, const QString &destination)
+{
+	if (child->isDirectory()) {
+		LgpDirectoryItem *item = _dirChilds.take(child->name());
+		if (item) {
+			item->setName(destination);
+			_dirChilds.insert(destination, item);
+		}
+	} else {
+		LgpFileItem *item = _fileChilds.take(child->name());
+		if (item) {
+			item->setName(destination);
+			_fileChilds.insert(destination, item);
+		}
+	}
+}
+
+bool LgpDirectoryItem::removeChild(LgpItem *child)
+{
+	return removeChildren(child->id(), 1);
+}
+
+bool LgpDirectoryItem::removeChildren(int position, int count)
+{
+	if (position < 0 || position + count > _childItems.size()) {
+		return false;
+	}
+
+	for (int row = 0; row < count; ++row) {
+		LgpItem *item = _childItems.takeAt(position);
+		if (item->isDirectory()) {
+			_dirChilds.remove(item->name());
+		} else {
+			_fileChilds.remove(item->name());
+		}
+		delete item;
+	}
+
+	return true;
+}
+
+LgpItem *LgpItem::find(const QString &path)
+{
+	Q_UNUSED(path) //TODO
+	return nullptr;
+}
+
+LgpItem *LgpDirectoryItem::find(const QString &path)
+{
+	QString name, rest;
+	int index = path.indexOf('/');
+
+	if (index < 0) {
+		name = path.left(index);
+		rest = path.mid(index + 1);
+	} else {
+		name = path;
+	}
+
+	//TODO
+	return nullptr;
+}
+
+void LgpDirectoryItem::debug() const
+{
+	qDebug() << "Directory" << path();
+	for (LgpItem *item : _childItems) {
+		item->debug();
+	}
+}
+
+LgpItemModel::LgpItemModel(Lgp *lgp, QObject *parent) :
+	QAbstractItemModel(parent), _lgp(lgp)/*, iconThread(this)*/
+{
+	root = new LgpDirectoryItem("");
+	for (const QString &path : lgp->fileList()) {
+		root->addChild(path, lgp);
+//		iconThread.addFile(path);
+	}
+//	root->debug();
+
+//	connect(&iconThread, SIGNAL(iconLoaded(QString,QIcon)), SLOT(setIcon(QString,QIcon)));
+
+	QFileIconProvider iconProvider;
+	fileIcon = iconProvider.icon(QFileIconProvider::File);
+	directoryIcon = iconProvider.icon(QFileIconProvider::Folder);
+
+//	iconThread.start(QThread::LowPriority);
+}
+
+LgpItemModel::~LgpItemModel()
+{
+	delete root;
+}
+
+void LgpItemModel::setIcon(const QString &path, const QIcon &icon)
+{
+	LgpItem *item = root->find(path);
+	if (!item || item->isDirectory()) {
+		return;
+	}
+
+	static_cast<LgpFileItem *>(item)->setIcon(icon);
+
+	emit layoutChanged();
+}
+
+QModelIndex LgpItemModel::index(int row, int column, const QModelIndex &parent) const
+{
+	if (row < 0 || column < 0 || row >= rowCount(parent) || column >= columnCount(parent)) {
+		return QModelIndex();
+	}
+
+	LgpDirectoryItem *parentItem = static_cast<LgpDirectoryItem *>(item(parent));
+	if (!parentItem) {
+		parentItem = root;
+	}
+
+	return createIndex(row, column, parentItem->child(row));
+}
+
+LgpItem *LgpItemModel::item(const QModelIndex &index) const
+{
+	if (index.isValid()) {
+		LgpItem *item = static_cast<LgpItem *>(index.internalPointer());
+		if (item) {
+			return item;
+		}
+	}
+	return 0;
+}
+
+QModelIndex LgpItemModel::parent(const QModelIndex &index) const
+{
+	if (!index.isValid()) {
+		return QModelIndex();
+	}
+
+	LgpItem *childItem = item(index);
+	if (!childItem) {
+		return QModelIndex();
+	}
+	LgpItem *parentItem = childItem->parent();
+
+	if (parentItem == root || !parentItem) {
+		return QModelIndex();
+	}
+
+	int row = parentItem->id();
+	if (row < 0) {
+		return QModelIndex();
+	}
+
+	return createIndex(row, 0, parentItem);
+}
+
+int LgpItemModel::rowCount(const QModelIndex &parent) const
+{
+	LgpItem *parentItem = item(parent);
+	if (!parentItem) {
+		parentItem = root;
+	}
+
+	if (parentItem->isDirectory()) {
+		return static_cast<LgpDirectoryItem *>(parentItem)->childCount();
+	}
+	return 0;
+}
+
+int LgpItemModel::columnCount(const QModelIndex &parent) const
+{
+	Q_UNUSED(parent)
+	return 2;
+}
+
+QVariant LgpItemModel::data(const QModelIndex &index, int role) const
+{
+	if (!index.isValid()) {
+		return QVariant();
+	}
+
+	LgpItem *lgpItem = item(index);
+	if (!lgpItem) {
+		return QVariant();
+	}
+
+	switch (role) {
+	case Qt::EditRole:
+	case Qt::DisplayRole:
+		switch (index.column()) {
+		case 0:		return lgpItem->name();
+		case 1:
+			if (lgpItem->isDirectory()) {
+				return QString();
+			} else {
+				qint64 fileSize = static_cast<LgpFileItem *>(lgpItem)->fileSize();
+				return fileSize < 0 ? tr("?") : QString::number(fileSize);
+			}
+		default:	break;
+		}
+		break;
+	case Qt::DecorationRole:
+		if (index.column() == 0) {
+			if (lgpItem->isDirectory()) {
+				return directoryIcon;
+			} else {
+				if (static_cast<LgpFileItem *>(lgpItem)->icon().isNull()) {
+					return fileIcon;
+				} else {
+					return static_cast<LgpFileItem *>(lgpItem)->icon();
+				}
+			}
+		}
+		break;
+	case Qt::TextAlignmentRole:
+		if (index.column() == 1) {
+			return Qt::AlignRight;
+		}
+		break;
+	}
+
+	return QVariant();
+}
+
+bool LgpItemModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+	if (!index.isValid()
+			|| role != Qt::EditRole) {
+		return false;
+	}
+
+	LgpItem *lgpItem = item(index);
+
+	if (!lgpItem || lgpItem->isDirectory()) {
+		return false;
+	}
+	QString newFilename = value.toString();
+
+	if (lgpItem->path() == newFilename) {
+		return false;
+	}
+
+	bool ok = static_cast<LgpFileItem *>(lgpItem)->move(newFilename);
+
+	if (ok) {
+		emit dataChanged(index, index);
+		emit layoutChanged();
+	}
+
+	return ok;
+}
+
+void LgpItemModel::update(const QModelIndex &index)
+{
+	if (index.isValid()) {
+		emit dataChanged(index, index);
+	}
+}
+
+QVariant LgpItemModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+	switch (role) {
+	case Qt::TextAlignmentRole:
+		return Qt::AlignLeft;
+	}
+
+	if (orientation != Qt::Horizontal || role != Qt::DisplayRole) {
+		return QAbstractItemModel::headerData(section, orientation, role);
+	}
+
+	switch (section) {
+	case 0:		return tr("Name");
+	case 1:		return tr("Size");
+	default:	return QVariant();
+	}
+}
+
+void LgpItemModel::sort(int column, Qt::SortOrder order)
+{
+	return QAbstractItemModel::sort(column, order);
+
+	// FIXME: TODO
+	/* switch (column) {
+	case 0:
+		root->sort(LgpDirectoryItem::ByName, order);
+		break;
+	case 1:
+		root->sort(LgpDirectoryItem::BySize, order);
+		break;
+	default:
+		break;
+	} */
+}
+
+bool LgpItemModel::insertRow(const QString &name, QIODevice *io,
+                             const QModelIndex &parent)
+{
+	LgpItem *lgpItem = item(parent);
+
+	// Parent must be a directory
+	if (lgpItem && !lgpItem->isDirectory()) {
+		return false;
+	}
+
+	if (!lgpItem) {
+		lgpItem = root;
+	}
+
+	LgpDirectoryItem *dir = static_cast<LgpDirectoryItem *>(lgpItem);
+	QString path;
+
+	if (dir == root) {
+		path = name;
+	} else {
+		path = dir->path() + "/" + name;
+	}
+
+	if (_lgp->addFile(path, io)) {
+		int row = rowCount();
+		beginInsertRows(parent, row, row);
+		dir->addChild(path, _lgp);
+		endInsertRows();
+		return true;
+	}
+
+	return false;
+}
+
+bool LgpItemModel::insertRows(int row, int count, const QModelIndex &parent)
+{
+	beginInsertRows(parent, row, row + count - 1);
+	endInsertRows();
+
+	return true;
+}
+
+bool LgpItemModel::removeRow(const QModelIndex &index)
+{
+	LgpItem *item = this->item(index);
+	if (item && !item->isDirectory()
+	        && _lgp->removeFile(item->path())) {
+		int row = index.row();
+		beginRemoveRows(parent(index), row, row);
+		item->parent()->removeChild(item);
+		endRemoveRows();
+		return true;
+	}
+
+	return false;
+}
+
+bool LgpItemModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+	beginRemoveRows(parent, row, row + count - 1);
+	endRemoveRows();
+
+	return true;
+}
+
+LgpWidget::LgpWidget(Lgp *lgp, QWidget *parent) :
+    QWidget(parent),
+    lgp(lgp), progressDialog(nullptr), currentImage(0), currentPal(0)
+{
+	setWindowTitle(tr("LGP archive manager"));
+	resize(800, 600);
+
+	_model = new LgpItemModel(lgp);
+	treeView = new QTreeView(this);
+	treeView->setModel(_model);
+	treeView->setUniformRowHeights(true);
+	treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+	treeView->header()->setStretchLastSection(false);
+	treeView->setSortingEnabled(false); // TODO
+
+	renameButton = new QPushButton(tr("Rename"), this);
+	renameButton->setShortcut(Qt::Key_F2);
+	replaceButton = new QPushButton(tr("Replace"), this);
+	replaceButton->setShortcut(QKeySequence("Ctrl+R"));
+	extractButton = new QPushButton(tr("Extract"), this);
+	extractButton->setShortcut(QKeySequence("Ctrl+E"));
+	extractAllButton = new QPushButton(tr("Extract All"), this);
+	extractAllButton->setShortcut(QKeySequence("Ctrl+A"));
+	addButton = new QPushButton(QIcon(":/images/plus.png"), tr("Add"), this);
+	addButton->setShortcut(QKeySequence::New);
+	removeButton = new QPushButton(QIcon(":/images/minus.png"), tr("Delete"), this);
+	removeButton->setShortcut(QKeySequence::Delete);
+
+	preview = new ArchivePreview(this);
+
+	QHBoxLayout *barLayout = new QHBoxLayout;
+	barLayout->addWidget(renameButton);
+	barLayout->addWidget(replaceButton);
+	barLayout->addWidget(extractButton);
+	barLayout->addWidget(extractAllButton);
+	barLayout->addWidget(addButton);
+	barLayout->addWidget(removeButton);
+	barLayout->addStretch();
+
+	QGridLayout *layout = new QGridLayout(this);
+	layout->addLayout(barLayout, 0, 0, 1, 2);
+	layout->addWidget(treeView, 1, 0);
+	layout->addWidget(preview, 1, 1);
+
+	connect(renameButton, SIGNAL(released()), SLOT(renameCurrent()));
+	connect(replaceButton, SIGNAL(released()), SLOT(replaceCurrent()));
+	connect(extractButton, SIGNAL(released()), SLOT(extractCurrent()));
+	connect(extractAllButton, SIGNAL(released()), SLOT(extractAll()));
+	connect(addButton, SIGNAL(released()), SLOT(add()));
+	connect(removeButton, SIGNAL(released()), SLOT(removeCurrent()));
+	connect(treeView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SLOT(setButtonsState()));
+	connect(treeView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), SLOT(changePreview()));
+	connect(preview, SIGNAL(currentImageChanged(int)), SLOT(changeImageInPreview(int)));
+	connect(preview, SIGNAL(currentPaletteChanged(int)), SLOT(changeImagePaletteInPreview(int)));
+
+	setButtonsState();
+}
+
+void LgpWidget::changePreview()
+{
+	currentImage = 0;
+	currentPal = 0;
+	setButtonsState();
+	generatePreview();
+}
+
+void LgpWidget::generatePreview()
+{
+	QModelIndex index = treeView->currentIndex();
+	if (!index.isValid()) {
+		preview->clearPreview();
+		return;
+	}
+
+	LgpItem *item = _model->item(index);
+	if (!item || item->isDirectory()) {
+		preview->clearPreview();
+		return;
+	}
+
+	QString fileName, fileType;
+
+	fileName = item->path();
+	fileType = fileName.mid(fileName.lastIndexOf('.')+1).toLower();
+
+	if (fileType == "tex")
+	{
+		TexFile texFile(lgp->fileData(fileName));
+		texFile.setCurrentColorTable(currentPal);
+		preview->imagePreview(QPixmap::fromImage(texFile.image()), fileName, currentPal, texFile.colorTableCount());
+	}
+	else if (fileType == "tim")
+	{
+		TimFile timFile(lgp->fileData(fileName));
+		timFile.setCurrentColorTable(currentPal);
+		preview->imagePreview(QPixmap::fromImage(timFile.image()), fileName, currentPal, timFile.colorTableCount());
+	}
+	else if (fileType == "h" || fileType == "c"
+	         || fileType == "sym" || fileType.isEmpty()
+	         || fileType == "bak" || fileType == "dir"
+	         || fileType == "fl" || fileType == "txt"
+	         || fileType == "hrc")
+	{
+		preview->textPreview(QString(lgp->fileData(fileName)));
+	}
+	else if (fileType == "png" || fileType == "jpg" || fileType == "jpeg")
+	{
+		preview->imagePreview(QPixmap::fromImage(QImage::fromData(lgp->fileData(fileName))), fileName);
+	}
+	else if (fileType == "rsd")
+	{
+		CharArchive charArchive(lgp);
+		fieldModelFile.clear();
+		fieldModelFile.loadPart(&charArchive, fileName);
+		preview->modelPreview(&fieldModelFile);
+	}
+	else
+	{
+		/* QList<int> indexes = FF8Image::findTims(data);
+		if (!indexes.isEmpty())
+		{
+			TimFile timFile(data.mid(indexes.value(currentImage, indexes.first())));
+			timFile.setCurrentColorTable(currentPal);
+			preview->imagePreview(QPixmap::fromImage(timFile.image()), fileName,
+			                      currentPal, timFile.colorTableCount(),
+			                      currentImage, indexes.size());
+		}
+		else
+		{*/
+			preview->clearPreview();
+		//}
+	}
+}
+
+void LgpWidget::changeImageInPreview(int imageID)
+{
+	if (imageID < 0) {
+		return;
+	}
+
+	currentImage = imageID;
+	generatePreview();
+}
+
+void LgpWidget::changeImagePaletteInPreview(int palID)
+{
+	if (palID < 0) {
+		return;
+	}
+
+	currentPal = palID;
+	generatePreview();
+}
+
+void LgpWidget::renameCurrent()
+{
+	QModelIndex index = treeView->currentIndex();
+	if (index.isValid()) {
+		LgpItem *item = _model->item(index);
+		if (item && !item->isDirectory()) {
+			bool ok;
+			QString oldFilePath = item->path(),
+					newFilePath = QInputDialog::getText(this, tr("Rename"), tr("New Name:"), QLineEdit::Normal,
+														oldFilePath, &ok, Qt::Dialog | Qt::WindowCloseButtonHint);
+			if (!ok || newFilePath == oldFilePath) {
+				return;
+			}
+
+			if (!lgp->isNameValid(newFilePath)) {
+				QMessageBox::warning(this, tr("Error"), tr("The name '%1' is invalid, don't put special characters.")
+									 .arg(newFilePath));
+			} else if (lgp->fileExists(newFilePath)) {
+				QMessageBox::warning(this, tr("Error"), tr("A file named '%1' already exists, please choose another name.")
+									 .arg(newFilePath));
+			} else if (!_model->setData(index, newFilePath)) {
+				QMessageBox::warning(this, tr("Error"), tr("Can not Rename the file"));
+			} else {
+				treeView->scrollTo(index);
+				emit modified();
+			}
+		}
+	}
+}
+
+void LgpWidget::replaceCurrent()
+{
+	QModelIndex index = treeView->currentIndex();
+	if (index.isValid()) {
+		LgpItem *item = _model->item(index);
+		if (item && !item->isDirectory()) {
+			QString filename = item->name();
+			int indexOf = filename.lastIndexOf('.');
+			QString extension = indexOf==-1 ? QString() : filename.mid(indexOf + 1);
+			QStringList filter;
+			if (!extension.isEmpty()) {
+				filter << tr("%1 file (*.%1)").arg(extension);
+			}
+			filter << tr("All files (*)");
+
+			QString lastDir = Config::value("lgpDialogOpenDirectory").toString();
+			if (!lastDir.isEmpty()) {
+				filename = lastDir + "/" + filename;
+			}
+
+			QString path = QFileDialog::getOpenFileName(this, tr("New File"), filename, filter.join(";;"));
+			if (path.isNull()) {
+				return;
+			}
+
+			Config::setValue("lgpDialogOpenDirectory", path.left(path.lastIndexOf('/')));
+
+			if (!static_cast<LgpFileItem *>(item)->setFile(new QFile(path))) {
+				QMessageBox::warning(this, tr("Error"), tr("Can not modify the archive!"));
+			} else {
+				emit modified();
+			}
+		}
+	}
+}
+
+void LgpWidget::extractCurrent()
+{
+	QModelIndex index = treeView->currentIndex();
+	if (index.isValid()) {
+		LgpItem *item = _model->item(index);
+		if (item && !item->isDirectory()) {
+			QString filename = item->name();
+			int index = filename.lastIndexOf('.');
+			QString extension = index==-1 ? QString() : filename.mid(index + 1);
+			QStringList filter;
+			if (!extension.isEmpty()) {
+				filter.append(tr("%1 file (*.%1)").arg(extension));
+			}
+			filter.append(tr("All files (*)"));
+
+			QString lastDir = Config::value("lgpDialogSaveDirectory").toString();
+			if (!lastDir.isEmpty()) {
+				filename = lastDir + "/" + filename;
+			}
+
+			QString path = QFileDialog::getSaveFileName(this, tr("Extract file"), filename, filter.join(";;"));
+			if (path.isNull()) {
+				return;
+			}
+
+			Config::setValue("lgpDialogSaveDirectory", path.left(path.lastIndexOf('/')));
+
+			QIODevice *io = static_cast<LgpFileItem *>(item)->file();
+			if (io && io->open(QIODevice::ReadOnly)) {
+				QFile file(path);
+				if (file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+					while (io->bytesAvailable()) {
+						file.write(io->read(4096));
+					}
+					if (file.error() != QFile::NoError) {
+						QMessageBox::warning(this, tr("Write error"), tr("Can not write to file (message: %1).")
+											 .arg(file.errorString()));
+					}
+					file.close();
+				} else {
+					QMessageBox::warning(this, tr("Opening error"), tr("Can not open the file (message: %1).")
+										 .arg(file.errorString()));
+				}
+				io->close();
+			}
+		}
+	}
+}
+
+void LgpWidget::extractAll()
+{
+	QString lastDir = Config::value("lgpDialogSaveDirectory").toString();
+
+	QString path = QFileDialog::getExistingDirectory(this, tr("Extract all"), lastDir);
+	if (path.isNull()) {
+		return;
+	}
+
+	Config::setValue("lgpDialogSaveDirectory", path);
+
+	progressDialog = new QProgressDialog(tr("Extracting..."), tr("Cancel"), 0, 0, this,
+	                                     Qt::Dialog | Qt::WindowCloseButtonHint);
+	progressDialog->setWindowModality(Qt::WindowModal);
+	progressDialog->setAutoClose(false);
+	progressDialog->show();
+
+	QDir dir(path);
+	QString error;
+
+	setObserverMaximum(lgp->fileCount());
+	int i = 0;
+
+	for (const QString &fileName : lgp->fileList()) {
+		if (observerWasCanceled()) {
+			break;
+		}
+
+		QIODevice *io = lgp->file(fileName);
+		if (io && io->open(QIODevice::ReadOnly)) {
+			int index = fileName.lastIndexOf('/');
+			if (index > 0) {
+				dir.mkpath(fileName.left(index));
+			}
+			QFile file(dir.filePath(fileName));
+			if (file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+				while (io->bytesAvailable()) {
+					file.write(io->read(4096));
+				}
+				if (file.error() != QFile::NoError) {
+					error = file.errorString();
+				}
+				file.close();
+			} else {
+				error = file.errorString();
+			}
+			io->close();
+		}
+
+		setObserverValue(i++);
+	}
+
+	progressDialog->hide();
+	progressDialog->deleteLater();
+	progressDialog = 0;
+
+	if (!error.isEmpty()) {
+		QMessageBox::warning(this, tr("Error"), error);
+	}
+}
+
+void LgpWidget::add()
+{
+	QString dirName;
+	QModelIndex index = treeView->currentIndex();
+	if (index.isValid()) {
+		LgpItem *item = _model->item(index);
+		if (item) {
+			dirName = item->isDirectory() ? item->path() : item->dirName();
+		}
+	}
+
+	QString lastDir = Config::value("lgpDialogOpenDirectory").toString();
+
+	QStringList filter;
+	filter.append(tr("All files (*)"));
+	QStringList paths = QFileDialog::getOpenFileNames(this, tr("New File"), lastDir, filter.join(";;"));
+	if (paths.isEmpty()) {
+		return;
+	}
+
+	QString path = paths.first(),
+	        directory = path.left(path.lastIndexOf('/'));
+	Config::setValue("lgpDialogOpenDirectory", directory);
+
+	for (const QString &path : qAsConst(paths)) {
+		QString filePath = path.mid(path.lastIndexOf('/') + 1);
+
+		if (!dirName.isEmpty()) {
+			filePath = dirName + "/" + filePath;
+		}
+
+		bool rename = false;
+		
+		do {
+			if (!lgp->isNameValid(filePath)) {
+				QMessageBox::warning(this, tr("Error"),
+									 tr("The name '%1' is invalid, don't put special characters.")
+									 .arg(filePath));
+				rename = true;
+			} else if (lgp->fileExists(filePath)) {
+				QMessageBox::warning(this, tr("Error"),
+									 tr("A file named '%1' already exists, please choose another name.")
+									 .arg(filePath));
+				rename = true;
+			} else {
+				rename = false;
+			}
+
+			if (rename) {
+				bool ok;
+				filePath = QInputDialog::getText(this, tr("Rename"),
+												 tr("New Name:"), QLineEdit::Normal,
+												 filePath, &ok,
+												 Qt::Dialog | Qt::WindowCloseButtonHint);
+				if (!ok) {
+					return;
+				}
+			}
+		} while (rename);
+
+		if (!_model->insertRow(filePath, new QFile(path))) {
+			QMessageBox::critical(this, tr("Error"),
+			                      tr("Can not add the file '%1'")
+			                      .arg(path));
+		} else {
+			treeView->scrollTo(_model->index(_model->rowCount() - 1, 0));
+			emit modified();
+		}
+	}
+}
+
+void LgpWidget::removeCurrent()
+{
+	QModelIndex index = treeView->currentIndex();
+	if (index.isValid()) {
+		QMessageBox::StandardButton button = QMessageBox::question(this, tr("Delete?"),
+							  tr("Are you sure you want to delete this file from the archive?"),
+							  QMessageBox::Yes | QMessageBox::Cancel);
+		if (button != QMessageBox::Yes) {
+			return;
+		}
+
+		if (_model->removeRow(index)) {
+			emit modified();
+		} else {
+			QMessageBox::warning(this, tr("Error"), tr("Cannot delete the file!"));
+		}
+	}
+}
+
+bool LgpWidget::observerWasCanceled() const
+{
+	return progressDialog && progressDialog->wasCanceled();
+}
+
+void LgpWidget::setObserverMaximum(unsigned int max)
+{
+	if (progressDialog) {
+		progressDialog->setMaximum(max);
+	}
+}
+
+void LgpWidget::setObserverValue(int value)
+{
+	QApplication::processEvents();
+
+	if (progressDialog) {
+		progressDialog->setValue(value);
+	}
+}
+
+bool LgpWidget::observerRetry(const QString &message)
+{
+	return QMessageBox::Retry == QMessageBox::question(this, tr("Error"), message,
+	                                                   QMessageBox::Retry | QMessageBox::Cancel, QMessageBox::Retry);
+}
+
+void LgpWidget::setButtonsState()
+{
+	QModelIndexList modelIndexList = treeView->selectionModel()->selectedRows();
+	LgpItem *item;
+	if (!modelIndexList.isEmpty()) {
+		item = _model->item(modelIndexList.first());
+	} else {
+		item = 0;
+	}
+	bool enabled = !modelIndexList.isEmpty() &&
+	               item &&
+	               !item->isDirectory();
+
+	renameButton->setEnabled(enabled);
+	replaceButton->setEnabled(enabled);
+	extractButton->setEnabled(enabled);
+	removeButton->setEnabled(enabled);
+}
diff -Nru makoureactor-1.7.2/widgets/LgpWidget.h makoureactor-1.8.0/widgets/LgpWidget.h
--- makoureactor-1.7.2/widgets/LgpWidget.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/LgpWidget.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,225 @@
+/****************************************************************************
+ ** Makou Reactor Final Fantasy VII Field Script Editor
+ ** Copyright (C) 2009-2013 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#ifndef LGPDIALOG_H
+#define LGPDIALOG_H
+
+#include <QtWidgets>
+#include "core/Lgp.h"
+#include "ArchivePreview.h"
+
+class IconThread : public QThread
+{
+	Q_OBJECT
+public:
+	explicit IconThread(QObject *parent = 0);
+	~IconThread();
+
+	void clear();
+	void addFile(const QString &filePath);
+signals:
+	void iconLoaded(const QString &filePath, const QIcon &icon) const;
+protected:
+	void run();
+private:
+	QMutex mutexFiles;
+	QWaitCondition hasFilesCondition;
+	bool abort;
+
+	QQueue<QString> _files;
+	QMap<QString, QIcon> cacheIcon;
+};
+
+class LgpDirectoryItem;
+
+class LgpItem
+{
+public:
+	explicit LgpItem(const QString &name, LgpDirectoryItem *parent = 0) :
+		_name(name), _parent(parent) {
+	}
+	virtual ~LgpItem() {
+	}
+
+	inline LgpDirectoryItem *parent() const {
+		return _parent;
+	}
+	inline void setParent(LgpDirectoryItem *parent) {
+		_parent = parent;
+	}
+
+	LgpDirectoryItem *root();
+
+	virtual bool isDirectory() const=0;
+	inline bool isFile() const {
+		return !isDirectory();
+	}
+	inline const QString &name() const {
+		return _name;
+	}
+	inline void setName(const QString &name) {
+		_name = name;
+	}
+	QString path() const;
+	QString dirName() const;
+	int id() const;
+
+	virtual LgpItem *find(const QString &path);
+
+	virtual void debug() const=0;
+private:
+	QString _name;
+	LgpDirectoryItem *_parent;
+};
+
+class LgpFileItem : public LgpItem
+{
+public:
+	LgpFileItem(const QString &name, Lgp *lgp, LgpDirectoryItem *parent = 0) :
+		LgpItem(name, parent), _lgp(lgp) {
+	}
+	virtual ~LgpFileItem() {
+	}
+
+	inline bool isDirectory() const {
+		return false;
+	}
+
+	qint64 fileSize();
+	QIODevice *file();
+	bool setFile(QIODevice *io);
+	void setIcon(const QIcon &icon);
+	const QIcon &icon() const;
+	bool move(const QString &destination);
+	void debug() const;
+
+private:
+	QIcon _icon;
+	Lgp *_lgp;
+};
+
+class LgpDirectoryItem : public LgpItem
+{
+public:
+	enum SortType {
+		ByName,
+		BySize
+	};
+
+	explicit LgpDirectoryItem(const QString &name, LgpDirectoryItem *parent = 0) :
+		LgpItem(name, parent) {
+	}
+	virtual ~LgpDirectoryItem();
+
+	inline bool isDirectory() const {
+		return true;
+	}
+
+	inline LgpItem *child(int row) {
+		return _childItems.at(row);
+	}
+
+	inline int indexOfChild(const LgpItem *child) const {
+		return _childItems.indexOf(const_cast<LgpItem *>(child));
+	}
+
+	inline int childCount() const {
+		return _childItems.size();
+	}
+
+	void sort(SortType type, Qt::SortOrder order);
+	bool unrefChild(LgpItem *child);
+	void renameChild(LgpItem *child, const QString &destination);
+	bool removeChild(LgpItem *child);
+	bool removeChildren(int position, int count);
+	void addChild(const QString &name, Lgp *lgp);
+	void addChild(const QString &name, LgpFileItem *item);
+	LgpItem *find(const QString &path);
+	void debug() const;
+private:
+	QHash<QString, LgpFileItem *> _fileChilds;
+	QHash<QString, LgpDirectoryItem *> _dirChilds;
+	QList<LgpItem *> _childItems;
+};
+
+class LgpItemModel : public QAbstractItemModel
+{
+	Q_OBJECT
+public:
+	explicit LgpItemModel(Lgp *lgp, QObject *parent=0);
+	~LgpItemModel();
+	QModelIndex index(int row, int column, const QModelIndex &parent=QModelIndex()) const;
+	QModelIndex parent(const QModelIndex &index) const;
+	int rowCount(const QModelIndex &parent=QModelIndex()) const;
+	int columnCount(const QModelIndex &parent=QModelIndex()) const;
+	QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const;
+	bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole);
+	QVariant headerData(int section, Qt::Orientation orientation, int role=Qt::DisplayRole) const;
+	void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
+	bool insertRow(const QString &name, QIODevice *io, const QModelIndex &parent=QModelIndex());
+	bool insertRows(int row, int count, const QModelIndex &parent=QModelIndex());
+	bool removeRow(const QModelIndex &index);
+	bool removeRows(int row, int count, const QModelIndex &parent=QModelIndex());
+	void update(const QModelIndex &index);
+	LgpItem *item(const QModelIndex &index) const;
+private slots:
+	void setIcon(const QString &path, const QIcon &icon);
+private:
+//	IconThread iconThread;
+	QIcon fileIcon, directoryIcon;
+	LgpDirectoryItem *root;
+	Lgp *_lgp;
+};
+
+class LgpWidget : public QWidget, ArchiveObserver
+{
+	Q_OBJECT
+public:
+	explicit LgpWidget(Lgp *lgp, QWidget *parent = nullptr);
+
+	bool observerWasCanceled() const;
+	void setObserverMaximum(unsigned int max);
+	void setObserverValue(int value);
+	bool observerRetry(const QString &message);
+signals:
+	void modified();
+private slots:
+	void changePreview();
+	void changeImageInPreview(int imageID);
+	void changeImagePaletteInPreview(int palID);
+	void renameCurrent();
+	void replaceCurrent();
+	void extractCurrent();
+	void extractAll();
+	void add();
+	void removeCurrent();
+	void setButtonsState();
+private:
+	void generatePreview();
+	Lgp *lgp;
+	QTreeView *treeView;
+	QPushButton *extractButton, *extractAllButton, *renameButton,
+	            *replaceButton, *addButton,
+	            *removeButton;
+	QProgressDialog *progressDialog;
+	LgpItemModel *_model;
+	ArchivePreview *preview;
+	FieldModelFilePC fieldModelFile;
+	int currentImage, currentPal;
+};
+
+#endif // LGPDIALOG_H
diff -Nru makoureactor-1.7.2/widgets/Listwidget.cpp makoureactor-1.8.0/widgets/Listwidget.cpp
--- makoureactor-1.7.2/widgets/Listwidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/Listwidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -26,12 +26,8 @@
 	_toolBar = new QToolBar(this);
 	_toolBar->setIconSize(QSize(16, 16));
 
-	QFont font;
-	font.setPointSize(8);
-
 	_listWidget = new QListWidget(this);
 	_listWidget->setUniformItemSizes(true);
-	_listWidget->setFont(font);
 
 	QVBoxLayout *layout = new QVBoxLayout(this);
 	layout->addWidget(_toolBar);
@@ -41,7 +37,7 @@
 
 void ListWidget::addSeparator(bool invisible)
 {
-	if(!invisible) {
+	if (!invisible) {
 		_toolBar->addSeparator();
 	}
 	QAction *action = new QAction(_listWidget);
@@ -56,7 +52,7 @@
 	QKeySequence shortcut;
 	QAction *action;
 
-	switch(type) {
+	switch (type) {
 	case Add:
 		icon = QIcon(":images/plus.png");
 		shortcut = QKeySequence("Ctrl++");
@@ -87,7 +83,7 @@
 		break;
 	}
 
-	if(invisible) {
+	if (invisible) {
 		action = new QAction(icon, text, this);
 		connect(action, SIGNAL(triggered()), receiver, member);
 	} else {
diff -Nru makoureactor-1.7.2/widgets/MassExportDialog.cpp makoureactor-1.8.0/widgets/MassExportDialog.cpp
--- makoureactor-1.7.2/widgets/MassExportDialog.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/MassExportDialog.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -20,7 +20,7 @@
 
 MassExportDialog::MassExportDialog(QWidget *parent) :
 	QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint),
-	_fieldArchive(0), _currentField(-1)
+	_fieldArchive(0), _currentMapId(-1)
 {
 	setWindowTitle(tr("Mass Export"));
 
@@ -38,23 +38,24 @@
 	listLayout->addWidget(fieldList, 1);
 
 	exports.insert(Fields,
-				   new FormatSelectionWidget(tr("Export fields"),
-											 QStringList(), this));
+	               new FormatSelectionWidget(tr("Export fields"),
+	                                         QStringList(), this));
 	exports.insert(Backgrounds,
-				   new FormatSelectionWidget(tr("Export backgrounds"),
-											 QStringList() <<
-											 tr("PNG image") + ";;png" <<
-											 tr("JPG image") + ";;jpg" <<
-											 tr("BMP image") + ";;bmp", this));
+	               new FormatSelectionWidget(tr("Export backgrounds"),
+	                                         QStringList() <<
+	                                             tr("PNG image") + ";;png" <<
+	                                             tr("JPG image") + ";;jpg" <<
+	                                             tr("BMP image") + ";;bmp", this));
 	exports.insert(Akaos,
-				   new FormatSelectionWidget(tr("Export sounds"),
-											 QStringList() <<
-											 tr("AKAO sound") + ";;akao", this));
+	               new FormatSelectionWidget(tr("Export musics"),
+	                                         QStringList() <<
+	                                             tr("AKAO music") + ";;akao" <<
+	                                             tr("PSF MIDI") + ";;minipsf", this));
 	exports.insert(Texts,
-				   new FormatSelectionWidget(tr("Export texts"),
-											 QStringList() <<
-											 tr("XML Text") + ";;xml" <<
-											 tr("Simple text TXT") + ";;txt", this));
+	               new FormatSelectionWidget(tr("Export texts"),
+	                                         QStringList() <<
+	                                             tr("XML Text") + ";;xml" <<
+	                                             tr("Simple text TXT") + ";;txt", this));
 
 	exports.value(Backgrounds)->setCurrentFormat(Config::value("exportBackgroundFormat").toString());
 
@@ -72,7 +73,7 @@
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addLayout(listLayout, 0, 0, 3 + exports.size(), 1);
 	int row = 0;
-	foreach(FormatSelectionWidget *formatSelection, exports) {
+	for (FormatSelectionWidget *formatSelection : qAsConst(exports)) {
 		layout->addWidget(formatSelection, row++, 1, 1, 2);
 	}
 	layout->addWidget(new QLabel(tr("Export directory:")), row, 1, 1, 2);
@@ -89,10 +90,10 @@
 	fieldList->setFocus();
 }
 
-void MassExportDialog::fill(const FieldArchive *fieldArchive, int currentField)
+void MassExportDialog::fill(const FieldArchive *fieldArchive, int currentMapId)
 {
 	_fieldArchive = fieldArchive;
-	_currentField = currentField;
+	_currentMapId = currentMapId;
 
 	QString fieldType = _fieldArchive->isPC() ? tr("PC") : tr("PS");
 	QStringList formats;
@@ -102,11 +103,12 @@
 	exports.value(Fields)->setFormats(formats);
 
 	fieldList->clear();
-	for(int i=0 ; i<_fieldArchive->size() ; ++i) {
-		const Field *field = _fieldArchive->field(i);
-		if(field) {
+	FieldArchiveIterator it(*_fieldArchive);
+	while (it.hasNext()) {
+		const Field *field = it.next(false);
+		if (field != nullptr) {
 			QListWidgetItem *item = new QListWidgetItem(field->name());
-			item->setData(Qt::UserRole, i);
+			item->setData(Qt::UserRole, it.mapId());
 			fieldList->addItem(item);
 		}
 	}
@@ -116,23 +118,23 @@
 void MassExportDialog::chooseExportDirectory()
 {
 	QString dir = QFileDialog::getExistingDirectory(this, tr("Choose a directory"), directory());
-	if(dir.isNull())	return;
+	if (dir.isNull())	return;
 
 	dirPath->setText(dir);
 }
 
 void MassExportDialog::selectCurrentField()
 {
-	if(_currentField < 0) {
+	if (_currentMapId < 0) {
 		return;
 	}
 
 	fieldList->clearSelection();
 
-	for(int row=0 ; row<fieldList->count() ; ++row) {
+	for (int row=0; row<fieldList->count(); ++row) {
 		QListWidgetItem *item = fieldList->item(row);
-		if(item->data(Qt::UserRole).toInt() == _currentField) {
-			fieldList->setItemSelected(item, true);
+		if (item->data(Qt::UserRole).toInt() == _currentMapId) {
+			item->setSelected(true);
 			fieldList->scrollToItem(item);
 			return;
 		}
@@ -145,7 +147,7 @@
 
 	QList<QListWidgetItem *> items = fieldList->selectedItems();
 
-	foreach(QListWidgetItem *item, items) {
+	for (QListWidgetItem *item : qAsConst(items)) {
 		ids.append(item->data(Qt::UserRole).toInt());
 	}
 
diff -Nru makoureactor-1.7.2/widgets/MassExportDialog.h makoureactor-1.8.0/widgets/MassExportDialog.h
--- makoureactor-1.7.2/widgets/MassExportDialog.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/MassExportDialog.h	2020-08-08 18:46:56.000000000 +0000
@@ -31,7 +31,7 @@
 	};
 
 	explicit MassExportDialog(QWidget *parent = 0);
-	void fill(const FieldArchive *fieldArchive, int currentField);
+	void fill(const FieldArchive *fieldArchive, int currentMapId);
 	QList<int> selectedFields() const;
 	bool exportModule(ExportType type) const;
 	const QString &moduleFormat(ExportType type) const;
@@ -48,7 +48,7 @@
 	QCheckBox *overwriteIfExists;
 
 	const FieldArchive *_fieldArchive;
-	int _currentField;
+	int _currentMapId;
 protected:
 	void accept();
 };
diff -Nru makoureactor-1.7.2/widgets/MassImportDialog.cpp makoureactor-1.8.0/widgets/MassImportDialog.cpp
--- makoureactor-1.7.2/widgets/MassImportDialog.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/MassImportDialog.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -20,7 +20,7 @@
 
 MassImportDialog::MassImportDialog(QWidget *parent) :
 	QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint),
-	_fieldArchive(0), _currentField(-1)
+	_fieldArchive(0), _currentMapId(-1)
 {
 	setWindowTitle(tr("Mass Import"));
 
@@ -61,7 +61,7 @@
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addLayout(listLayout, 0, 0, 3 + imports.size(), 1);
 	int row = 0;
-	foreach(FormatSelectionWidget *formatSelection, imports) {
+	for (FormatSelectionWidget *formatSelection : qAsConst(imports)) {
 		layout->addWidget(formatSelection, row++, 1, 1, 2);
 	}
 	layout->addWidget(new QLabel(tr("Source directory:")), row, 1, 1, 2);
@@ -77,10 +77,10 @@
 	fieldList->setFocus();
 }
 
-void MassImportDialog::fill(const FieldArchive *fieldArchive, int currentField)
+void MassImportDialog::fill(const FieldArchive *fieldArchive, int currentMapId)
 {
 	_fieldArchive = fieldArchive;
-	_currentField = currentField;
+	_currentMapId = currentMapId;
 
 	QString fieldType = _fieldArchive->isPC() ? tr("PC") : tr("PS");
 	QStringList formats;
@@ -90,11 +90,12 @@
 	imports.value(Fields)->setFormats(formats);
 
 	fieldList->clear();
-	for(int i=0 ; i<_fieldArchive->size() ; ++i) {
-		const Field *field = _fieldArchive->field(i);
-		if(field) {
+	FieldArchiveIterator it(*_fieldArchive);
+	while (it.hasNext()) {
+		const Field *field = it.next(false);
+		if (field) {
 			QListWidgetItem *item = new QListWidgetItem(field->name());
-			item->setData(Qt::UserRole, i);
+			item->setData(Qt::UserRole, it.mapId());
 			fieldList->addItem(item);
 		}
 	}
@@ -104,23 +105,23 @@
 void MassImportDialog::chooseImportDirectory()
 {
 	QString dir = QFileDialog::getExistingDirectory(this, tr("Choose a directory"), directory());
-	if(dir.isNull())	return;
+	if (dir.isNull())	return;
 
 	dirPath->setText(dir);
 }
 
 void MassImportDialog::selectCurrentField()
 {
-	if(_currentField < 0) {
+	if (_currentMapId < 0) {
 		return;
 	}
 
 	fieldList->clearSelection();
 
-	for(int row=0 ; row<fieldList->count() ; ++row) {
+	for (int row=0; row<fieldList->count(); ++row) {
 		QListWidgetItem *item = fieldList->item(row);
-		if(item->data(Qt::UserRole).toInt() == _currentField) {
-			fieldList->setItemSelected(item, true);
+		if (item->data(Qt::UserRole).toInt() == _currentMapId) {
+			item->setSelected(true);
 			fieldList->scrollToItem(item);
 			return;
 		}
@@ -133,7 +134,7 @@
 
 	QList<QListWidgetItem *> items = fieldList->selectedItems();
 
-	foreach(QListWidgetItem *item, items) {
+	for (QListWidgetItem *item : qAsConst(items)) {
 		ids.append(item->data(Qt::UserRole).toInt());
 	}
 
diff -Nru makoureactor-1.7.2/widgets/MassImportDialog.h makoureactor-1.8.0/widgets/MassImportDialog.h
--- makoureactor-1.7.2/widgets/MassImportDialog.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/MassImportDialog.h	2020-08-08 18:46:56.000000000 +0000
@@ -31,7 +31,7 @@
 	};
 
 	explicit MassImportDialog(QWidget *parent = 0);
-	void fill(const FieldArchive *fieldArchive, int currentField);
+	void fill(const FieldArchive *fieldArchive, int currentMapId);
 	QList<int> selectedFields() const;
 	bool importModule(ImportType type) const;
 	const QString &moduleFormat(ImportType type) const;
@@ -46,7 +46,7 @@
 	QPushButton *changeDir;
 
 	const FieldArchive *_fieldArchive;
-	int _currentField;
+	int _currentMapId;
 protected:
 	void accept();
 };
diff -Nru makoureactor-1.7.2/widgets/ModelColorsLayout.cpp makoureactor-1.8.0/widgets/ModelColorsLayout.cpp
--- makoureactor-1.7.2/widgets/ModelColorsLayout.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ModelColorsLayout.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -1,46 +1,46 @@
 #include "ModelColorsLayout.h"
 
-ModelColorLayout::ModelColorLayout(QWidget *parent) :
-    QHBoxLayout(parent)
+ModelColorWidget::ModelColorWidget(QWidget *parent) :
+      QObject(parent)
 {
-	colorWidget = new ColorDisplay(parent);
-	colorWidget->setColors(QList<QRgb>() << Qt::black);
-	addWidget(colorWidget);
-
-	for(quint8 i = 0; i < 3; ++i) {
-		dirWidget[i] = new QSpinBox(parent);
-		dirWidget[i]->setRange(-32768, 32767);
-		addWidget(dirWidget[i]);
-		connect(dirWidget[i], SIGNAL(editingFinished()), SLOT(relayEdition()));
+	_colorWidget = new ColorDisplay(parent);
+	_colorWidget->setColors(QList<QRgb>() << Qt::black);
+
+	for (quint8 i = 0; i < 3; ++i) {
+		_dirWidget[i] = new QSpinBox(parent);
+		_dirWidget[i]->setRange(-32768, 32767);
+		connect(_dirWidget[i], SIGNAL(editingFinished()), SLOT(relayEdition()));
 	}
 
-	colorWidget->setMinimumSize(dirWidget[0]->minimumSizeHint());
+	_dirWidget[0]->adjustSize();
+	_colorWidget->setMinimumWidth(_dirWidget[0]->height());
+	_colorWidget->setMinimumHeight(_dirWidget[0]->height());
 
-	connect(colorWidget, SIGNAL(colorEdited(int,QRgb)), SLOT(relayEdition()));
+	connect(_colorWidget, SIGNAL(colorEdited(int,QRgb)), SLOT(relayEdition()));
 }
 
-void ModelColorLayout::relayEdition()
+void ModelColorWidget::relayEdition()
 {
 	emit colorDirEdited(FieldModelColorDir(
-	                        dirWidget[0]->value(),
-	                        dirWidget[1]->value(),
-	                        dirWidget[2]->value(),
-	                        colorWidget->colors().first()));
+	                        _dirWidget[0]->value(),
+	                        _dirWidget[1]->value(),
+	                        _dirWidget[2]->value(),
+	                        _colorWidget->colors().first()));
 }
 
-void ModelColorLayout::setModelColorDir(const FieldModelColorDir &dir)
+void ModelColorWidget::setModelColorDir(const FieldModelColorDir &dir)
 {
-	colorWidget->setColors(QList<QRgb>() << dir.color);
-	dirWidget[0]->setValue(dir.dirA);
-	dirWidget[1]->setValue(dir.dirB);
-	dirWidget[2]->setValue(dir.dirC);
+	_colorWidget->setColors(QList<QRgb>() << dir.color);
+	_dirWidget[0]->setValue(dir.dirA);
+	_dirWidget[1]->setValue(dir.dirB);
+	_dirWidget[2]->setValue(dir.dirC);
 }
 
-void ModelColorLayout::setReadOnly(bool ro)
+void ModelColorWidget::setReadOnly(bool ro)
 {
-	colorWidget->setReadOnly(ro);
-	for(quint8 i = 0; i < 3; ++i) {
-		dirWidget[i]->setReadOnly(ro);
+	_colorWidget->setReadOnly(ro);
+	for (quint8 i = 0; i < 3; ++i) {
+		_dirWidget[i]->setReadOnly(ro);
 	}
 }
 
@@ -52,29 +52,32 @@
 	addWidget(new QLabel(tr("Y")), 0, 2);
 	addWidget(new QLabel(tr("Z")), 0, 3);
 
-	for(quint8 i = 0; i < 3; ++i) {
-		modelColorLayout[i] = new ModelColorLayout(parent);
-		addLayout(modelColorLayout[i], i + 1, 0, 1, 4);
+	for (quint8 i = 0; i < 3; ++i) {
+		modelColorWidget[i] = new ModelColorWidget(parent);
+		addWidget(modelColorWidget[i]->colorWidget(), i + 1, 0);
+		addWidget(modelColorWidget[i]->dirWidget(0), i + 1, 1);
+		addWidget(modelColorWidget[i]->dirWidget(1), i + 1, 2);
+		addWidget(modelColorWidget[i]->dirWidget(2), i + 1, 3);
 	}
 
-	connect(modelColorLayout[0], SIGNAL(colorDirEdited(FieldModelColorDir)),
+	connect(modelColorWidget[0], SIGNAL(colorDirEdited(FieldModelColorDir)),
 	        SLOT(relayColorDirEdited0(FieldModelColorDir)));
-	connect(modelColorLayout[1], SIGNAL(colorDirEdited(FieldModelColorDir)),
+	connect(modelColorWidget[1], SIGNAL(colorDirEdited(FieldModelColorDir)),
 	        SLOT(relayColorDirEdited1(FieldModelColorDir)));
-	connect(modelColorLayout[2], SIGNAL(colorDirEdited(FieldModelColorDir)),
+	connect(modelColorWidget[2], SIGNAL(colorDirEdited(FieldModelColorDir)),
 	        SLOT(relayColorDirEdited2(FieldModelColorDir)));
 }
 
 void ModelColorsLayout::setModelColorDirs(const QList<FieldModelColorDir> &dirs)
 {
-	for(quint8 i = 0; i < 3; ++i) {
-		modelColorLayout[i]->setModelColorDir(dirs.at(i));
+	for (quint8 i = 0; i < 3; ++i) {
+		modelColorWidget[i]->setModelColorDir(dirs.at(i));
 	}
 }
 
 void ModelColorsLayout::setReadOnly(bool ro)
 {
-	for(quint8 i = 0; i < 3; ++i) {
-		modelColorLayout[i]->setReadOnly(ro);
+	for (quint8 i = 0; i < 3; ++i) {
+		modelColorWidget[i]->setReadOnly(ro);
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/ModelColorsLayout.h makoureactor-1.8.0/widgets/ModelColorsLayout.h
--- makoureactor-1.7.2/widgets/ModelColorsLayout.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ModelColorsLayout.h	2020-08-08 18:46:56.000000000 +0000
@@ -5,20 +5,26 @@
 #include "ColorDisplay.h"
 #include "core/field/FieldModelLoader.h"
 
-class ModelColorLayout : public QHBoxLayout
+class ModelColorWidget : public QObject
 {
 	Q_OBJECT
 public:
-	explicit ModelColorLayout(QWidget *parent = 0);
+	explicit ModelColorWidget(QWidget *parent = 0);
 	void setModelColorDir(const FieldModelColorDir &dir);
 	void setReadOnly(bool ro);
+	inline ColorDisplay *colorWidget() const {
+		return _colorWidget;
+	}
+	inline QSpinBox *dirWidget(int id) const {
+		return _dirWidget[id];
+	}
 signals:
 	void colorDirEdited(const FieldModelColorDir &colorDir);
 private slots:
 	void relayEdition();
 private:
-	ColorDisplay *colorWidget;
-	QSpinBox *dirWidget[3];
+	ColorDisplay *_colorWidget;
+	QSpinBox *_dirWidget[3];
 };
 
 class ModelColorsLayout : public QGridLayout
@@ -42,7 +48,7 @@
 	}
 
 private:
-	ModelColorLayout *modelColorLayout[3];
+	ModelColorWidget *modelColorWidget[3];
 };
 
 #endif // MODELCOLORSLAYOUT_H
diff -Nru makoureactor-1.7.2/widgets/ModelManager.cpp makoureactor-1.8.0/widgets/ModelManager.cpp
--- makoureactor-1.7.2/widgets/ModelManager.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ModelManager.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,7 +19,7 @@
 #include "core/Config.h"
 #include "Data.h"
 
-ModelManager::ModelManager(const QGLWidget *shareWidget, QWidget *parent) :
+ModelManager::ModelManager(QWidget *parent) :
 	QDialog(parent, Qt::Tool), _field(0), fieldModelLoader(0)
 {
 	setWindowTitle(tr("Field Models"));
@@ -30,7 +30,8 @@
 	models = new QTreeWidget();
 	models->setIndentation(0);
 	models->setHeaderLabel(tr("Field Models"));
-	models->setFixedWidth(120);
+	models->setFixedWidth(
+	    models->fontMetrics().boundingRect("WWWWWWWWWWWWWWW").width());
 	models->setColumnCount(1);
 
 	modelFrame = new QFrame();
@@ -49,11 +50,12 @@
 
 	modelAnims = new QTreeWidget();
 	modelAnims->setIndentation(0);
-	modelAnims->setFixedWidth(142);
+	modelAnims->setFixedWidth(
+	    models->fontMetrics().boundingRect("WWWWWWWWWWWWWWW").width());
 	modelAnims->setEditTriggers(QAbstractItemView::NoEditTriggers);
 
-	if(Config::value("OpenGL", true).toBool()) {
-		modelPreview = new FieldModel(0, shareWidget);
+	if (Config::value("OpenGL", true).toBool()) {
+		modelPreview = new FieldModel();
 		modelWidget = modelPreview;
 		modelPreview->setFixedSize(304, 214);
 	} else {
@@ -73,7 +75,7 @@
 
 	models->clear();
 	modelAnims->clear();
-	if(modelPreview)	modelPreview->clear();
+	if (modelPreview)	modelPreview->clear();
 
 	models->blockSignals(false);
 	modelAnims->blockSignals(false);
@@ -81,11 +83,11 @@
 
 void ModelManager::fill(Field *field, bool reload)
 {
-	if(!reload && _field == field)	return;
+	if (!reload && _field == field)	return;
 
 	clear();
 
-	if(!field->fieldModelLoader()->isOpen()) {
+	if (!field->fieldModelLoader()->isOpen()) {
 		return;
 	}
 
@@ -95,7 +97,7 @@
 	fillModelList();
 
 	QTreeWidgetItem *currentItem = models->topLevelItem(Data::currentModelID);
-	if(currentItem) {
+	if (currentItem) {
 		models->setCurrentItem(currentItem);
 	} else {
 		models->setCurrentItem(models->topLevelItem(0));
@@ -108,7 +110,7 @@
 void ModelManager::fillModelList()
 {
 	models->blockSignals(true);
-	foreach(const QStringList &name, modelNames()) {
+	for (const QStringList &name : modelNames()) {
 		QTreeWidgetItem *item = new QTreeWidgetItem(name);
 		item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
 		models->addTopLevelItem(item);
@@ -118,9 +120,9 @@
 
 int ModelManager::currentModelID(QTreeWidgetItem *item) const
 {
-	if(!item) {
+	if (!item) {
 		item = models->currentItem();
-		if(!item)	return -1;
+		if (!item)	return -1;
 	}
 	return models->indexOfTopLevelItem(item);
 }
@@ -128,7 +130,7 @@
 QList<int> ModelManager::selectedModelIDs() const
 {
 	QList<int> modelIDs;
-	foreach(QTreeWidgetItem *item, models->selectedItems()) {
+	for (QTreeWidgetItem *item : models->selectedItems()) {
 		modelIDs.append(models->indexOfTopLevelItem(item));
 	}
 	return modelIDs;
@@ -136,9 +138,9 @@
 
 int ModelManager::currentAnimID(QTreeWidgetItem *item) const
 {
-	if(!item) {
+	if (!item) {
 		item = modelAnims->currentItem();
-		if(!item)	return -1;
+		if (!item)	return -1;
 	}
 	return modelAnims->indexOfTopLevelItem(item);
 }
@@ -146,7 +148,7 @@
 void ModelManager::showModelInfos(QTreeWidgetItem *item, QTreeWidgetItem *previous)
 {
 	Q_UNUSED(previous);
-	if(item == NULL) {
+	if (item == nullptr) {
 		modelFrame->setEnabled(false);
 		return;
 	}
@@ -154,19 +156,19 @@
 	int modelID = currentModelID(item);
 	modelAnims->clear();
 
-	if(modelID < 0 || modelID >= fieldModelLoader->modelCount()) {
+	if (modelID < 0 || modelID >= fieldModelLoader->modelCount()) {
 		return;
 	}
 
 	modelAnims->addTopLevelItems(animItems(modelID));
 
-	for(int i=0 ; i<modelAnims->columnCount() ; ++i) {
+	for (int i=0; i<modelAnims->columnCount(); ++i) {
 		modelAnims->resizeColumnToContents(i);
 	}
 
 	showModelInfos2(modelID);
 
-	if(modelAnims->topLevelItemCount() > 0)
+	if (modelAnims->topLevelItemCount() > 0)
 		modelAnims->setCurrentItem(modelAnims->topLevelItem(0));
 }
 
@@ -193,7 +195,7 @@
 void ModelManager::setModelUnknown(int unknown)
 {
 	int modelID = currentModelID();
-	if(modelID < 0)	return;
+	if (modelID < 0)	return;
 
 	fieldModelLoader->setUnknown(modelID, unknown);
 
@@ -202,8 +204,8 @@
 
 void ModelManager::showModel(QTreeWidgetItem *item)
 {
-	if(modelPreview) {
-		if(item == NULL) {
+	if (modelPreview) {
+		if (item == nullptr) {
 			modelPreview->clear();
 			return;
 		}
diff -Nru makoureactor-1.7.2/widgets/ModelManager.h makoureactor-1.8.0/widgets/ModelManager.h
--- makoureactor-1.7.2/widgets/ModelManager.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ModelManager.h	2020-08-08 18:46:56.000000000 +0000
@@ -28,7 +28,7 @@
 {
 	Q_OBJECT
 public:
-	ModelManager(const QGLWidget *shareWidget=0, QWidget *parent=0);
+	ModelManager(QWidget *parent=nullptr);
 	virtual void clear();
 	void fill(Field *field, bool reload=false);
 signals:
diff -Nru makoureactor-1.7.2/widgets/ModelManagerPC.cpp makoureactor-1.8.0/widgets/ModelManagerPC.cpp
--- makoureactor-1.7.2/widgets/ModelManagerPC.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ModelManagerPC.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,8 +19,8 @@
 #include "core/Config.h"
 #include "core/field/CharArchive.h"
 
-ModelManagerPC::ModelManagerPC(const QGLWidget *shareWidget, QWidget *parent) :
-	ModelManager(shareWidget, parent), copied(false)
+ModelManagerPC::ModelManagerPC(QWidget *parent) :
+    ModelManager(parent), copied(false)
 {
 	QToolBar *toolBar1 = new QToolBar();
 	toolBar1->setIconSize(QSize(14, 14));
@@ -98,7 +98,7 @@
 QList<QStringList> ModelManagerPC::modelNames() const
 {
 	QList<QStringList> ret;
-	foreach(const QString &name, modelLoader()->HRCNames()) {
+	for (const QString &name : modelLoader()->HRCNames()) {
 		ret.append(QStringList(name));
 	}
 	return ret;
@@ -108,7 +108,7 @@
 {
 	QList<QTreeWidgetItem *> ret;
 	int numA=0;
-	foreach(const QString &name, modelLoader()->ANames(modelID)) {
+	for (const QString &name : modelLoader()->ANames(modelID)) {
 		QStringList cols = QStringList() << QString::number(numA) << name << QString::number(modelLoader()->animUnknown(modelID, numA));
 		QTreeWidgetItem *item = new QTreeWidgetItem(cols);
 		item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
@@ -131,7 +131,7 @@
 
 void ModelManagerPC::addModel()
 {
-	if(modelLoader()->modelCount() >= modelLoader()->maxModelCount()) {
+	if (modelLoader()->modelCount() >= modelLoader()->maxModelCount()) {
 		return;
 	}
 
@@ -139,7 +139,7 @@
 	QTreeWidgetItem *item = models->currentItem(), *newItem;
 	CharArchive *charLgp = CharArchive::instance();
 
-	if(charLgp->isOpen()) {
+	if (charLgp->isOpen()) {
 		QDialog dialog(this, Qt::Dialog | Qt::WindowCloseButtonHint);
 		dialog.setWindowTitle(tr("Add a field model"));
 
@@ -148,7 +148,7 @@
 		list.setEditable(true);
 		QStringList files = charLgp->hrcFiles();
 
-		qSort(files);
+		std::sort(files.begin(), files.end());
 		list.addItems(files);
 
 		QPushButton OKButton(tr("OK"), &dialog);
@@ -160,13 +160,13 @@
 		connect(&list, SIGNAL(currentIndexChanged(QString)), SLOT(modifyHRC(QString)));
 		connect(&OKButton, SIGNAL(released()), &dialog, SLOT(accept()));
 
-		if(dialog.exec() == QDialog::Accepted) {
+		if (dialog.exec() == QDialog::Accepted) {
 			hrc = list.currentText().left(8).toUpper();
 		}
 		else {
-			if(modelPreview) {
+			if (modelPreview) {
 				newItem = modelAnims->currentItem();
-				if(item!=NULL && newItem!=NULL) {
+				if (item!=nullptr && newItem!=nullptr) {
 					modelPreview->setIsAnimated(true);
 					modelPreview->setFieldModelFile(field()->fieldModel(item->text(0), newItem->text(1)));
 				} else
@@ -176,13 +176,13 @@
 		}
 	}
 
-	if(modelPreview)	modelPreview->clear();
+	if (modelPreview)	modelPreview->clear();
 
 	models->blockSignals(true);
 
 	newItem = new QTreeWidgetItem(QStringList(hrc));
 
-	if(item == NULL) {
+	if (item == nullptr) {
 		models->addTopLevelItem(newItem);
 
 		modelLoader()->insertModel(models->topLevelItemCount(), hrc);
@@ -201,7 +201,7 @@
 
 	models->setCurrentItem(newItem);
 
-	if(!charLgp->isOpen()) {
+	if (!charLgp->isOpen()) {
 		models->editItem(newItem);
 	}
 }
@@ -209,9 +209,9 @@
 void ModelManagerPC::delModel()
 {
 	QTreeWidgetItem *item = models->currentItem();
-	if(item == NULL) return;
+	if (item == nullptr) return;
 	int row = currentModelID(item);
-	if(row < 0)		return;
+	if (row < 0)		return;
 
 	modelLoader()->removeModel(row);
 
@@ -231,9 +231,9 @@
 void ModelManagerPC::upModel()
 {
 	QTreeWidgetItem *item = models->currentItem();
-	if(item == NULL) return;
+	if (item == nullptr) return;
 	int row = currentModelID(item);
-	if(row <= 0)	return;
+	if (row <= 0)	return;
 
 	QTreeWidgetItem *itemAbove = models->itemAbove(item);
 
@@ -255,9 +255,9 @@
 void ModelManagerPC::downModel()
 {
 	QTreeWidgetItem *item = models->currentItem();
-	if(item == NULL) return;
+	if (item == nullptr) return;
 	int row = currentModelID(item);
-	if(row < 0 || row >= models->topLevelItemCount()-1)	return;
+	if (row < 0 || row >= models->topLevelItemCount()-1)	return;
 
 	QTreeWidgetItem *itemBelow = models->itemBelow(item);
 
@@ -279,7 +279,7 @@
 void ModelManagerPC::renameOKModel(QTreeWidgetItem *item)
 {
 	int modelID = currentModelID();
-	if(modelID < 0)		return;
+	if (modelID < 0)		return;
 
 	QString text = item->text(0).left(8);
 
@@ -291,11 +291,11 @@
 
 void ModelManagerPC::modifyHRC(const QString &hrc)
 {
-	if(modelPreview) {
+	if (modelPreview) {
 		modelPreview->setIsAnimated(false);
 		modelPreview->setFieldModelFile(field()->fieldModel(hrc, "aafe"));
 		QString a;
-		switch(modelPreview->boneCount()) {
+		switch (modelPreview->boneCount()) {
 		case 5:		a = "avhd";	break;
 		case 9:		a = "geaf";	break;
 		case 11:	a = "bdfe";	break;
@@ -315,7 +315,7 @@
 		case 29:	a = "aeae";	break;
 		}
 
-		if(!a.isEmpty()) {
+		if (!a.isEmpty()) {
 			modelPreview->setIsAnimated(false);
 			modelPreview->setFieldModelFile(field()->fieldModel(hrc, a));
 		}
@@ -325,7 +325,7 @@
 void ModelManagerPC::setModelName(const QString &modelName)
 {
 	int modelID = currentModelID();
-	if(modelID < 0)	return;
+	if (modelID < 0)	return;
 
 	modelLoader()->setCharName(modelID, modelName);
 
@@ -335,7 +335,7 @@
 void ModelManagerPC::setModelScale(int scale)
 {
 	int modelID = currentModelID();
-	if(modelID < 0)	return;
+	if (modelID < 0)	return;
 
 	modelLoader()->setScale(modelID, scale);
 
@@ -346,7 +346,7 @@
 {
 	Q_UNUSED(id);
 	int modelID = currentModelID();
-	if(modelID < 0)	return;
+	if (modelID < 0)	return;
 
 	modelLoader()->setGlobalColor(modelID, color);
 
@@ -356,7 +356,7 @@
 void ModelManagerPC::setModelColor(int id, const FieldModelColorDir &color)
 {
 	int modelID = currentModelID();
-	if(modelID < 0)	return;
+	if (modelID < 0)	return;
 
 	modelLoader()->setLightColor(modelID, id, color);
 
@@ -367,7 +367,7 @@
 {
 	int modelID = currentModelID();
 
-	if(modelID < 0 ||
+	if (modelID < 0 ||
 			modelLoader()->animCount(modelID) >= modelLoader()->maxAnimCount()) {
 		return;
 	}
@@ -376,7 +376,7 @@
 	QString a;
 	CharArchive *charLgp = CharArchive::instance();
 
-	if(charLgp->isOpen()) {
+	if (charLgp->isOpen()) {
 		toolBar2->setEnabled(false);
 		QDialog dialog(this, Qt::Dialog | Qt::WindowCloseButtonHint);
 		dialog.setWindowTitle(tr("Add a field model"));
@@ -385,22 +385,28 @@
 		list.setEditable(true);
 		list.setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
 
+		QTimer t(this);
+		connect(&t, SIGNAL(timeout()), SLOT(processEvents()));
+		t.start(700);
+
 		int boneCount = modelPreview ? modelPreview->boneCount() : 0;
 		QStringList files = charLgp->aFiles(boneCount);
-		if(boneCount != 0) {
+		if (boneCount != 0) {
 			files.append(charLgp->aFiles(0)); // Animations without bones work too
 		}
 
-		qSort(files);
+		t.stop();
+
+		std::sort(files.begin(), files.end());
 		list.addItems(files);
 
-		if(item!=NULL) {
+		if (item!=nullptr) {
 			QString text = item->text(1).toLower();
 			int index = text.lastIndexOf('.');
-			if(index != -1)
+			if (index != -1)
 				text.truncate(index);
 			index = list.findText(text);
-			if(index != -1)
+			if (index != -1)
 				list.setCurrentIndex(index);
 		}
 
@@ -414,12 +420,12 @@
 		connect(&OKButton, SIGNAL(released()), &dialog, SLOT(accept()));
 		toolBar2->setEnabled(true);
 
-		if(dialog.exec() == QDialog::Accepted) {
+		if (dialog.exec() == QDialog::Accepted) {
 			a = list.currentText();
 		}
 		else {
-			if(modelPreview) {
-				if(item!=NULL) {
+			if (modelPreview) {
+				if (item != nullptr) {
 					modelPreview->setIsAnimated(true);
 					modelPreview->setFieldModelFile(field()->fieldModel(models->currentItem()->text(0), item->text(1)));
 				} else
@@ -433,7 +439,7 @@
 
 	newItem = new QTreeWidgetItem(QStringList() << "" << a << "1");
 
-	if(item == NULL) {
+	if (item == nullptr) {
 		modelAnims->addTopLevelItem(newItem);
 
 		modelLoader()->insertAnim(modelID, modelAnims->topLevelItemCount(), a);
@@ -446,7 +452,7 @@
 	}
 
 	// Update animation IDs
-	for(int aID=0 ; aID<modelAnims->topLevelItemCount() ; ++aID) {
+	for (int aID=0; aID<modelAnims->topLevelItemCount(); ++aID) {
 		modelAnims->topLevelItem(aID)->setText(0, QString::number(aID));
 	}
 
@@ -456,14 +462,19 @@
 
 	newItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
 	modelAnims->setCurrentItem(newItem);
-	if(!charLgp->isOpen()) {
+	if (!charLgp->isOpen()) {
 		modelAnims->editItem(newItem);
 	}
 }
 
+void ModelManagerPC::processEvents() const
+{
+	QCoreApplication::processEvents();
+}
+
 void ModelManagerPC::modifyAnimation(const QString &a)
 {
-	if(modelPreview) {
+	if (modelPreview) {
 		modelPreview->setIsAnimated(true);
 		modelPreview->setFieldModelFile(field()->fieldModel(models->currentItem()->text(0), a));
 	}
@@ -472,19 +483,19 @@
 void ModelManagerPC::delAnim()
 {
 	int modelID = currentModelID();
-	if(modelID < 0)		return;
+	if (modelID < 0)		return;
 	QTreeWidgetItem *item = modelAnims->currentItem();
-	if(item == NULL) return;
+	if (item == nullptr) return;
 	int animID = currentAnimID(item);
-	if(animID < 0)	return;
+	if (animID < 0)	return;
 
 	modelLoader()->removeAnim(modelID, animID);
-	if(modelPreview)	modelPreview->clear();
+	if (modelPreview)	modelPreview->clear();
 
 	delete item;
 
 	// Update animation IDs
-	for(int aID=0 ; aID<modelAnims->topLevelItemCount() ; ++aID) {
+	for (int aID=0; aID<modelAnims->topLevelItemCount(); ++aID) {
 		modelAnims->topLevelItem(aID)->setText(0, QString::number(aID));
 	}
 
@@ -494,11 +505,11 @@
 void ModelManagerPC::upAnim()
 {
 	int modelID = currentModelID();
-	if(modelID < 0)		return;
+	if (modelID < 0)		return;
 	QTreeWidgetItem *item = modelAnims->currentItem();
-	if(item == NULL) return;
+	if (item == nullptr) return;
 	int animID = currentAnimID(item);
-	if(animID <= 0)	return;
+	if (animID <= 0)	return;
 
 	QTreeWidgetItem *itemAbove = modelAnims->itemAbove(item);
 
@@ -523,11 +534,11 @@
 void ModelManagerPC::downAnim()
 {
 	int modelID = currentModelID();
-	if(modelID < 0)		return;
+	if (modelID < 0)		return;
 	QTreeWidgetItem *item = modelAnims->currentItem();
-	if(item == NULL) return;
+	if (item == nullptr) return;
 	int animID = currentAnimID(item);
-	if(animID < 0 || animID >= modelAnims->topLevelItemCount()-1)	return;
+	if (animID < 0 || animID >= modelAnims->topLevelItemCount()-1)	return;
 
 	QTreeWidgetItem *itemBelow = modelAnims->itemBelow(item);
 
@@ -560,21 +571,21 @@
 void ModelManagerPC::renameOKAnim(QTreeWidgetItem *item, int column)
 {
 	int modelID = currentModelID();
-	if(modelID < 0)		return;
+	if (modelID < 0)		return;
 	int animID = currentAnimID(item);
-	if(animID < 0)		return;
+	if (animID < 0)		return;
 
-	if(column == 1) {
+	if (column == 1) {
 		QString text = item->text(1).left(256);
 		item->setText(1, text);
 
 		modelLoader()->setAName(modelID, animID, text);
 		emit modified();
-	} else if(column == 2) {
+	} else if (column == 2) {
 		bool ok;
 		int value = item->text(2).toInt(&ok);
-		if(ok) {
-			if(value > 65535) {
+		if (ok) {
+			if (value > 65535) {
 				value = 65535;
 				item->setText(2, QString::number(value));
 			}
@@ -619,12 +630,12 @@
 
 void ModelManagerPC::copyModels(const QList<int> &modelIDs)
 {
-	if(modelIDs.isEmpty()) {
+	if (modelIDs.isEmpty()) {
 		return;
 	}
 
 	_copiedModels.clear();
-	foreach(int modelID, modelIDs) {
+	for (int modelID : modelIDs) {
 		_copiedModels.append(modelLoader()->modelInfos(modelID));
 	}
 	copied = true;
@@ -632,14 +643,14 @@
 
 void ModelManagerPC::cutModels(const QList<int> &modelIDs)
 {
-	if(modelIDs.isEmpty()) {
+	if (modelIDs.isEmpty()) {
 		return;
 	}
 
 	copyModels(modelIDs);
 	QList<int> mIDs = modelIDs;
-	qSort(mIDs);
-	for(int i=mIDs.size() - 1 ; i>=0 ; --i) {
+	std::sort(mIDs.begin(), mIDs.end());
+	for (int i=mIDs.size() - 1; i>=0; --i) {
 		int modelID = mIDs.at(i);
 		modelLoader()->removeModel(modelID);
 		delete models->topLevelItem(modelID);
@@ -650,11 +661,11 @@
 
 void ModelManagerPC::pasteModels(int modelID)
 {
-	if(!copied) {
+	if (!copied) {
 		return;
 	}
 
-	for(int i=_copiedModels.size() - 1 ; i>=0 ; --i) {
+	for (int i=_copiedModels.size() - 1; i>=0; --i) {
 		const FieldModelInfosPC &modelInfos = _copiedModels.at(i);
 		modelLoader()->insertModelInfos(modelID, modelInfos);
 
@@ -685,7 +696,7 @@
 void ModelManagerPC::pasteOnCurrentModel()
 {
 	int modelID = currentModelID();
-	if(modelID < 0) {
+	if (modelID < 0) {
 		modelID = models->topLevelItemCount();
 	} else {
 		modelID += 1;
diff -Nru makoureactor-1.7.2/widgets/ModelManagerPC.h makoureactor-1.8.0/widgets/ModelManagerPC.h
--- makoureactor-1.7.2/widgets/ModelManagerPC.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ModelManagerPC.h	2020-08-08 18:46:56.000000000 +0000
@@ -27,7 +27,7 @@
 {
 	Q_OBJECT
 public:
-	ModelManagerPC(const QGLWidget *shareWidget=0, QWidget *parent=0);
+	ModelManagerPC(QWidget *parent = nullptr);
 protected:
 	QList<QStringList> modelNames() const;
 	QList<QTreeWidgetItem *> animItems(int modelID) const;
@@ -70,6 +70,7 @@
 	void cutCurrentModel();
 	void pasteOnCurrentModel();
 	void updateActionsState();
+	void processEvents() const;
 };
 
 #endif // MODELMANAGERPC_H
diff -Nru makoureactor-1.7.2/widgets/ModelManagerPS.cpp makoureactor-1.8.0/widgets/ModelManagerPS.cpp
--- makoureactor-1.7.2/widgets/ModelManagerPS.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ModelManagerPS.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,8 +19,8 @@
 #include "core/Config.h"
 #include "Data.h"
 
-ModelManagerPS::ModelManagerPS(const QGLWidget *shareWidget, QWidget *parent) :
-	ModelManager(shareWidget, parent)
+ModelManagerPS::ModelManagerPS(QWidget *parent) :
+    ModelManager(parent)
 {
 	modelScaleWidget->setReadOnly(true);
 	modelGlobalColorWidget->setReadOnly(true);
@@ -53,7 +53,7 @@
 QList<QStringList> ModelManagerPS::modelNames() const
 {
 	QList<QStringList> ret;
-	for(int modelId=0 ; modelId<modelLoader()->modelCount() ; ++modelId) {
+	for (int modelId=0; modelId<modelLoader()->modelCount(); ++modelId) {
 		ret.append(QStringList(QString("Model %1").arg(modelId)));
 	}
 	return ret;
@@ -62,7 +62,7 @@
 QList<QTreeWidgetItem *> ModelManagerPS::animItems(int modelID) const
 {
 	QList<QTreeWidgetItem *> ret;
-	for(int animId=0 ; animId<modelLoader()->animCount(modelID) ; ++animId) {
+	for (int animId=0; animId<modelLoader()->animCount(modelID); ++animId) {
 		QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(QString("Animation %1").arg(animId)));
 		item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 		ret.append(item);
diff -Nru makoureactor-1.7.2/widgets/ModelManagerPS.h makoureactor-1.8.0/widgets/ModelManagerPS.h
--- makoureactor-1.7.2/widgets/ModelManagerPS.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ModelManagerPS.h	2020-08-08 18:46:56.000000000 +0000
@@ -27,7 +27,7 @@
 {
 	Q_OBJECT
 public:
-	ModelManagerPS(const QGLWidget *shareWidget=0, QWidget *parent=0);
+	ModelManagerPS(QWidget *parent=0);
 protected:
 	QList<QStringList> modelNames() const;
 	QList<QTreeWidgetItem *> animItems(int modelID) const;
diff -Nru makoureactor-1.7.2/widgets/OpcodeList.cpp makoureactor-1.8.0/widgets/OpcodeList.cpp
--- makoureactor-1.7.2/widgets/OpcodeList.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/OpcodeList.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,6 +19,7 @@
 #include "ScriptEditor.h"
 #include "core/Config.h"
 #include "core/Clipboard.h"
+#include "Data.h"
 
 OpcodeList::OpcodeList(QWidget *parent) :
 	QTreeWidget(parent), isInit(false), _treeEnabled(true),
@@ -83,6 +84,7 @@
 	goto_A = new QAction(this);
 	goto_A->setVisible(false);
 	disableTree_A = new QAction(tr("Disable tree"), this);
+	search_A = new QAction(tr("Search opcode..."), this);
 
 	connect(edit_A, SIGNAL(triggered()), SLOT(scriptEditor()));
 	connect(add_A, SIGNAL(triggered()), SLOT(add()));
@@ -99,6 +101,7 @@
 	connect(redo_A, SIGNAL(triggered()), SLOT(redo()));
 	connect(goto_A, SIGNAL(triggered()), SLOT(gotoLabel()));
 	connect(disableTree_A, SIGNAL(triggered()), SLOT(toggleTree()));
+	connect(search_A, SIGNAL(triggered()), SLOT(searchOpcode()));
 
 	addAction(edit_A);
 	addAction(add_A);
@@ -106,6 +109,7 @@
 	addAction(text_A);
 	addAction(goto_A);
 	addAction(disableTree_A);
+	addAction(search_A);
 	QAction *separator = new QAction(this);
 	separator->setSeparator(true);
 	addAction(separator);
@@ -174,6 +178,19 @@
 	paste_A->setEnabled(Clipboard::instance()->hasFf7FieldScriptOpcodes());
 }
 
+void OpcodeList::searchOpcode()
+{
+	int opcodeID = selectedID();
+
+	if (opcodeID <= -1 || opcodeID >= script->size()) {
+		return;
+	}
+
+	Opcode *opcode = script->opcode(opcodeID);
+
+	emit searchOpcode(opcode->id());
+}
+
 void OpcodeList::clear()
 {
 	enableActions(false);
@@ -191,8 +208,8 @@
 void OpcodeList::enableActions(bool enabled)
 {
 	_toolBar->setEnabled(enabled);
-	foreach(QAction *action, actions()) {
-		if(action == undo_A || action == redo_A)
+	for (QAction *action : actions()) {
+		if (action == undo_A || action == redo_A)
 			continue;
 		action->setEnabled(enabled);
 	}
@@ -204,14 +221,14 @@
 	QTreeWidgetItem *item;
 
 	item = findItem(errorLine);
-	if(item != NULL) {
+	if (item != nullptr) {
 		item->setBackground(0, previousErrorBg);
 	}
 
 	item = findItem(opcodeID);
-	if(item != NULL) {
+	if (item != nullptr) {
 		previousErrorBg = item->background(0);
-		item->setBackground(0, QColor(0xFF,0xCC,0xCC));// red
+		item->setBackground(0, Data::color(Data::ColorRedBackground));
 	}
 
 	errorLine = opcodeID;
@@ -219,9 +236,9 @@
 
 void OpcodeList::setTreeEnabled(bool enabled)
 {
-	if(enabled != _treeEnabled) {
+	if (enabled != _treeEnabled) {
 		_treeEnabled = enabled;
-		if(_treeEnabled) {
+		if (_treeEnabled) {
 			disableTree_A->setText(tr("Disable tree"));
 		} else {
 			disableTree_A->setText(tr("Enable tree"));
@@ -234,12 +251,12 @@
 {
 	upDownEnabled();
 	int opcodeID = selectedID();
-	if(opcodeID <= -1 || opcodeID >= script->size()) {
+	if (opcodeID <= -1 || opcodeID >= script->size()) {
 		return;
 	}
 	Opcode *opcode = script->opcode(opcodeID);
 
-	switch(opcode->id()) {
+	switch (opcode->id()) {
 	case Opcode::ASK:
 	case Opcode::MESSAGE:
 	case Opcode::MPNAM:
@@ -257,10 +274,10 @@
 	}
 
 	bool visible = true;
-	if(opcode->isJump()) {
+	if (opcode->isJump()) {
 		goto_A->setText(tr("Goto label"));
 		_help->setText(tr("Alt + Click to go to the label"));
-	} else if(opcode->isExec()) {
+	} else if (opcode->isExec()) {
 		goto_A->setText(tr("Goto script"));
 		_help->setText(tr("Alt + Click to go to the script"));
 	} else {
@@ -272,7 +289,7 @@
 
 void OpcodeList::upDownEnabled()
 {
-	if(selectedItems().isEmpty())
+	if (selectedItems().isEmpty())
 	{
 		edit_A->setEnabled(false);
 		del_A->setEnabled(false);
@@ -296,13 +313,13 @@
 
 void OpcodeList::editText()
 {
-	if(!script)	return;
+	if (!script)	return;
 
 	int opcodeID = selectedID();
-	if(opcodeID >= 0 && opcodeID < script->size()) {
+	if (opcodeID >= 0 && opcodeID < script->size()) {
 		Opcode *op = script->opcode(opcodeID);
 		int textID = op->getTextID();
-		if(textID >= 0) {
+		if (textID >= 0) {
 			emit editText(textID);
 		}
 	}
@@ -310,19 +327,19 @@
 
 void OpcodeList::saveExpandedItems()
 {
-	if(script) {
+	if (script) {
 		QList<const Opcode *> expandedItems;
 		int size = topLevelItemCount();
-		for(int i=0 ; i<size ; ++i) {
+		for (int i=0; i<size; ++i) {
 			QTreeWidgetItem *item = topLevelItem(i);
-			if(item->isExpanded()) {
+			if (item->isExpanded()) {
 				int opcodeID = item->data(0, Qt::UserRole).toInt();
-				if(opcodeID >= 0 && opcodeID < script->size()) {
+				if (opcodeID >= 0 && opcodeID < script->size()) {
 					expandedItems.append(script->opcode(opcodeID));
 				}
 			}
 		}
-		if(size>0) setExpandedItems(expandedItems);
+		if (size>0) setExpandedItems(expandedItems);
 	}
 }
 
@@ -336,14 +353,29 @@
 
 void OpcodeList::setExpandedItems(const QList<const Opcode *> &expandedItems)
 {
-	if(script) {
+	if (script) {
 		this->expandedItems.insert(script, expandedItems);
 	}
 }
 
+void OpcodeList::refreshOpcode(int opcodeID)
+{
+	if (field == nullptr) {
+		return;
+	}
+
+	QTreeWidgetItem *item = findItem(opcodeID);
+
+	if (item == nullptr || opcodeID >= script->size()) {
+		return;
+	}
+
+	item->setText(0, script->opcode(opcodeID)->toString(field));
+}
+
 void OpcodeList::fill(Field *_field, GrpScript *_grpScript, Script *_script)
 {
-	if(_script) {
+	if (_script) {
 		saveExpandedItems();
 		clearHist();
 		field = _field;
@@ -357,22 +389,28 @@
 	blockSignals(false);
 	header()->setMinimumSectionSize(0);
 	
-	if(!script->isEmpty()) {
+	if (!script->isEmpty()) {
 		QList<quint16> indent;
 		QList<QTreeWidgetItem *> items;
 		QTreeWidgetItem *parentItem = 0;
 		quint16 opcodeID = 0;
 		QPixmap fontPixmap(":/images/chiffres.png");
+		QColor blue = Data::color(Data::ColorBlueForeground),
+		       orange = Data::color(Data::ColorOrangeForeground),
+		       green = Data::color(Data::ColorGreenForeground),
+		       grey = Data::color(Data::ColorGreyForeground),
+		       red = Data::color(Data::ColorRedForeground);
 
-		foreach(Opcode *curOpcode, script->opcodes()) {
+		for (Opcode *curOpcode : script->opcodes()) {
 
-			if(curOpcode->isLabel()) {
-				while(!indent.isEmpty() &&
+			if (curOpcode->isLabel()) {
+				while (!indent.isEmpty() &&
 					  ((OpcodeLabel *)curOpcode)->label() == indent.last())
 				{
 					indent.removeLast();
-					if(parentItem != 0)
+					if (parentItem != 0) {
 						parentItem = parentItem->parent();
+					}
 				}
 			}
 
@@ -386,24 +424,24 @@
 			QPixmap wordPixmap(32,11);
 			item->setIcon(0, QIcon(posNumber(opcodeID+1, fontPixmap, wordPixmap)));
 			item->setToolTip(0, curOpcode->name());
-			if((id>=0x14 && id<=0x19) || (id>=0x30 && id<=0x32) || id==0xcb || id==0xcc)
-			{
-				item->setForeground(0, QColor(0x00,0x66,0xcc));
-				if(!((OpcodeJump *)curOpcode)->isBadJump()) {
+			if (curOpcode->isIf()) {
+				item->setForeground(0, blue);
+				if (!((OpcodeJump *)curOpcode)->isBadJump()) {
 					indent.append(((OpcodeJump *)curOpcode)->label());
 				}
-				if(_treeEnabled) {
+				if (_treeEnabled) {
 					parentItem = item;
 				}
 			}
-			else if(id >= Opcode::REQ && id <= Opcode::RETTO)
-				item->setForeground(0, QColor(0xcc,0x66,0x00));
-			else if(id >= Opcode::JMPF && id <= Opcode::JMPBL)
-				item->setForeground(0, QColor(0x66,0xcc,0x00));
-			else if(id == Opcode::RET)
-				item->setForeground(0, QColor(0x66,0x66,0x66));
-			else if(curOpcode->isLabel())
-				item->setForeground(0, QColor(0xcc,0x00,0x00));
+			else if (id >= Opcode::REQ && id <= Opcode::RETTO) {
+				item->setForeground(0, orange);
+			} else if (curOpcode->isJump()) {
+				item->setForeground(0, green);
+			} else if (id == Opcode::RET) {
+				item->setForeground(0, grey);
+			} else if (curOpcode->isLabel()) {
+				item->setForeground(0, red);
+			}
 
 			++opcodeID;
 		}
@@ -411,8 +449,8 @@
 		addTopLevelItems(items);
 
 		opcodeID = 0;
-		foreach(QTreeWidgetItem *item, items) {
-			if(itemIsExpanded(script->opcode(opcodeID))) {
+		for (QTreeWidgetItem *item : qAsConst(items)) {
+			if (itemIsExpanded(script->opcode(opcodeID))) {
 				item->setExpanded(true);
 			}
 			++opcodeID;
@@ -426,7 +464,7 @@
 
 	// Adjust items size
 	resizeColumnToContents(0);
-	if(header()->sectionSize(0) < viewport()->width()) {
+	if (header()->sectionSize(0) < viewport()->width()) {
 		header()->setMinimumSectionSize(viewport()->width());
 	}
 
@@ -447,12 +485,12 @@
 {
 	QTreeWidgetItem *errorItem = findItem(errorLine);
 
-	if(current && errorItem != current)
+	if (current && errorItem != current)
 	{
 		previousBG = current->background(0);
-		current->setBackground(0, QColor(196,196,255));
+		current->setBackground(0, Data::color(Data::ColorEvidence));
 	}
-	if(previous && errorItem != previous) {
+	if (previous && errorItem != previous) {
 		previous->setBackground(0, previousBG);
 	}
 }
@@ -470,9 +508,9 @@
 /*QString OpcodeList::showHistoric()
 {
 	QStringList ret;
-	foreach(const Historic &h, hists) {
+	for (const Historic &h : hists) {
 		QString type;
-		switch(h.type) {
+		switch (h.type) {
 		case Add:	type = "Add";	break;
 		case Modify:	type = "Modify";	break;
 		case ModifyAndAddLabel:	type = "ModifyAndAddLabel";	break;
@@ -483,9 +521,9 @@
 		ret.append(type);
 	}
 	QStringList ret2;
-	foreach(const Historic &h, restoreHists) {
+	for (const Historic &h : restoreHists) {
 		QString type;
-		switch(h.type) {
+		switch (h.type) {
 		case Add:	type = "Add";	break;
 		case Modify:	type = "Modify";	break;
 		case ModifyAndAddLabel:	type = "ModifyAndAddLabel";	break;
@@ -531,12 +569,12 @@
 	undo_A->setEnabled(false);
 	redo_A->setEnabled(false);
 
-	while(!hists.isEmpty()) {
+	while (!hists.isEmpty()) {
 		Historic hist = hists.pop();
 		qDeleteAll(hist.data);
 	}
 
-	while(!restoreHists.isEmpty()) {
+	while (!restoreHists.isEmpty()) {
 		Historic hist = restoreHists.pop();
 		qDeleteAll(hist.data);
 	}
@@ -546,7 +584,7 @@
 
 void OpcodeList::undo()
 {
-	if(hists.isEmpty()) {
+	if (hists.isEmpty()) {
 		return;
 	}
 
@@ -556,17 +594,17 @@
 	int firstOpcode = hist.opcodeIDs.first();
 	Opcode *sav;
 
-	switch(hist.type) {
+	switch (hist.type) {
 	case Add:
 		// del opcodes
-		for(int i=hist.opcodeIDs.size()-1 ; i>=0 ; --i) {
+		for (int i=hist.opcodeIDs.size()-1; i>=0; --i) {
 			hist.data.prepend(Script::copyOpcode(script->opcode(hist.opcodeIDs.at(i))));
 			script->delOpcode(hist.opcodeIDs.at(i));
 		}
 		break;
 	case Remove:
 		// restore opcodes
-		for(int i=0 ; i<hist.opcodeIDs.size() ; ++i)
+		for (int i=0; i<hist.opcodeIDs.size(); ++i)
 			script->insertOpcode(hist.opcodeIDs.at(i), hist.data.at(i));
 		hist.data.clear();
 		break;
@@ -609,7 +647,7 @@
 
 void OpcodeList::redo()
 {
-	if(restoreHists.isEmpty()) {
+	if (restoreHists.isEmpty()) {
 		return;
 	}
 
@@ -619,14 +657,14 @@
 	int firstOpcode = hist.opcodeIDs.first();
 	Opcode *sav;
 
-	switch(hist.type) {
+	switch (hist.type) {
 	case Add:
-		for(int i=0 ; i<hist.opcodeIDs.size() ; ++i)
+		for (int i=0; i<hist.opcodeIDs.size(); ++i)
 			script->insertOpcode(hist.opcodeIDs.at(i), hist.data.at(i));
 		hist.data.clear();
 		break;
 	case Remove:
-		for(int i=hist.opcodeIDs.size()-1 ; i>=0 ; --i) {
+		for (int i=hist.opcodeIDs.size()-1; i>=0; --i) {
 			hist.data.prepend(Script::copyOpcode(script->opcode(hist.opcodeIDs.at(i))));
 			script->delOpcode(hist.opcodeIDs.at(i));
 		}
@@ -665,12 +703,12 @@
 
 void OpcodeList::scriptEditor(bool modify)
 {
-	if(!script) {
+	if (!script) {
 		return;
 	}
 
 	int opcodeID = selectedID();
-	if(opcodeID == -1) {
+	if (opcodeID == -1) {
 		modify = false;
 	}
 
@@ -678,7 +716,7 @@
 
 	saveExpandedItems();
 
-	if(modify) {
+	if (modify) {
 		oldVersion = Script::copyOpcode(script->opcode(opcodeID));
 	} else {
 		++opcodeID;
@@ -686,18 +724,18 @@
 
 	ScriptEditor editor(field, grpScript, script, opcodeID, modify, isInit, this);
 
-	if(editor.exec() == QDialog::Accepted) {
+	if (editor.exec() == QDialog::Accepted) {
 		fill();
 		scroll(opcodeID);
-		if(modify) {
-			if(editor.needslabel()) {
+		if (modify) {
+			if (editor.needslabel()) {
 				changeHist(ModifyAndAddLabel, opcodeID, oldVersion);
 			} else {
 				changeHist(Modify, opcodeID, oldVersion);
 			}
 		}
 		else {
-			if(editor.needslabel()) {
+			if (editor.needslabel()) {
 				changeHist(Add, QList<int>() << opcodeID << (opcodeID + 1), QList<Opcode *>());
 			} else {
 				changeHist(Add, opcodeID);
@@ -709,16 +747,16 @@
 
 void OpcodeList::del(bool totalDel)
 {
-	if(topLevelItemCount() == 0) {
+	if (topLevelItemCount() == 0) {
 		return;
 	}
 	QList<int> selectedIDs = this->selectedIDs();
-	if(selectedIDs.isEmpty()) {
+	if (selectedIDs.isEmpty()) {
 		return;
 	}
 	QList<Opcode *> oldVersions;
 
-	if(totalDel &&
+	if (totalDel &&
 	        QMessageBox::warning(this, tr("Delete"),
 	                             tr("Are you sure you want to delete %1?")
 	                             .arg(selectedIDs.size()==1
@@ -731,10 +769,10 @@
 
 	saveExpandedItems();
 	
-	qSort(selectedIDs);
-	for(int i=selectedIDs.size()-1 ; i>=0 ; --i) {
+	std::sort(selectedIDs.begin(), selectedIDs.end());
+	for (int i=selectedIDs.size()-1; i>=0; --i) {
 		oldVersions.prepend(Script::copyOpcode(script->opcode(selectedIDs.at(i))));
-		if(totalDel) {
+		if (totalDel) {
 			script->delOpcode(selectedIDs.at(i));
 		} else {
 			script->removeOpcode(selectedIDs.at(i));
@@ -745,9 +783,9 @@
 	emit changed();
 	changeHist(Remove, selectedIDs, oldVersions);
 
-	if(topLevelItemCount() != 0) {
-		if(selectedIDs.at(0) >= topLevelItemCount() && selectedIDs.at(0) > 0)	scroll(selectedIDs.at(0)-1);
-		else if(selectedIDs.at(0) < topLevelItemCount())	scroll(selectedIDs.at(0));
+	if (topLevelItemCount() != 0) {
+		if (selectedIDs.at(0) >= topLevelItemCount() && selectedIDs.at(0) > 0)	scroll(selectedIDs.at(0)-1);
+		else if (selectedIDs.at(0) < topLevelItemCount())	scroll(selectedIDs.at(0));
 	}
 	// else	emit empty();
 }
@@ -761,11 +799,11 @@
 void OpcodeList::copy()
 {
 	QList<Opcode *> opcodeCopied;
-	foreach(int id, selectedIDs()) {
+	for (int id : selectedIDs()) {
 		opcodeCopied.append(script->opcode(id));
 	}
 
-	if(!opcodeCopied.isEmpty()) {
+	if (!opcodeCopied.isEmpty()) {
 		Clipboard::instance()->setFF7FieldScriptOpcodes(opcodeCopied);
 		paste_A->setEnabled(true);
 	}
@@ -774,29 +812,29 @@
 void OpcodeList::copyText()
 {
 	QMap<int, QTreeWidgetItem *> listeitems;
-	foreach(QTreeWidgetItem *item, selectedItems()) {
+	for (QTreeWidgetItem *item : selectedItems()) {
 		listeitems.insert(item->data(0, Qt::UserRole).toInt(), item);
 	}
 
 	QString copiedText;
-	QTreeWidgetItem *lastitem=NULL, *parentitem;
+	QTreeWidgetItem *lastitem=nullptr, *parentitem;
 	QStack<QTreeWidgetItem *> parentitems;
 	int indent = 0;
-	foreach(QTreeWidgetItem *item, listeitems) {
-		if(lastitem != NULL) {
+	for (QTreeWidgetItem *item : listeitems) {
+		if (lastitem != nullptr) {
 			parentitem = item->parent();
-			if(parentitem == lastitem) {
+			if (parentitem == lastitem) {
 				indent++;
 				parentitems.push(parentitem);
 			}
 			else {
-				while(!parentitems.isEmpty() && parentitem != parentitems.top()) {
+				while (!parentitems.isEmpty() && parentitem != parentitems.top()) {
 					indent--;
 					parentitems.pop();
 				}
 			}
 
-			for(int i=0 ; i<indent ; ++i) {
+			for (int i=0; i<indent; ++i) {
 				copiedText.append('\t');
 			}
 		}
@@ -804,7 +842,7 @@
 		copiedText.append(item->text(0)).append('\n');
 		lastitem = item;
 	}
-	if(!copiedText.isEmpty()) {
+	if (!copiedText.isEmpty()) {
 		QApplication::clipboard()->setText(copiedText);
 	}
 }
@@ -812,13 +850,13 @@
 void OpcodeList::paste()
 {
 	QList<Opcode *> pastedOpcodes = Clipboard::instance()->ff7FieldScriptOpcodes();
-	if(!pastedOpcodes.isEmpty()) {
+	if (!pastedOpcodes.isEmpty()) {
 		saveExpandedItems();
 
 		QList<int> IDs;
 		int opcodeID = selectedID() + 1, i = opcodeID;
 
-		foreach (Opcode *opcode, pastedOpcodes) {
+		for (Opcode *opcode : qAsConst(pastedOpcodes)) {
 			IDs.append(i);
 			// TODO: label duplication case
 			script->insertOpcode(i, opcode);
@@ -835,15 +873,15 @@
 void OpcodeList::move(Script::MoveDirection direction)
 {
 	int opcodeID = selectedID();
-	if(opcodeID == -1) {
+	if (opcodeID == -1) {
 		return;
 	}
 	saveExpandedItems();
-	if(script->moveOpcode(opcodeID, direction)) {
+	if (script->moveOpcode(opcodeID, direction)) {
 		fill();
 		scroll(direction == Script::Down ? opcodeID+1 : opcodeID-1);
 		emit changed();
-		if(direction == Script::Down) {
+		if (direction == Script::Down) {
 			changeHist(Down, opcodeID);
 		} else {
 			changeHist(Up, opcodeID);
@@ -856,12 +894,12 @@
 void OpcodeList::scroll(int id, bool focus)
 {
 	QTreeWidgetItem *item = findItem(id);
-	if(item == NULL) {
+	if (item == nullptr) {
 		return;
 	}
 	setCurrentItem(item);
 	scrollToItem(item, QAbstractItemView::PositionAtTop);
-	if(focus) {
+	if (focus) {
 		setFocus();
 	}
 }
@@ -869,19 +907,19 @@
 QTreeWidgetItem *OpcodeList::findItem(int id)
 {
 	QTreeWidgetItemIterator it(this);
-	while(*it) {
-		if((*it)->data(0, Qt::UserRole).toInt() == id) {
+	while (*it) {
+		if ((*it)->data(0, Qt::UserRole).toInt() == id) {
 			return *it;
 		}
 		++it;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 int OpcodeList::selectedID()
 {
-	if(currentItem() == NULL) {
+	if (currentItem() == nullptr) {
 		return -1;
 	}
 	return currentItem()->data(0, Qt::UserRole).toInt();
@@ -890,10 +928,10 @@
 QList<int> OpcodeList::selectedIDs()
 {
 	QList<int> list;
-	foreach(QTreeWidgetItem *item, selectedItems()) {
+	for (QTreeWidgetItem *item : selectedItems()) {
 		list.append(item->data(0, Qt::UserRole).toInt());
 	}
-	qSort(list);
+	std::sort(list.begin(), list.end());
 	return list;
 }
 
@@ -911,15 +949,15 @@
 	wordPixmap.fill(QColor(0,0,0,0));
 	QPainter painter(&wordPixmap);
 
-	if(strNum.at(0)!=' ')
+	if (strNum.at(0)!=' ')
 		painter.drawTiledPixmap(1, 1, 5, 9, fontPixmap, 5*strNum.mid(0,1).toInt(), 0);
-	if(strNum.at(1)!=' ')
+	if (strNum.at(1)!=' ')
 		painter.drawTiledPixmap(7, 1, 5, 9, fontPixmap, 5*strNum.mid(1,1).toInt(), 0);
-	if(strNum.at(2)!=' ')
+	if (strNum.at(2)!=' ')
 		painter.drawTiledPixmap(13, 1, 5, 9, fontPixmap, 5*strNum.mid(2,1).toInt(), 0);
-	if(strNum.at(3)!=' ')
+	if (strNum.at(3)!=' ')
 		painter.drawTiledPixmap(19, 1, 5, 9, fontPixmap, 5*strNum.mid(3,1).toInt(), 0);
-	if(strNum.at(4)!=' ')
+	if (strNum.at(4)!=' ')
 		painter.drawTiledPixmap(25, 1, 5, 9, fontPixmap, 5*strNum.mid(4,1).toInt(), 0);
 
 	painter.end();
@@ -928,31 +966,31 @@
 
 void OpcodeList::gotoLabel(QTreeWidgetItem *item)
 {
-	if(item == NULL) {
+	if (item == nullptr) {
 		item = currentItem();
 	}
 	int opcodeID = item->data(0, Qt::UserRole).toInt();
 	Opcode *op = script->opcode(opcodeID);
 
-	if(op->isJump()) {
+	if (op->isJump()) {
 		OpcodeJump *opJ = static_cast<OpcodeJump *>(op);
 
-		if(!opJ->isBadJump()) {
+		if (!opJ->isBadJump()) {
 			int opcodeID = 0;
 
-			foreach(const Opcode *op, script->opcodes()) {
-				if(op->isLabel() && ((OpcodeLabel *)op)->label() == opJ->label()) {
+			for (const Opcode *op : script->opcodes()) {
+				if (op->isLabel() && ((OpcodeLabel *)op)->label() == opJ->label()) {
 					scroll(opcodeID);
 					break;
 				}
 				++opcodeID;
 			}
 		}
-	} else if(op->isExec()) {
+	} else if (op->isExec()) {
 		OpcodeExec *opE = static_cast<OpcodeExec *>(op);
 
 		emit gotoScript(opE->groupID, opE->scriptID + 1);
-	} /* else if(op->id() == Opcode::MAPJUMP) {
+	} /* else if (op->id() == Opcode::MAPJUMP) {
 		OpcodeMAPJUMP *opMJ = static_cast<OpcodeMAPJUMP *>(op);
 
 		emit gotoField(opMJ->fieldID); // FIXME: fieldID is not the same in the field list
@@ -962,10 +1000,10 @@
 void OpcodeList::mouseReleaseEvent(QMouseEvent *event)
 {
 	// Alt + left click
-	if(event->button() == Qt::LeftButton &&
+	if (event->button() == Qt::LeftButton &&
 			event->modifiers().testFlag(Qt::AltModifier)) {
 		QTreeWidgetItem *item = itemAt(event->pos());
-		if(item == NULL) {
+		if (item == nullptr) {
 			return;
 		}
 
diff -Nru makoureactor-1.7.2/widgets/OpcodeList.h makoureactor-1.8.0/widgets/OpcodeList.h
--- makoureactor-1.7.2/widgets/OpcodeList.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/OpcodeList.h	2020-08-08 18:46:56.000000000 +0000
@@ -59,7 +59,8 @@
 
 	bool itemIsExpanded(const Opcode *opcode) const;
 	void setExpandedItems(const QList<const Opcode *> &expandedItems);
-
+public slots:
+	void refreshOpcode(int opcodeID);
 private slots:
 	void adjustPasteAction();
 	void add();
@@ -76,16 +77,18 @@
 	void undo();
 	void redo();
 	void editText();
-	void gotoLabel(QTreeWidgetItem *item = NULL);
+	void gotoLabel(QTreeWidgetItem *item = nullptr);
 	void setTreeEnabled(bool enabled);
 	inline void toggleTree() {
 		setTreeEnabled(!_treeEnabled);
 	}
+	void searchOpcode();
 signals:
 	void changed();
 	void editText(int textID);
 	void gotoScript(int groupID, int scriptID);
 	void gotoField(int fieldID);
+	void searchOpcode(int opcodeID);
 protected:
 	void mouseReleaseEvent(QMouseEvent *event);
 private:
@@ -118,7 +121,7 @@
 	QAction *cut_A, *copy_A, *copyText_A, *paste_A;
 	QAction *up_A, *down_A, *expand_A;
 	QAction *undo_A, *redo_A, *text_A, *goto_A;
-	QAction *disableTree_A;
+	QAction *disableTree_A, *search_A;
 
 	QStack<Historic> hists;
 	QStack<Historic> restoreHists;
diff -Nru makoureactor-1.7.2/widgets/OperationsManager.cpp makoureactor-1.8.0/widgets/OperationsManager.cpp
--- makoureactor-1.7.2/widgets/OperationsManager.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/OperationsManager.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -20,14 +20,16 @@
 OperationsManager::OperationsManager(bool isPC, QWidget *parent) :
 	QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint)
 {
-	setWindowTitle(tr("Miscellaneous operations"));
+	setWindowTitle(tr("Batch processing"));
 
 	addOperation(CleanUnusedTexts, tr("Clean all unused texts"));
+	addOperation(AutosizeTextWindows, tr("Autosize all text windows in the game"));
 	addOperation(RemoveTexts, tr("Disable all texts in the game"));
 	addOperation(RemoveBattles, tr("Disable all battles in the game"));
-	if(isPC) {
-		addOperation(CleanModelLoaderPC, tr("Remove unused data in field model loaders"));
-		addOperation(RemoveUnusedSectionPC, tr("Remove all unused data for field backgrounds"));
+	if (isPC) {
+		addOperation(CleanModelLoaderPC, tr("Clean unused data in field model loaders"));
+		addOperation(RemoveUnusedSectionPC, tr("Clean unused data for field backgrounds"));
+		addOperation(RepairBackgroundsPC, tr("Repair broken backgrounds (lastmap, fr_e)"));
 	}
 
 	QDialogButtonBox *buttonBox = new QDialogButtonBox;
@@ -35,13 +37,13 @@
 	buttonBox->addButton(QDialogButtonBox::Cancel);
 
 	QVBoxLayout *layout = new QVBoxLayout(this);
-	foreach(QCheckBox *operation, _operations) {
+	for (QCheckBox *operation : qAsConst(_operations)) {
 		layout->addWidget(operation);
 	}
 	layout->addStretch();
 	layout->addWidget(buttonBox);
 
-	foreach(QCheckBox *checkBox, _operations) {
+	for (QCheckBox *checkBox : qAsConst(_operations)) {
 		connect(checkBox, SIGNAL(toggled(bool)), SLOT(updateApplyButton()));
 	}
 
@@ -61,10 +63,10 @@
 	QMapIterator<Operation, QCheckBox *> it(_operations);
 	Operations ret = Operations();
 
-	while(it.hasNext()) {
+	while (it.hasNext()) {
 		it.next();
 
-		if(it.value()->isChecked()) {
+		if (it.value()->isChecked()) {
 			ret |= it.key();
 		}
 	}
@@ -76,8 +78,8 @@
 {
 	bool enabled = false;
 
-	foreach(QCheckBox *checkBox, _operations) {
-		if(checkBox->isChecked()) {
+	for (QCheckBox *checkBox : qAsConst(_operations)) {
+		if (checkBox->isChecked()) {
 			enabled = true;
 			break;
 		}
diff -Nru makoureactor-1.7.2/widgets/OperationsManager.h makoureactor-1.8.0/widgets/OperationsManager.h
--- makoureactor-1.7.2/widgets/OperationsManager.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/OperationsManager.h	2020-08-08 18:46:56.000000000 +0000
@@ -30,7 +30,9 @@
 		RemoveTexts = 0x02,
 		RemoveBattles = 0x04,
 		CleanModelLoaderPC = 0x08,
-		RemoveUnusedSectionPC = 0x10
+		RemoveUnusedSectionPC = 0x10,
+		RepairBackgroundsPC = 0x20,
+		AutosizeTextWindows = 0x40
 	};
 	Q_DECLARE_FLAGS(Operations, Operation)
 
diff -Nru makoureactor-1.7.2/widgets/OrientationWidget.cpp makoureactor-1.8.0/widgets/OrientationWidget.cpp
--- makoureactor-1.7.2/widgets/OrientationWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/OrientationWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -90,7 +90,7 @@
 				<< QLineF(QPointF(-radius, 0), QPointF(radius, 0))
 				<< QLineF(QPointF(0, -radius), QPointF(0, radius)));
 
-	if(_value >= 90 && _value < 270) {
+	if (_value >= 90 && _value < 270) {
 		p.rotate(180);
 		p.drawText(QRectF(0.0, 0.0, radius-4, radius-4), tr("Right"), QTextOption(Qt::AlignRight));
 	} else {
@@ -100,7 +100,7 @@
 
 void OrientationWidget::mouseEvent(QMouseEvent *e)
 {
-	if(_readOnly) {
+	if (_readOnly) {
 		e->ignore();
 		return;
 	}
@@ -111,7 +111,7 @@
 	const QPointF &relativePos = e->localPos();
 #endif
 
-	if(isInCircle(relativePos)) {
+	if (isInCircle(relativePos)) {
 		moveCursor(relativePos);
 	}
 }
@@ -141,25 +141,25 @@
 	qreal sizeX=pos.x() - centerCircle.x(), sizeY=pos.y() - centerCircle.y();
 	double angle;
 
-	if(sizeX != 0) {
+	if (sizeX != 0) {
 		angle = atan2(qAbs(sizeY), qAbs(sizeX)) * 57.29577951;// rad2deg
 	} else {
 		angle = 0;
 	}
 
-	if(sizeX == 0 && sizeY == 0) {
+	if (sizeX == 0 && sizeY == 0) {
 		return;
-	} else if(sizeX < 0 && sizeY <= 0) {
+	} else if (sizeX < 0 && sizeY <= 0) {
 		_value = 0 + angle;
-	} else if(sizeX == 0 && sizeY < 0) {
+	} else if (sizeX == 0 && sizeY < 0) {
 		_value = 90;
-	} else if(sizeX > 0 && sizeY < 0) {
+	} else if (sizeX > 0 && sizeY < 0) {
 		_value = 180 - angle;
-	} else if(sizeX == 0 && sizeY > 0) {
+	} else if (sizeX == 0 && sizeY > 0) {
 		_value = 270;
-	} else if(sizeX < 0 && sizeY > 0) {
+	} else if (sizeX < 0 && sizeY > 0) {
 		_value = 360 - angle;
-	} else if(sizeX > 0 && sizeY >= 0) {
+	} else if (sizeX > 0 && sizeY >= 0) {
 		_value = 180 + angle;
 	}
 
diff -Nru makoureactor-1.7.2/widgets/PsfDialog.cpp makoureactor-1.8.0/widgets/PsfDialog.cpp
--- makoureactor-1.7.2/widgets/PsfDialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/PsfDialog.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,66 @@
+#include "PsfDialog.h"
+#include "../Parameters.h"
+
+PsfDialog::PsfDialog(const QString &title, QWidget *parent, Qt::WindowFlags f) :
+      QDialog(parent, f)
+{
+	_psflib = new QLineEdit("Final Fantasy 7.psflib", this);
+	_title = new QLineEdit(title, this);
+	_artist = new QLineEdit("Nobuo Uematsu", this);
+	_game = new QLineEdit("Final Fantasy 7", this);
+	_year = new QLineEdit("1997", this);
+	_genre = new QLineEdit(this);
+	_comment = new QTextEdit(this);
+	_copyright = new QLineEdit("1997 Square", this);
+	_author = new QLineEdit(PROG_NAME, this);
+
+	QDialogButtonBox *buttonBox = new QDialogButtonBox(
+	        QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+
+	QGridLayout *layout = new QGridLayout(this);
+	layout->addWidget(new QLabel(tr("psflib")), 0, 0, 1, 1);
+	layout->addWidget(_psflib, 0, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("Title")), 1, 0, 1, 1);
+	layout->addWidget(_title, 1, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("Artist")), 2, 0, 1, 1);
+	layout->addWidget(_artist, 2, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("Game")), 3, 0, 1, 1);
+	layout->addWidget(_game, 3, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("Year")), 4, 0, 1, 1);
+	layout->addWidget(_year, 4, 1, 1, 1);
+	layout->addWidget(new QLabel(tr("Genre")), 4, 2, 1, 1);
+	layout->addWidget(_genre, 4, 3, 1, 1);
+	layout->addWidget(new QLabel(tr("Comment")), 5, 0, 4, 1);
+	layout->addWidget(_comment, 5, 1, 4, 3);
+	layout->addWidget(new QLabel(tr("Copyright")), 9, 0, 1, 1);
+	layout->addWidget(_copyright, 9, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("Author")), 10, 0, 1, 1);
+	layout->addWidget(_author, 10, 1, 1, 3);
+	layout->addWidget(buttonBox, 11, 0, 1, 4);
+
+	connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+	connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+}
+
+PsfTags PsfDialog::tags() const
+{
+	return PsfTags(_psflib->text())
+	    .setTitle(_title->text())
+	    .setArtist(_artist->text())
+	    .setGame(_game->text())
+	    .setCustom("year", _year->text())
+	    .setGenre(_genre->text())
+	    .setComment(_comment->toPlainText())
+	    .setCopyright(_copyright->text())
+	    .setAuthor(_author->text());
+}
+
+void PsfDialog::setNoTitle(bool noTitle)
+{
+	_title->setDisabled(noTitle);
+	if (noTitle) {
+		_title->setText(tr("(auto)"));
+	} else {
+		_title->setText(QString());
+	}
+}
diff -Nru makoureactor-1.7.2/widgets/PsfDialog.h makoureactor-1.8.0/widgets/PsfDialog.h
--- makoureactor-1.7.2/widgets/PsfDialog.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/PsfDialog.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,22 @@
+#ifndef PSFDIALOG_H
+#define PSFDIALOG_H
+
+#include <QtWidgets>
+#include "core/PsfFile.h"
+
+class PsfDialog : public QDialog
+{
+	Q_OBJECT
+public:
+	explicit PsfDialog(const QString &title, QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
+	PsfDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()) :
+	      PsfDialog(QString(), parent, f) {}
+	PsfTags tags() const;
+	void setNoTitle(bool noTitle);
+private:
+	QLineEdit *_psflib, *_title, *_artist, *_game, *_year, *_genre;
+	QLineEdit *_copyright, *_author;
+	QTextEdit *_comment;
+};
+
+#endif // PSFDIALOG_H
diff -Nru makoureactor-1.7.2/widgets/QTaskBarButton.cpp makoureactor-1.8.0/widgets/QTaskBarButton.cpp
--- makoureactor-1.7.2/widgets/QTaskBarButton.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/QTaskBarButton.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -25,11 +25,11 @@
 {
 	_winId = mainWindow->window()->winId();
 
-	CoInitialize(NULL);
+	CoInitialize(nullptr);
 	HRESULT hRes = CoCreateInstance(CLSID_TaskbarList,
-									NULL, CLSCTX_INPROC_SERVER,
+									nullptr, CLSCTX_INPROC_SERVER,
 									IID_ITaskbarList3, (LPVOID*)&pITask);
-	if(FAILED(hRes)) {
+	if (FAILED(hRes)) {
 		pITask = 0;
 		CoUninitialize();
 		return;
@@ -40,19 +40,19 @@
 
 QTaskBarButton::~QTaskBarButton()
 {
-	if(pITask) {
+	if (pITask) {
 		pITask->Release();
-		pITask = NULL;
+		pITask = nullptr;
 		CoUninitialize();
 	}
 }
 
 void QTaskBarButton::setOverlayIcon(const QPixmap &pixmap, const QString &text)
 {
-	if(!pITask)	return;
+	if (!pITask)	return;
 
-	if(pixmap.isNull()) {
-		pITask->SetOverlayIcon(_winId, NULL, NULL);
+	if (pixmap.isNull()) {
+		pITask->SetOverlayIcon(_winId, nullptr, nullptr);
 	} else {
 		const HICON icon = pixmap.toWinHICON();
 		pITask->SetOverlayIcon(_winId, icon, (wchar_t *)text.utf16());
@@ -62,10 +62,10 @@
 
 void QTaskBarButton::setState(State state)
 {
-	if(!pITask)	return;
+	if (!pITask)	return;
 
 	TBPFLAG flag;
-	switch(state) {
+	switch (state) {
 	case Invisible:		flag = TBPF_NOPROGRESS;
 		break;
 	case Indeterminate:	flag = TBPF_INDETERMINATE;
@@ -78,21 +78,21 @@
 		break;
 	}
 
-	if(S_OK == pITask->SetProgressState(_winId, flag)) {
+	if (S_OK == pITask->SetProgressState(_winId, flag)) {
 		_state = state;
 	}
 }
 
 void QTaskBarButton::setValue(int value)
 {
-	if(!pITask)	return;
+	if (!pITask)	return;
 
 	int completed = value - _minimum, total = _maximum - _minimum;
-	if(completed < 0 || total <= 0) {
+	if (completed < 0 || total <= 0) {
 		return;
 	}
 
-	if(S_OK == pITask->SetProgressValue(_winId, completed, total)) {
+	if (S_OK == pITask->SetProgressValue(_winId, completed, total)) {
 		_value = value;
 		emit valueChanged(value);
 	}
@@ -123,7 +123,7 @@
 {
 	QWinTaskbarProgress *progress = _taskbarButton.progress();
 
-	switch(state) {
+	switch (state) {
 	case Invisible:
 		progress->hide();
 		break;
diff -Nru makoureactor-1.7.2/widgets/ScriptEditor.cpp makoureactor-1.8.0/widgets/ScriptEditor.cpp
--- makoureactor-1.7.2/widgets/ScriptEditor.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditor.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -21,11 +21,13 @@
 #include "ScriptEditorWidgets/ScriptEditorMathPage.h"
 #include "ScriptEditorWidgets/ScriptEditorWindowPage.h"
 #include "ScriptEditorWidgets/ScriptEditorMoviePage.h"
+#include "ScriptEditorWidgets/ScriptEditorSpecialPage.h"
 
 #define JUMP_PAGE	5
 #define IF_PAGE		6
 #define IFKEY_PAGE	7
 #define IFQ_PAGE	8
+#define JUMP_NANAKI_PAGE	17
 
 QList<Opcode::Keys> ScriptEditor::crashIfInit;
 
@@ -33,7 +35,7 @@
 	QDialog(parent, Qt::Dialog | Qt::WindowCloseButtonHint),
 	field(field), script(script), opcodeID(opcodeID), isInit(isInit), modify(modify), change(false)
 {
-	if(crashIfInit.isEmpty()) {
+	if (crashIfInit.isEmpty()) {
 		crashIfInit << Opcode::JOIN << Opcode::SPLIT
 					<< Opcode::DSKCG
 					<< Opcode::MINIGAME << Opcode::TUTOR
@@ -94,6 +96,8 @@
 	editorLayout->addWidget(new ScriptEditorWindowModePage(field, grpScript, script, opcodeID, this));
 	editorLayout->addWidget(new ScriptEditorWindowMovePage(field, grpScript, script, opcodeID, this));
 	editorLayout->addWidget(new ScriptEditorMoviePage(field, grpScript, script, opcodeID, this));
+	editorLayout->addWidget(new ScriptEditorJumpNanakiPage(field, grpScript, script, opcodeID, this));
+	editorLayout->addWidget(new ScriptEditorDLPBSavemap(field, grpScript, script, opcodeID, this));
 
 	ok = new QPushButton(tr("OK"),this);
 	ok->setDefault(true);
@@ -112,13 +116,13 @@
 	layout->addStretch();
 	layout->addLayout(buttonLayout);
 
-	if(modify) {
+	if (modify) {
 		this->opcode = Script::copyOpcode(script->opcode(opcodeID));
 		int id = opcode->id();
 
-		if(id == Opcode::SPECIAL)
+		if (id == Opcode::SPECIAL)
 			id = (((OpcodeSPECIAL *)opcode)->opcode->id() << 8) | id;
-		else if(id == Opcode::KAWAI)
+		else if (id == Opcode::KAWAI)
 			id = (((OpcodeKAWAI *)opcode)->opcode->id() << 8) | id;
 
 		setCurrentMenu(id);
@@ -132,7 +136,7 @@
 	connect(ok, SIGNAL(released()), SLOT(accept()));
 	connect(cancel, SIGNAL(released()), SLOT(close()));
 	connect(comboBox0, SIGNAL(currentIndexChanged(int)), SLOT(buildList(int)));
-	for(int i=0 ; i<editorLayout->count() ; ++i) {
+	for (int i=0; i<editorLayout->count(); ++i) {
 		connect(static_cast<ScriptEditorView *>(editorLayout->widget(i)), SIGNAL(opcodeChanged()), SLOT(refreshTextEdit()));
 	}
 	connect(comboBox, SIGNAL(currentIndexChanged(int)), SLOT(changeCurrentOpcode(int)));
@@ -141,7 +145,7 @@
 ScriptEditor::~ScriptEditor()
 {
 	Opcode *op = editorWidget->opcode();
-	if(op) {
+	if (op) {
 		delete op;
 	} else {
 		delete this->opcode;
@@ -155,7 +159,7 @@
 	editorWidget->clear();
 
 	// Change current editor widget
-	switch((Opcode::Keys)opcode->id()) {
+	switch ((Opcode::Keys)opcode->id()) {
 	case Opcode::RETTO:
 		index = 1;
 		break;
@@ -227,6 +231,12 @@
 	case Opcode::PMVIE:
 		index = 16;
 		break;
+	case Opcode::Unknown3:
+		index = 18;
+		break;
+	case Opcode::Unknown4:
+		index = JUMP_NANAKI_PAGE;
+		break;
 	default:
 		index = 0;
 	}
@@ -253,15 +263,15 @@
 
 void ScriptEditor::accept()
 {
-	/* if(!this->change) {
+	/* if (!this->change) {
 		close();
 		return;
 	} */
-	if(needslabel()) {
+	if (needslabel()) {
 		script->insertOpcode(this->opcodeID, new OpcodeLabel(((OpcodeJump *)editorWidget->opcode())->label()));
 	}
 
-	if(modify) {
+	if (modify) {
 		script->setOpcode(this->opcodeID, Script::copyOpcode(editorWidget->opcode()));
 	} else {
 		script->insertOpcode(this->opcodeID, Script::copyOpcode(editorWidget->opcode()));
@@ -274,7 +284,8 @@
 	return (editorLayout->currentIndex() == JUMP_PAGE
 			|| editorLayout->currentIndex() == IF_PAGE
 			|| editorLayout->currentIndex() == IFKEY_PAGE
-			|| editorLayout->currentIndex() == IFQ_PAGE)
+	        || editorLayout->currentIndex() == IFQ_PAGE
+	        || editorLayout->currentIndex() == JUMP_NANAKI_PAGE)
 			&& static_cast<ScriptEditorJumpPageInterface *>(editorWidget)->needsLabel();
 }
 
@@ -296,8 +307,8 @@
 
 	// Create opcode
 
-	if(Opcode::LABEL == itemData) { // LABEL exception
-		if(Opcode::LABEL == opcode->id()) {
+	if (Opcode::LABEL == itemData) { // LABEL exception
+		if (Opcode::LABEL == opcode->id()) {
 			((OpcodeLabel *)opcode)->setLabel(0);
 		} else {
 			delete opcode;
@@ -310,13 +321,13 @@
 
 		// Fill opcode with \x00
 
-		if(Opcode::KAWAI == id) { //KAWAI
+		if (Opcode::KAWAI == id) { //KAWAI
 			newOpcode.append('\x03'); // size
 			newOpcode.append((char)((itemData >> 8) & 0xFF)); // KAWAI ID
-		} else if(Opcode::SPECIAL == id) { //SPECIAL
+		} else if (Opcode::SPECIAL == id) { //SPECIAL
 			quint8 byte2 = (itemData >> 8) & 0xFF;
 			newOpcode.append((char)byte2); // SPECIAL ID
-			switch(byte2)
+			switch (byte2)
 			{
 			case 0xF5:case 0xF6:case 0xF7:case 0xFB:case 0xFC:
 				newOpcode.append('\x00');
@@ -327,12 +338,12 @@
 				break;
 			}
 		} else {
-			for(quint8 pos=1 ; pos<Opcode::length[id] ; ++pos) {
+			for (quint8 pos=1; pos<Opcode::length[id]; ++pos) {
 				newOpcode.append('\x00');
 			}
 		}
 
-		if(id == opcode->id()) {
+		if (id == opcode->id()) {
 			opcode->setParams(newOpcode.constData() + 1, newOpcode.size() - 1); // same opcode, just change params
 		} else { // change all
 			delete opcode;
@@ -345,20 +356,20 @@
 
 void ScriptEditor::setCurrentMenu(int id)
 {
-	for(int i=0 ; i<comboBox0->count() ; ++i) {
+	for (int i=0; i<comboBox0->count(); ++i) {
 		buildList(i);
 		int index = -1;
-		for(int j=0 ; j<comboBox->count() && index==-1 ; ++j) {
+		for (int j=0; j<comboBox->count() && index==-1; ++j) {
 			QList<QVariant> dataList = comboBox->itemData(j).toList();
-			foreach(const QVariant &v, dataList) {
-				if(v.toInt() == id) {
+			for (const QVariant &v : qAsConst(dataList)) {
+				if (v.toInt() == id) {
 					index = j;
 					break;
 				}
 			}
 		}
 
-		if(index != -1) {
+		if (index != -1) {
 			comboBox0->setCurrentIndex(i);
 			comboBox->setCurrentIndex(index);
 			setEnabled(true);
@@ -372,7 +383,7 @@
 void ScriptEditor::buildList(int id)
 {
 	comboBox->clear();
-	switch(id) {
+	switch (id) {
 	case 0:
 		comboBox->addItem(tr("Return"), QList<QVariant>() << 0x00);
 		comboBox->addItem(tr("Return to"), QList<QVariant>() << 0x07);
@@ -390,6 +401,7 @@
 		comboBox->addItem(tr("If key pressed"), QList<QVariant>() << 0x30 << 0x31 << 0x32);
 		comboBox->addItem(tr("If Party Member"), QList<QVariant>() << 0xCB);
 		comboBox->addItem(tr("If character exsists"), QList<QVariant>() << 0xCC);
+		comboBox->addItem(tr("[DLPB's custom opcode] If Red XIII is named Nanaki"), QList<QVariant>() << 0x1B);
 		comboBox->insertSeparator(comboBox->count());
 		comboBox->addItem(tr("Wait"), QList<QVariant>() << 0x24);
 		comboBox->addItem(tr("No Operation"), QList<QVariant>() << 0x5F);
@@ -622,7 +634,7 @@
 		comboBox->addItem(tr("Minigame"), QList<QVariant>() << 0x20);
 		comboBox->addItem(tr("Battle result load"), QList<QVariant>() << 0x23);
 		comboBox->addItem(tr("Battle Table"), QList<QVariant>() << 0x4B);
-		comboBox->addItem(tr("Change Field"), QList<QVariant>() << 0x60);
+		comboBox->addItem(tr("Change Map"), QList<QVariant>() << 0x60);
 		comboBox->addItem(tr("Last Map ID"), QList<QVariant>() << 0x6E);
 		comboBox->addItem(tr("Start Battle"), QList<QVariant>() << 0x70);
 		comboBox->addItem(tr("Battle On/Off"), QList<QVariant>() << 0x71);
@@ -633,6 +645,7 @@
 		comboBox->addItem(tr("Preload field Map"), QList<QVariant>() << 0xD8);
 		comboBox->addItem(tr("PMJMP2"), QList<QVariant>() << 0xD9);
 		comboBox->addItem(tr("Game Over"), QList<QVariant>() << 0xFF);
+		comboBox->addItem(tr("[DLPB's custom opcode] Write/Read to entire Savemap"), QList<QVariant>() << 0x1A);
 		comboBox->addItem(tr("SPECIAL - Cursor On/Off"), QList<QVariant>() << 0xF50F);
 		comboBox->addItem(tr("SPECIAL - PNAME"), QList<QVariant>() << 0xF60F);
 		comboBox->addItem(tr("SPECIAL - Game Speed"), QList<QVariant>() << 0xF70F);
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/Delegate.cpp makoureactor-1.8.0/widgets/ScriptEditorWidgets/Delegate.cpp
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/Delegate.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/Delegate.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -82,143 +82,143 @@
 	
 	int type = index.data(Qt::UserRole+2).toInt();
 	int value = index.data(Qt::EditRole).toInt();
-	if(type == ScriptEditorGenericList::field_id
-	        && !Data::field_names.isEmpty()) {
+	if (type == ScriptEditorGenericList::field_id
+	        && !Data::maplist().isEmpty()) {
 		QComboBox *comboBox = new QComboBox(parent);
-		comboBox->addItems(Data::field_names);
+		comboBox->addItems(Data::maplist());
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::group_id
+	} else if (type == ScriptEditorGenericList::group_id
 	          && _field->scriptsAndTexts()->grpScriptCount() > 0) {
 		QComboBox *comboBox = new QComboBox(parent);
-		foreach(const GrpScript *grp, _field->scriptsAndTexts()->grpScripts())
+		for (const GrpScript *grp : _field->scriptsAndTexts()->grpScripts())
 			comboBox->addItem(grp->name());
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::personnage_id) {
+	} else if (type == ScriptEditorGenericList::personnage_id) {
 		QComboBox *comboBox = new QComboBox(parent);
 		comboBox->addItems(Data::char_names);
 		int nbItems = comboBox->count();
-		for(int i=nbItems ; i<100 ; i++)
+		for (int i=nbItems; i<100; i++)
 			comboBox->addItem(QString("%1").arg(i));
-		for(int i=100 ; i<254 ; i++)
+		for (int i=100; i<254; i++)
 			comboBox->addItem(Data::char_names.last());
 		
 		comboBox->addItem(tr("(Empty)"));
 		comboBox->addItem(tr("(Empty)"));
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::text_id
+	} else if (type == ScriptEditorGenericList::text_id
 	          && _field->scriptsAndTexts()->textCount() > 0) {
 		QComboBox *comboBox = new QComboBox(parent);
 		bool jp = Config::value("jp_txt", false).toBool();
-		foreach(const FF7Text &t, _field->scriptsAndTexts()->texts())
+		for (const FF7Text &t : _field->scriptsAndTexts()->texts())
 			comboBox->addItem(t.text(jp, true).simplified());
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::item_id
+	} else if (type == ScriptEditorGenericList::item_id
 	          && !Data::item_names.isEmpty()) {
 		QComboBox *comboBox = new QComboBox(parent);
 		comboBox->addItems(Data::item_names);
 		
 		int nbItems = comboBox->count();
-		for(int i=nbItems ; i<128 ; ++i) {
+		for (int i=nbItems; i<128; ++i) {
 			comboBox->addItem(QString::number(i), i);
 		}
 		
 		comboBox->addItems(Data::weapon_names);
 		
 		nbItems = comboBox->count();
-		for(int i=nbItems ; i<256 ; ++i) {
+		for (int i=nbItems; i<256; ++i) {
 			comboBox->addItem(QString::number(i), i);
 		}
 		
 		comboBox->addItems(Data::armor_names);
 		
 		nbItems = comboBox->count();
-		for(int i=nbItems ; i<288 ; ++i) {
+		for (int i=nbItems; i<288; ++i) {
 			comboBox->addItem(QString::number(i), i);
 		}
 		
 		comboBox->addItems(Data::accessory_names);
 		
 		nbItems = comboBox->count();
-		for(int i=nbItems ; i<512 ; ++i) {
+		for (int i=nbItems; i<512; ++i) {
 			comboBox->addItem(QString::number(i), i);
 		}
 		
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::materia_id
+	} else if (type == ScriptEditorGenericList::materia_id
 	          && !Data::materia_names.isEmpty()) {
 		QComboBox *comboBox = new QComboBox(parent);
 		comboBox->addItems(Data::materia_names);
 		int nbItems = comboBox->count();
-		for(int i=nbItems ; i<256 ; ++i) {
+		for (int i=nbItems; i<256; ++i) {
 			comboBox->addItem(QString::number(i), i);
 		}
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::animation_id
+	} else if (type == ScriptEditorGenericList::animation_id
 	          && Data::currentModelID!=-1 && Data::currentHrcNames
 	          && Data::currentAnimNames) {
-		AnimEditorDialog dialog(value, 0, parent);
+		AnimEditorDialog dialog(value, parent);
 		QComboBox *editor = new QComboBox(parent);
 		editor->addItems(Data::currentAnimNames->value(Data::currentModelID));
-		if(dialog.exec() == QDialog::Accepted) {
+		if (dialog.exec() == QDialog::Accepted) {
 			editor->setCurrentIndex(dialog.chosenAnimation());
 		} else {
 			editor->setCurrentIndex(value);
 		}
 		return editor;
-	} else if(type == ScriptEditorGenericList::movie_id
+	} else if (type == ScriptEditorGenericList::movie_id
 	          && !Data::movie_names_cd1.isEmpty()) {
 		QComboBox *comboBox = new QComboBox(parent);
 		comboBox->addItems(Data::movie_names_cd1);
 		int nbItems = comboBox->count();
-		for(int i = nbItems ; i < 256 ; ++i) {
+		for (int i = nbItems; i < 256; ++i) {
 			comboBox->addItem(QString::number(i), i);
 		}
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::operateur) {
+	} else if (type == ScriptEditorGenericList::operateur) {
 		QComboBox *comboBox = new QComboBox(parent);
-		for(int i=0 ; i<OPERATORS_SIZE; ++i) {
+		for (int i=0; i<OPERATORS_SIZE; ++i) {
 			comboBox->addItem(Opcode::operators[i], i);
 		}
-		for(int i=OPERATORS_SIZE ; i<256 ; ++i) {
+		for (int i=OPERATORS_SIZE; i<256; ++i) {
 			comboBox->addItem(QString::number(i), i);
 		}
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::akao) {
+	} else if (type == ScriptEditorGenericList::akao) {
 		QComboBox *comboBox = new QComboBox(parent);
 		QList<quint8> unknownItems;
-		for(quint16 i=0 ; i<256; ++i) {
+		for (quint16 i=0; i<256; ++i) {
 			bool ok;
 			QString str = Opcode::akao(i, &ok);
-			if(ok) {
+			if (ok) {
 				comboBox->addItem(str, i);
 			} else {
 				unknownItems.append(i);
 			}
 		}
-		foreach (quint8 i, unknownItems) {
+		for (quint8 i : unknownItems) {
 			comboBox->addItem(QString::number(i), i);
 		}
 
 		return comboBox;
-	} else if(type == ScriptEditorGenericList::keys
+	} else if (type == ScriptEditorGenericList::keys
 	          && !Data::key_names.isEmpty()) {
 		KeyEditorDialog dialog(value, parent);
 		QSpinBox *editor = new QSpinBox(parent);
 		editor->setMinimum(index.data(Qt::UserRole).toInt());
 		editor->setMaximum(index.data(Qt::UserRole+1).toInt());
-		if(dialog.exec() == QDialog::Accepted) {
+		if (dialog.exec() == QDialog::Accepted) {
 			editor->setValue(dialog.keys());
 		} else {
 			editor->setValue(value);
 		}
 		return editor;
-	} else if(type == ScriptEditorGenericList::color) {
+	} else if (type == ScriptEditorGenericList::color) {
 		QSpinBox *editor = new QSpinBox(parent);
 		editor->setMinimum(index.data(Qt::UserRole).toInt());
 		editor->setMaximum(index.data(Qt::UserRole+1).toInt());
 		QColor color = qRgb(value & 0xFF, (value >> 8) & 0xFF, value >> 16);
 		color = QColorDialog::getColor(color, parent, tr("Choose a new color"));
-		if(color.isValid()) {
+		if (color.isValid()) {
 			QRgb rgb = color.rgb();
 			editor->setValue((qBlue(rgb) << 16) | (qGreen(rgb) << 8) | qRed(rgb));
 		} else {
@@ -238,31 +238,31 @@
 	int value = index.model()->data(index, Qt::EditRole).toInt(),
 	    type = index.data(Qt::UserRole + 2).toInt();
 
-	if(type == ScriptEditorGenericList::akao) {
+	if (type == ScriptEditorGenericList::akao) {
 		QComboBox *comboBox = static_cast<QComboBox*>(editor);
 		comboBox->setCurrentIndex(comboBox->findData(value));
-	} else if((type == ScriptEditorGenericList::field_id
-	    && !Data::field_names.isEmpty())
-	        || (type == ScriptEditorGenericList::group_id
-	            && _field->scriptsAndTexts()->grpScriptCount() > 0)
-	        || type == ScriptEditorGenericList::personnage_id
-	        || (type == ScriptEditorGenericList::text_id
-	            && _field->scriptsAndTexts()->textCount() > 0)
-	        || (type == ScriptEditorGenericList::item_id
-	            && !Data::item_names.isEmpty())
-	        || (type == ScriptEditorGenericList::materia_id
-	            && !Data::materia_names.isEmpty())
-	        || (type == ScriptEditorGenericList::movie_id
-	            && !Data::movie_names_cd1.isEmpty())
-	        || type == ScriptEditorGenericList::operateur) {
+	} else if ((type == ScriptEditorGenericList::field_id
+	            && !Data::maplist().isEmpty())
+	           || (type == ScriptEditorGenericList::group_id
+	               && _field->scriptsAndTexts()->grpScriptCount() > 0)
+	           || type == ScriptEditorGenericList::personnage_id
+	           || (type == ScriptEditorGenericList::text_id
+	               && _field->scriptsAndTexts()->textCount() > 0)
+	           || (type == ScriptEditorGenericList::item_id
+	               && !Data::item_names.isEmpty())
+	           || (type == ScriptEditorGenericList::materia_id
+	               && !Data::materia_names.isEmpty())
+	           || (type == ScriptEditorGenericList::movie_id
+	               && !Data::movie_names_cd1.isEmpty())
+	           || type == ScriptEditorGenericList::operateur) {
 		QComboBox *comboBox = static_cast<QComboBox*>(editor);
 		comboBox->setCurrentIndex(value);
-	} else if((type == ScriptEditorGenericList::keys
-	           && !Data::key_names.isEmpty())
-	          || type == ScriptEditorGenericList::color
-	          || (type == ScriptEditorGenericList::animation_id
-	              && Data::currentModelID!=-1 && Data::currentHrcNames
-	              && Data::currentAnimNames)) {
+	} else if ((type == ScriptEditorGenericList::keys
+	            && !Data::key_names.isEmpty())
+	           || type == ScriptEditorGenericList::color
+	           || (type == ScriptEditorGenericList::animation_id
+	               && Data::currentModelID!=-1 && Data::currentHrcNames
+	               && Data::currentAnimNames)) {
 		return;
 	} else {
 		QSpinBox *spinBox = static_cast<QSpinBox*>(editor);
@@ -276,26 +276,26 @@
 	int value,
 	    type = index.data(Qt::UserRole+2).toInt();
 
-	if(type == ScriptEditorGenericList::akao) {
+	if (type == ScriptEditorGenericList::akao) {
 		QComboBox *comboBox = static_cast<QComboBox*>(editor);
 		value = comboBox->itemData(comboBox->currentIndex()).toInt();
-	} else if((type == ScriptEditorGenericList::field_id
-	    && !Data::field_names.isEmpty())
-	        || (type == ScriptEditorGenericList::group_id
-	            && _field->scriptsAndTexts()->grpScriptCount() > 0)
-	        || type == ScriptEditorGenericList::personnage_id
-	        || (type == ScriptEditorGenericList::text_id
-	            && _field->scriptsAndTexts()->textCount() > 0)
-	        || (type == ScriptEditorGenericList::item_id
-	            && !Data::item_names.isEmpty())
-	        || (type == ScriptEditorGenericList::materia_id
-	            && !Data::materia_names.isEmpty())
-	        || (type == ScriptEditorGenericList::animation_id
-	            && Data::currentModelID!=-1 && Data::currentHrcNames
-	            && Data::currentAnimNames)
-	        || (type == ScriptEditorGenericList::movie_id
-	            && !Data::movie_names_cd1.isEmpty())
-	        || type == ScriptEditorGenericList::operateur) {
+	} else if ((type == ScriptEditorGenericList::field_id
+	            && !Data::maplist().isEmpty())
+	           || (type == ScriptEditorGenericList::group_id
+	               && _field->scriptsAndTexts()->grpScriptCount() > 0)
+	           || type == ScriptEditorGenericList::personnage_id
+	           || (type == ScriptEditorGenericList::text_id
+	               && _field->scriptsAndTexts()->textCount() > 0)
+	           || (type == ScriptEditorGenericList::item_id
+	               && !Data::item_names.isEmpty())
+	           || (type == ScriptEditorGenericList::materia_id
+	               && !Data::materia_names.isEmpty())
+	           || (type == ScriptEditorGenericList::animation_id
+	               && Data::currentModelID!=-1 && Data::currentHrcNames
+	               && Data::currentAnimNames)
+	           || (type == ScriptEditorGenericList::movie_id
+	               && !Data::movie_names_cd1.isEmpty())
+	           || type == ScriptEditorGenericList::operateur) {
 		QComboBox *comboBox = static_cast<QComboBox*>(editor);
 		value = comboBox->currentIndex();
 	} else {
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorGenericList.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -67,11 +67,11 @@
 {
 	bool isLabel;
 	QByteArray newOpcode = parseModel(&isLabel);
-	if(newOpcode.isEmpty()) {
+	if (newOpcode.isEmpty()) {
 		return opcodePtr();
 	}
 
-	if(isLabel) {
+	if (isLabel) {
 		quint32 label;
 		memcpy(&label, newOpcode.constData() + 1, 4);
 		ScriptEditorView::setOpcode(new OpcodeLabel(label));
@@ -102,10 +102,10 @@
 	length = 0;
 	start = 1;
 	
-	if(byte == 0x0F) { // SPECIAL
+	if (byte == 0x0F) { // SPECIAL
 		quint8 byte2 = ((OpcodeSPECIAL *)opcodePtr())->opcode->id();
 		newOpcode.append((char)byte2);
-		switch(byte2) {
+		switch (byte2) {
 		case 0xF5:case 0xF6:case 0xF7:case 0xFB:case 0xFC:
 				length = 1;
 			break;
@@ -114,12 +114,12 @@
 			break;
 		}
 		start = 2;
-	} else if(byte == 0x28) { // KAWAI
+	} else if (byte == 0x28) { // KAWAI
 		quint8 byte3 = ((OpcodeKAWAI *)opcodePtr())->opcode->id();
 		length = model->rowCount()+3;
 		newOpcode.append((char)length);
 		newOpcode.append((char)byte3);
-		for(quint8 i=0 ; i<length-3 ; ++i) {
+		for (quint8 i=0; i<length-3; ++i) {
 			newOpcode.append(model->item(i, 1)->text().toUInt());
 		}
 		return newOpcode;
@@ -129,27 +129,27 @@
 	newOpcode.append(QByteArray(length-start, '\x0'));
 	QList<int> paramTypes = this->paramTypes(opcodePtr()->id());
 
-	if(!paramTypes.isEmpty()) {
+	if (!paramTypes.isEmpty()) {
 		int cur = 8;
-		for(quint8 i=0 ; i<paramTypes.size() ; ++i) {
+		for (quint8 i=0; i<paramTypes.size(); ++i) {
 			int paramType = paramTypes.at(i),
 			    value = model->data(model->index(i, 1), Qt::EditRole).toInt();
 
 			int paramSize = this->paramSize(paramType);
 			int startBA = cur / 8, sizeBA;
-			if(paramSize % 8 != 0) {
+			if (paramSize % 8 != 0) {
 				sizeBA = paramSize / 8 + 1;
 			} else {
 				sizeBA = paramSize / 8;
 			}
 
-			if(paramSize < 8) {
+			if (paramSize < 8) {
 				int startLocal = cur % 8;
 				newOpcode[startBA] = (char)((quint8)newOpcode.at(startBA) | (value << (8-paramSize-startLocal)));
-			} else if(paramSize == 8) {
+			} else if (paramSize == 8) {
 				newOpcode[startBA] = (char)(value & 0xFF);
 			} else {
-				for(int j=0 ; j<sizeBA ; j++) {
+				for (int j=0; j<sizeBA; j++) {
 					newOpcode[startBA+j] = (char)((value>>(j*8)) & 0xFF);
 				}
 			}
@@ -157,7 +157,7 @@
 			cur += paramSize;
 		}
 	} else {
-		for(quint8 i=start ; i<length ; ++i) {
+		for (quint8 i=start; i<length; ++i) {
 			newOpcode[i] = model->item(i-start, 1)->text().toUInt();
 		}
 	}
@@ -167,7 +167,7 @@
 
 void ScriptEditorGenericList::addParam()
 {
-	if(model->rowCount() < 252) {
+	if (model->rowCount() < 252) {
 		addRow(0, 0, 255, inconnu);
 		emit opcodeChanged();
 	}
@@ -204,32 +204,32 @@
 	int paramSize, paramType, cur = 0, maxValue, minValue, value=0;
 	QList<int> paramTypes = this->paramTypes(opcodePtr()->id());
 	
-	if(opcodePtr()->isLabel()) {
+	if (opcodePtr()->isLabel()) {
 		addRow(((OpcodeLabel *)opcodePtr())->label(), 0, (int)pow(2, 31)-1, label);
-	} else if(paramTypes.isEmpty()) {
+	} else if (paramTypes.isEmpty()) {
 		int start = 0;
-		if(opcodePtr()->id() == 0x0F) { //SPECIAL
+		if (opcodePtr()->id() == 0x0F) { //SPECIAL
 			start = 1;
 		}
-		if(opcodePtr()->id() == 0x28) { //KAWAI
+		if (opcodePtr()->id() == 0x28) { //KAWAI
 			start = 2;
 			addButton->show();
 			delButton->show();
 		}
 		const QByteArray params = opcodePtr()->params();
-		for(int i=start ; i<params.size() ; ++i) {
+		for (int i=start; i<params.size(); ++i) {
 			addRow((quint8)params.at(i), 0, 255, inconnu);
 		}
 	} else {
-		for(quint8 i=0 ; i<paramTypes.size() ; ++i) {
+		for (quint8 i=0; i<paramTypes.size(); ++i) {
 			paramType = paramTypes.at(i);
 			paramSize = this->paramSize(paramType);
 			value = opcodePtr()->subParam(cur, paramSize);
 			// qDebug() << value;
-			if(paramIsSigned(paramType)) {
+			if (paramIsSigned(paramType)) {
 				maxValue = (int)pow(2, paramSize-1)-1;
 				minValue = -maxValue-1;
-				if(value>maxValue) {
+				if (value>maxValue) {
 					value -= (int)pow(2, paramSize);
 				}
 			} else {
@@ -245,7 +245,7 @@
 QList<int> ScriptEditorGenericList::paramTypes(int id)
 {
 	QList<int> paramTypes;
-	switch(id) {
+	switch (id) {
 	//case 0x00:break;
 	case 0x01:case 0x02:case 0x03:
 		paramTypes<<group_id<<priorite<<script_id;break;
@@ -279,7 +279,11 @@
 		paramTypes<<bank<<bank<<word<<word<<operateur<<jump;break;
 	case 0x19:
 		paramTypes<<bank<<bank<<word<<word<<operateur<<jump_l;break;
-	//case 0x1A:case 0x1B:case 0x1C:case 0x1D:case 0x1E:case 0x1F:break;
+	case 0x1A:
+		paramTypes<<word<<word<<dword<<byte;break;
+	case 0x1B:
+		paramTypes<<jump_l;break;
+	//case 0x1C:case 0x1D:case 0x1E:case 0x1F:break;
 	case 0x20:
 		paramTypes<<field_id<<coord_x<<coord_y<<polygone_id<<byte<<minijeu_id;break;
 	case 0x21:
@@ -551,7 +555,8 @@
 
 int ScriptEditorGenericList::paramSize(int type)
 {
-	switch(type) {
+	switch (type) {
+	case dword:
 	case label:				return 32;
 	case color:				return 24;
 	case word:
@@ -578,7 +583,7 @@
 
 bool ScriptEditorGenericList::paramIsSigned(int type)
 {
-	switch(type) {
+	switch (type) {
 	case sword:
 	case coord_x:
 	case coord_y:
@@ -589,7 +594,8 @@
 
 QString ScriptEditorGenericList::paramName(int type)
 {
-	switch(type) {
+	switch (type) {
+	case dword:				return tr("Double long");
 	case word:				return tr("Long");
 	case sword:				return tr("Signed long");
 	case coord_x:			return tr("X coordinate");
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorGenericList.h makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorGenericList.h
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorGenericList.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorGenericList.h	2020-08-08 18:46:56.000000000 +0000
@@ -31,7 +31,7 @@
 		/*10*/layer_id, parametre_id, state_id, window_id, text_id, /*15*/item_id, materia_id, animation_id, music_id, sound_id, /*20*/movie_id,
 		operateur, keys, color, coord_x, coord_y, coord_z, window_w, window_h, window_num, window_type, window_var, direction, vitesse, vitesse2,
 		priorite, menu, jump, jump_l, rotation, quantity,
-		bank, adress, byte, word, sword, bit, boolean, label, akao
+		bank, adress, byte, word, sword, bit, boolean, label, akao, dword
 	};
 
 	ScriptEditorGenericList(Field *field, GrpScript *grpScript, Script *script, int opcodeID, QWidget *parent=0);
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorMathPage.cpp makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorMathPage.cpp
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorMathPage.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorMathPage.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -78,7 +78,7 @@
 
 	var->var(bank1, adress1);
 
-	if(varOrValue->isValue()) {
+	if (varOrValue->isValue()) {
 		bank2 = 0;
 		value = varOrValue->value();
 	} else {
@@ -98,14 +98,14 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
 	type1->setEnabled(true);
 	type2->setEnabled(true);
 
-	switch((Opcode::Keys)opcode->id()) {
+	switch ((Opcode::Keys)opcode->id()) {
 	case Opcode::SETBYTE:case Opcode::SETWORD:
 		operationList->setCurrentIndex(0);
 		break;
@@ -160,14 +160,14 @@
 	varOrValue->setLongValueType(opcodeBinaryOperation->isLong());
 	type1->setChecked(!opcodeBinaryOperation->isLong());
 	type2->setChecked(opcodeBinaryOperation->isLong());
-	if(B2(opcodeBinaryOperation->banks) != 0) {
+	if (B2(opcodeBinaryOperation->banks) != 0) {
 		varOrValue->setVar(B2(opcodeBinaryOperation->banks), opcodeBinaryOperation->value & 0xFF);
 		varOrValue->setIsValue(false);
 	} else {
 		varOrValue->setValue(opcodeBinaryOperation->value);
 		varOrValue->setIsValue(true);
 	}
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -177,8 +177,8 @@
 	varOrValue->setLongValueType(type2->isChecked());
 	Opcode::Keys key = (Opcode::Keys)opcodePtr()->id();
 
-	if(type1->isChecked()) {
-		switch(key) {
+	if (type1->isChecked()) {
+		switch (key) {
 		case Opcode::SETWORD:	key = Opcode::SETBYTE;	break;
 		case Opcode::PLUS2:		key = Opcode::PLUS;		break;
 		case Opcode::PLUS2X:	key = Opcode::PLUSX;	break;
@@ -193,7 +193,7 @@
 		default:	break;
 		}
 	} else {
-		switch(key) {
+		switch (key) {
 		case Opcode::SETBYTE:	key = Opcode::SETWORD;	break;
 		case Opcode::PLUS:		key = Opcode::PLUS2;	break;
 		case Opcode::PLUSX:		key = Opcode::PLUS2X;	break;
@@ -209,7 +209,7 @@
 		}
 	}
 
-	if(key != opcodePtr()->id()) {
+	if (key != opcodePtr()->id()) {
 		convertOpcode(key);
 
 		emit(opcodeChanged());
@@ -223,7 +223,7 @@
 	type1->setEnabled(true);
 	type2->setEnabled(true);
 
-	switch(index) {
+	switch (index) {
 	case 0:
 		key = type1->isChecked()
 				? Opcode::SETBYTE
@@ -306,7 +306,7 @@
 		break;
 	}
 
-	if(key != opcodePtr()->id()) {
+	if (key != opcodePtr()->id()) {
 		convertOpcode(key);
 
 		emit(opcodeChanged());
@@ -315,11 +315,11 @@
 
 Opcode *ScriptEditorBinaryOpPage::convertOpcode(Opcode::Keys key)
 {
-	if(key == opcodePtr()->id())	return opcodePtr();
+	if (key == opcodePtr()->id())	return opcodePtr();
 
 	OpcodeBinaryOperation *binop = (OpcodeBinaryOperation *)opcodePtr();
 
-	switch(key) {
+	switch (key) {
 	case Opcode::SETBYTE:	ScriptEditorView::setOpcode(new OpcodeSETBYTE(*binop));		break;
 	case Opcode::SETWORD:	ScriptEditorView::setOpcode(new OpcodeSETWORD(*binop));		break;
 	case Opcode::PLUS:		ScriptEditorView::setOpcode(new OpcodePLUS(*binop));		break;
@@ -408,14 +408,14 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
 	type1->setEnabled(true);
 	type2->setEnabled(true);
 
-	switch((Opcode::Keys)opcode->id()) {
+	switch ((Opcode::Keys)opcode->id()) {
 	case Opcode::INC:case Opcode::INC2:
 		operationList->setCurrentIndex(0);
 		break;
@@ -444,7 +444,7 @@
 	type1->setChecked(!opcodeUnaryOperation->isLong());
 	type2->setChecked(opcodeUnaryOperation->isLong());
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -453,8 +453,8 @@
 {
 	Opcode::Keys key = (Opcode::Keys)opcodePtr()->id();
 
-	if(type1->isChecked()) {
-		switch(key) {
+	if (type1->isChecked()) {
+		switch (key) {
 		case Opcode::INC2X:	key = Opcode::INCX;	break;
 		case Opcode::INC2:	key = Opcode::INC;	break;
 		case Opcode::DEC2X:	key = Opcode::DECX;	break;
@@ -462,7 +462,7 @@
 		default:	break;
 		}
 	} else {
-		switch(key) {
+		switch (key) {
 		case Opcode::INCX:	key = Opcode::INC2X;	break;
 		case Opcode::INC:	key = Opcode::INC2;		break;
 		case Opcode::DECX:	key = Opcode::DEC2X;	break;
@@ -471,7 +471,7 @@
 		}
 	}
 
-	if(key != opcodePtr()->id()) {
+	if (key != opcodePtr()->id()) {
 		convertOpcode(key);
 
 		emit(opcodeChanged());
@@ -485,7 +485,7 @@
 	type1->setEnabled(true);
 	type2->setEnabled(true);
 
-	switch(index) {
+	switch (index) {
 	case 0:
 		key = type1->isChecked()
 				? Opcode::INC
@@ -516,7 +516,7 @@
 		break;
 	}
 
-	if(key != opcodePtr()->id()) {
+	if (key != opcodePtr()->id()) {
 		convertOpcode(key);
 
 		emit(opcodeChanged());
@@ -532,11 +532,11 @@
 
 Opcode *ScriptEditorUnaryOpPage::convertOpcode(Opcode::Keys key)
 {
-	if(key == opcodePtr()->id())	return opcodePtr();
+	if (key == opcodePtr()->id())	return opcodePtr();
 
 	OpcodeUnaryOperation *unop = (OpcodeUnaryOperation *)opcodePtr();
 
-	switch(key) {
+	switch (key) {
 	case Opcode::INC:		ScriptEditorView::setOpcode(new OpcodeINC(*unop));		break;
 	case Opcode::INC2:		ScriptEditorView::setOpcode(new OpcodeINC2(*unop));		break;
 	case Opcode::INCX:		ScriptEditorView::setOpcode(new OpcodeINCX(*unop));		break;
@@ -596,7 +596,7 @@
 
 	var->var(bank1, adress1);
 
-	if(position->isValue()) {
+	if (position->isValue()) {
 		bank2 = 0;
 		value = position->value();
 	} else {
@@ -616,11 +616,11 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
-	switch((Opcode::Keys)opcode->id()) {
+	switch ((Opcode::Keys)opcode->id()) {
 	case Opcode::BITON:
 		operationList->setCurrentIndex(0);
 		break;
@@ -638,7 +638,7 @@
 
 	var->setVar(B1(opcodeBitOperation->banks), opcodeBitOperation->var);
 
-	if(B2(opcodeBitOperation->banks) != 0) {
+	if (B2(opcodeBitOperation->banks) != 0) {
 		position->setVar(B2(opcodeBitOperation->banks), opcodeBitOperation->position);
 		position->setIsValue(false);
 	} else {
@@ -646,7 +646,7 @@
 		position->setIsValue(true);
 	}
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -655,14 +655,14 @@
 {
 	Opcode::Keys key;
 
-	switch(index) {
+	switch (index) {
 	case 0:	key = Opcode::BITON;	break;
 	case 1:	key = Opcode::BITOFF;	break;
 	case 2:	key = Opcode::BITXOR;	break;
 	default: key = (Opcode::Keys)opcodePtr()->id();	break;
 	}
 
-	if(key != opcodePtr()->id()) {
+	if (key != opcodePtr()->id()) {
 		convertOpcode(key);
 
 		emit(opcodeChanged());
@@ -671,11 +671,11 @@
 
 Opcode *ScriptEditorBitOpPage::convertOpcode(Opcode::Keys key)
 {
-	if(key == opcodePtr()->id())	return opcodePtr();
+	if (key == opcodePtr()->id())	return opcodePtr();
 
 	OpcodeBitOperation *bitop = (OpcodeBitOperation *)opcodePtr();
 
-	switch(key) {
+	switch (key) {
 	case Opcode::BITON:		ScriptEditorView::setOpcode(new OpcodeBITON(*bitop));	break;
 	case Opcode::BITOFF:	ScriptEditorView::setOpcode(new OpcodeBITOFF(*bitop));	break;
 	case Opcode::BITXOR:	ScriptEditorView::setOpcode(new OpcodeBITXOR(*bitop));	break;
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorMoviePage.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -1,3 +1,20 @@
+/****************************************************************************
+ ** Makou Reactor Final Fantasy VII Field Script Editor
+ ** Copyright (C) 2009-2020 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
 #include "ScriptEditorMoviePage.h"
 #include "Data.h"
 
@@ -16,26 +33,26 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(new QLabel(tr("Disc")), 0, 0);
-	layout->addWidget(discList, 0, 1);
+	layout->addWidget(discList, 0, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Video")), 1, 0);
-	layout->addWidget(movieList, 1, 1);
+	layout->addWidget(movieList, 1, 1, 1, 3);
 	layout->setRowStretch(2, 1);
-	layout->setColumnStretch(2, 1);
 	layout->setContentsMargins(QMargins());
 
 	connect(discList, SIGNAL(currentIndexChanged(int)), SLOT(setMovieListItemTexts(int)));
+	connect(movieList, SIGNAL(currentIndexChanged(int)), SIGNAL(opcodeChanged()));
 }
 
 void ScriptEditorMoviePage::buildDiscList()
 {
-	for(int discID = 1 ; discID <= 3 ; ++discID) {
+	for (int discID = 1; discID <= 3; ++discID) {
 		discList->addItem(tr("Disc %1").arg(discID));
 	}
 }
 
 void ScriptEditorMoviePage::buildMovieList(int discID)
 {
-	for(int i = 0 ; i < 256 ; ++i) {
+	for (int i = 0; i < 256; ++i) {
 		movieList->addItem(QString());
 	}
 	setMovieListItemTexts(discID);
@@ -45,19 +62,19 @@
 {
 	QStringList *movieNames;
 
-	if(discID == 1) {
+	if (discID == 1) {
 		movieNames = &Data::movie_names_cd2;
-	} else if(discID == 2) {
+	} else if (discID == 2) {
 		movieNames = &Data::movie_names_cd3;
 	} else {
 		movieNames = &Data::movie_names_cd1;
 	}
 
 	int nbItems = movieNames->size();
-	for(int i = 0 ; i < nbItems ; ++i) {
+	for (int i = 0; i < nbItems; ++i) {
 		movieList->setItemText(i, movieNames->at(i));
 	}
-	for(int i = nbItems ; i < 256 ; ++i) {
+	for (int i = nbItems; i < 256; ++i) {
 		movieList->setItemText(i, QString::number(i));
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorMoviePage.h makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorMoviePage.h
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorMoviePage.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorMoviePage.h	2020-08-08 18:46:56.000000000 +0000
@@ -1,3 +1,20 @@
+/****************************************************************************
+ ** Makou Reactor Final Fantasy VII Field Script Editor
+ ** Copyright (C) 2009-2020 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
 #ifndef SCRIPTEDITORMOVIEPAGE_H
 #define SCRIPTEDITORMOVIEPAGE_H
 
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,96 @@
+/****************************************************************************
+ ** Makou Reactor Final Fantasy VII Field Script Editor
+ ** Copyright (C) 2009-2020 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#include "ScriptEditorSpecialPage.h"
+
+ScriptEditorDLPBSavemap::ScriptEditorDLPBSavemap(Field *field, GrpScript *grpScript,
+                                         Script *script, int opcodeID,
+                                         QWidget *parent) :
+    ScriptEditorView(field, grpScript, script, opcodeID, parent)
+{
+}
+
+void ScriptEditorDLPBSavemap::build()
+{
+	_from = new QSpinBox(this);
+	_from->setRange(0, 65535);
+	_to = new QSpinBox(this);
+	_to->setRange(0, 65535);
+	_absValue = new QDoubleSpinBox(this);
+	_absValue->setDecimals(0);
+	_absValue->setRange(0, pow(2, 32)-1);
+
+	_flag = new QComboBox(this);
+	_flag->addItem("-");
+	_flag->addItem(tr("8 bit"));
+	_flag->addItem(tr("16 bit"));
+	_flag->addItem(tr("24 bit"));
+	_flag->addItem(tr("32 bit"));
+
+	_fromIsPointer = new QCheckBox(tr("From is a pointer"), this);
+	_toIsPointer = new QCheckBox(tr("To is a pointer"), this);
+
+	QGridLayout *layout = new QGridLayout(this);
+	layout->addWidget(new QLabel(tr("From")), 0, 0);
+	layout->addWidget(_from, 0, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("To")), 1, 0);
+	layout->addWidget(_to, 1, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("Abs Value")), 2, 0);
+	layout->addWidget(_absValue, 2, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("Size")), 3, 0);
+	layout->addWidget(_flag, 3, 1, 1, 3);
+	layout->addWidget(_fromIsPointer, 4, 0, 1, 2);
+	layout->addWidget(_toIsPointer, 4, 2, 1, 2);
+	layout->setRowStretch(5, 1);
+	layout->setColumnStretch(2, 1);
+	layout->setContentsMargins(QMargins());
+
+	connect(_from, SIGNAL(editingFinished()), SIGNAL(opcodeChanged()));
+	connect(_to, SIGNAL(editingFinished()), SIGNAL(opcodeChanged()));
+	connect(_absValue, SIGNAL(editingFinished()), SIGNAL(opcodeChanged()));
+	connect(_flag, SIGNAL(currentIndexChanged(int)), SIGNAL(opcodeChanged()));
+	connect(_fromIsPointer, SIGNAL(toggled(bool)), SIGNAL(opcodeChanged()));
+	connect(_toIsPointer, SIGNAL(toggled(bool)), SIGNAL(opcodeChanged()));
+}
+
+Opcode *ScriptEditorDLPBSavemap::opcode()
+{
+	Opcode1A *opcode = (Opcode1A *)opcodePtr();
+
+	opcode->from = quint16(_from->value());
+	opcode->to = quint16(_to->value());
+	opcode->absValue = quint32(_absValue->value());
+	opcode->flag = quint8((_toIsPointer->isChecked() << 5) |
+	                      (_fromIsPointer->isChecked() << 4) |
+	                      quint8(_flag->currentIndex()));
+
+	return opcodePtr();
+}
+
+void ScriptEditorDLPBSavemap::setOpcode(Opcode *opcode)
+{
+	ScriptEditorView::setOpcode(opcode);
+
+	Opcode1A *o = (Opcode1A *)opcode;
+
+	_from->setValue(o->from);
+	_to->setValue(o->to);
+	_absValue->setValue(o->absValue);
+	_flag->setCurrentIndex(o->flag & 0x7);
+	_fromIsPointer->setChecked(o->flag & 0x10);
+	_toIsPointer->setChecked(o->flag & 0x20);
+}
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.h makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.h
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.h	1970-01-01 00:00:00.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorSpecialPage.h	2020-08-08 18:46:56.000000000 +0000
@@ -0,0 +1,40 @@
+/****************************************************************************
+ ** Makou Reactor Final Fantasy VII Field Script Editor
+ ** Copyright (C) 2009-2020 Arzel Jérôme <myst6re@gmail.com>
+ **
+ ** This program is free software: you can redistribute it and/or modify
+ ** it under the terms of the GNU General Public License as published by
+ ** the Free Software Foundation, either version 3 of the License, or
+ ** (at your option) any later version.
+ **
+ ** This program is distributed in the hope that it will be useful,
+ ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ** GNU General Public License for more details.
+ **
+ ** You should have received a copy of the GNU General Public License
+ ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+#ifndef SCRIPTEDITORSPECIAL_H
+#define SCRIPTEDITORSPECIAL_H
+
+#include <QtWidgets>
+#include "ScriptEditorView.h"
+
+class ScriptEditorDLPBSavemap : public ScriptEditorView
+{
+	Q_OBJECT
+public:
+	ScriptEditorDLPBSavemap(Field *field, GrpScript *grpScript, Script *script,
+	                        int opcodeID, QWidget *parent = nullptr);
+	Opcode *opcode();
+	void setOpcode(Opcode *opcode);
+private:
+	void build();
+	QSpinBox *_from, *_to;
+	QDoubleSpinBox *_absValue;
+	QComboBox *_flag;
+	QCheckBox *_fromIsPointer, *_toIsPointer;
+};
+
+#endif // SCRIPTEDITORSPECIAL_H
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorStructPage.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -26,7 +26,7 @@
 void ScriptEditorReturnToPage::build()
 {
 	scriptList = new QComboBox(this);
-	for(int i=0 ; i<32 ; ++i) {
+	for (int i=0; i<32; ++i) {
 		scriptList->addItem(tr("Script %1").arg(i));
 	}
 
@@ -35,9 +35,9 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(new QLabel(tr("Script")), 0, 0);
-	layout->addWidget(scriptList, 0, 1);
+	layout->addWidget(scriptList, 0, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Priority")), 1, 0);
-	layout->addWidget(priority, 1, 1);
+	layout->addWidget(priority, 1, 1, 1, 3);
 	layout->setRowStretch(2, 1);
 	layout->setContentsMargins(QMargins());
 
@@ -58,7 +58,7 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
@@ -66,7 +66,7 @@
 	scriptList->setCurrentIndex(opcodeRETTO->scriptID);
 	priority->setValue(opcodeRETTO->priority);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -80,12 +80,12 @@
 {
 	groupList = new QComboBox(this);
 	int i=0;
-	foreach(const GrpScript *group, field()->scriptsAndTexts()->grpScripts()) {
+	for (const GrpScript *group : field()->scriptsAndTexts()->grpScripts()) {
 		groupList->addItem(QString("%1 - %2").arg(i++).arg(group->name()));
 	}
 
 	scriptList = new QComboBox(this);
-	for(int i=0 ; i<32 ; ++i) {
+	for (int i=0; i<32; ++i) {
 		scriptList->addItem("");
 	}
 
@@ -99,13 +99,13 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(new QLabel(tr("Group")), 0, 0);
-	layout->addWidget(groupList, 0, 1);
+	layout->addWidget(groupList, 0, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Script")), 1, 0);
-	layout->addWidget(scriptList, 1, 1);
+	layout->addWidget(scriptList, 1, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Priority")), 2, 0);
-	layout->addWidget(priority, 2, 1);
+	layout->addWidget(priority, 2, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Type")), 3, 0);
-	layout->addWidget(execType, 3, 1);
+	layout->addWidget(execType, 3, 1, 1, 3);
 	layout->setRowStretch(4, 1);
 	layout->setContentsMargins(QMargins());
 
@@ -130,11 +130,11 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
-	switch((Opcode::Keys)opcode->id()) {
+	switch ((Opcode::Keys)opcode->id()) {
 	case Opcode::REQ:		execType->setCurrentIndex(0);	break;
 	case Opcode::REQSW:		execType->setCurrentIndex(1);	break;
 	case Opcode::REQEW:		execType->setCurrentIndex(2);	break;
@@ -144,7 +144,7 @@
 	OpcodeExec *opcodeExec = (OpcodeExec *)opcode;
 
 	GrpScript *grp = field()->scriptsAndTexts()->grpScripts().value(opcodeExec->groupID, 0);
-	if(!grp) {
+	if (!grp) {
 		setValid(false);
 		return;
 	} else {
@@ -153,14 +153,14 @@
 
 	groupList->setCurrentIndex(opcodeExec->groupID);
 
-	for(int i=0 ; i<32 ; ++i) {
+	for (int i=0; i<32; ++i) {
 		scriptList->setItemText(i, grp->scriptName(i+1));
 	}
 	scriptList->setCurrentIndex(opcodeExec->scriptID);
 
 	priority->setValue(opcodeExec->priority);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -168,11 +168,11 @@
 void ScriptEditorExecPage::updateScriptList(int groupID)
 {
 	GrpScript *grp = field()->scriptsAndTexts()->grpScripts().value(groupID, 0);
-	if(!grp) {
+	if (!grp) {
 		return;
 	}
 
-	for(int i=0 ; i<32 ; ++i) {
+	for (int i=0; i<32; ++i) {
 		scriptList->setItemText(i, grp->scriptName(i+1));
 	}
 }
@@ -181,14 +181,14 @@
 {
 	Opcode::Keys key;
 
-	switch(index) {
+	switch (index) {
 	case 0:		key = Opcode::REQ;		break;
 	case 1:		key = Opcode::REQSW;	break;
 	case 2:		key = Opcode::REQEW;	break;
 	default:	key = (Opcode::Keys)opcodePtr()->id();
 	}
 
-	if(key != opcodePtr()->id()) {
+	if (key != opcodePtr()->id()) {
 		convertOpcode(key);
 
 		emit(opcodeChanged());
@@ -197,11 +197,11 @@
 
 Opcode *ScriptEditorExecPage::convertOpcode(Opcode::Keys key)
 {
-	if(key == opcodePtr()->id())	return opcodePtr();
+	if (key == opcodePtr()->id())	return opcodePtr();
 
 	OpcodeExec *exec = (OpcodeExec *)opcodePtr();
 
-	switch(key) {
+	switch (key) {
 	case Opcode::REQ:		ScriptEditorView::setOpcode(new OpcodeREQ(*exec));		break;
 	case Opcode::REQSW:		ScriptEditorView::setOpcode(new OpcodeREQSW(*exec));	break;
 	case Opcode::REQEW:		ScriptEditorView::setOpcode(new OpcodeREQEW(*exec));	break;
@@ -222,7 +222,7 @@
 	partyID = new QSpinBox(this);
 	partyID->setRange(0, 255);
 	scriptList = new QComboBox(this);
-	for(int i=0 ; i<32 ; ++i) {
+	for (int i=0; i<32; ++i) {
 		scriptList->addItem(tr("Script %1").arg(i));
 	}
 
@@ -236,13 +236,13 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(new QLabel(tr("Team member")), 0, 0);
-	layout->addWidget(partyID, 0, 1);
+	layout->addWidget(partyID, 0, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Script")), 1, 0);
-	layout->addWidget(scriptList, 1, 1);
+	layout->addWidget(scriptList, 1, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Priority")), 2, 0);
-	layout->addWidget(priority, 2, 1);
+	layout->addWidget(priority, 2, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Type")), 3, 0);
-	layout->addWidget(execType, 3, 1);
+	layout->addWidget(execType, 3, 1, 1, 3);
 	layout->setRowStretch(4, 1);
 	layout->setContentsMargins(QMargins());
 
@@ -267,11 +267,11 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
-	switch((Opcode::Keys)opcode->id()) {
+	switch ((Opcode::Keys)opcode->id()) {
 	case Opcode::PREQ:		execType->setCurrentIndex(0);	break;
 	case Opcode::PRQSW:		execType->setCurrentIndex(1);	break;
 	case Opcode::PRQEW:		execType->setCurrentIndex(2);	break;
@@ -283,7 +283,7 @@
 	scriptList->setCurrentIndex(opcodeExecChar->scriptID);
 	priority->setValue(opcodeExecChar->priority);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -293,14 +293,14 @@
 {
 	Opcode::Keys key;
 
-	switch(index) {
+	switch (index) {
 	case 0:		key = Opcode::PREQ;		break;
 	case 1:		key = Opcode::PRQSW;	break;
 	case 2:		key = Opcode::PRQEW;	break;
 	default:	key = (Opcode::Keys)opcodePtr()->id();
 	}
 
-	if(key != opcodePtr()->id()) {
+	if (key != opcodePtr()->id()) {
 		convertOpcode(key);
 
 		emit(opcodeChanged());
@@ -309,11 +309,11 @@
 
 Opcode *ScriptEditorExecCharPage::convertOpcode(Opcode::Keys key)
 {
-	if(key == opcodePtr()->id())	return opcodePtr();
+	if (key == opcodePtr()->id())	return opcodePtr();
 
 	OpcodeExecChar *exec = (OpcodeExecChar *)opcodePtr();
 
-	switch(key) {
+	switch (key) {
 	case Opcode::PREQ:		ScriptEditorView::setOpcode(new OpcodePREQ(*exec));		break;
 	case Opcode::PRQSW:		ScriptEditorView::setOpcode(new OpcodePRQSW(*exec));	break;
 	case Opcode::PRQEW:		ScriptEditorView::setOpcode(new OpcodePRQEW(*exec));	break;
@@ -337,7 +337,7 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(new QLabel(tr("Label")), 0, 0);
-	layout->addWidget(label, 0, 1);
+	layout->addWidget(label, 0, 1, 1, 3);
 	layout->setRowStretch(1, 1);
 	layout->setContentsMargins(QMargins());
 
@@ -358,12 +358,12 @@
 	ScriptEditorView::setOpcode(opcode);
 
 	OpcodeLabel *opcodeLabel = (OpcodeLabel *)opcode;
-	if(opcodeLabel->label() == 0) {
+	if (opcodeLabel->label() == 0) {
 		quint32 greaterLabel=1;
-		foreach(Opcode *op, script()->opcodes()) {
-			if(op->isLabel()) {
+		for (Opcode *op : script()->opcodes()) {
+			if (op->isLabel()) {
 				quint32 lbl = ((OpcodeLabel *)op)->label();
-				if(lbl >= greaterLabel) {
+				if (lbl >= greaterLabel) {
 					greaterLabel = lbl + 1;
 				}
 			}
@@ -387,13 +387,13 @@
 	quint32 greaterLabel=1;
 	int i=0;
 
-	foreach(Opcode *op, script()->opcodes()) {
-		if(op->isLabel()) {
+	for (Opcode *op : script()->opcodes()) {
+		if (op->isLabel()) {
 			quint32 lbl = ((OpcodeLabel *)op)->label();
-			if(jumpBack || i >= opcodeID()) {
+			if (jumpBack || i >= opcodeID()) {
 				label->addItem(tr("Label %1").arg(lbl), lbl);
 			}
-			if(lbl >= greaterLabel) {
+			if (lbl >= greaterLabel) {
 				greaterLabel = lbl + 1;
 			}
 		}
@@ -404,7 +404,7 @@
 	label->addItem(tr("New label"), greaterLabel);
 
 	int index = label->findData(opcodeJump->label());
-	if(index < 0)		index = 0;
+	if (index < 0)		index = 0;
 //	_valid = label->count() > 0;
 	label->setCurrentIndex(index);
 	label->blockSignals(false);
@@ -425,9 +425,9 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(new QLabel(tr("Label")), 0, 0);
-	layout->addWidget(label, 0, 1);
-	layout->addWidget(new QLabel(tr("Type")), 1, 0);
-	layout->addWidget(range, 1, 1);
+	layout->addWidget(label, 0, 1, 1, 3);
+	layout->addWidget(new QLabel(tr("Type (expert)")), 1, 0);
+	layout->addWidget(range, 1, 1, 1, 3);
 	layout->setRowStretch(2, 1);
 	layout->setContentsMargins(QMargins());
 
@@ -437,7 +437,7 @@
 
 void ScriptEditorJumpPage::clear()
 {
-//	if(addJump) {
+//	if (addJump) {
 //		qDebug() << "ScriptEditorJumpPage deleteOpcode" << (_opcodeID+1) << _script->opcode(_opcodeID+1)->name();
 //		_script->delOpcode(_opcodeID+1);
 //		addJump = false;
@@ -450,15 +450,15 @@
 	quint32 labelVal = label->itemData(label->currentIndex()).toUInt();
 
 	// Search opcode ID for label
-	foreach(Opcode *op, script()->opcodes()) {
-		if(op->isLabel() && ((OpcodeLabel *)op)->label() == labelVal) {
+	for (Opcode *op : script()->opcodes()) {
+		if (op->isLabel() && ((OpcodeLabel *)op)->label() == labelVal) {
 			break;
 		}
 		++opcodeIDLabel;
 	}
 
 	// Create a new label if chosen
-//	if(opcodeIDLabel >= _script->size()) {
+//	if (opcodeIDLabel >= _script->size()) {
 //		qDebug() << "ScriptEditorJumpPage insertOpcode" << (_opcodeID+1);
 //		opcodeIDLabel = _opcodeID+1;
 //		_script->insertOpcode(opcodeIDLabel, new OpcodeLabel(labelVal));
@@ -466,20 +466,20 @@
 //	}
 
 	// Remove the new label if not chosen
-//	if(addJump && label->currentIndex() < label->count() - 1) {
+//	if (addJump && label->currentIndex() < label->count() - 1) {
 //		qDebug() << "ScriptEditorJumpPage deleteOpcode" << (_opcodeID+1) << _script->opcode(_opcodeID+1)->name();
 //		_script->delOpcode(_opcodeID+1);
 //		addJump = false;
 //	}
 
-	if(opcodeIDLabel < opcodeID()) { // Jump Back
-		if(range->currentIndex() == 0) { // short
+	if (opcodeIDLabel < opcodeID()) { // Jump Back
+		if (range->currentIndex() == 0) { // short
 			convertOpcode(Opcode::JMPB);
 		} else { // long
 			convertOpcode(Opcode::JMPBL);
 		}
 	} else { // Jump Forward
-		if(range->currentIndex() == 0) { // short
+		if (range->currentIndex() == 0) { // short
 			convertOpcode(Opcode::JMPF);
 		} else { // long
 			convertOpcode(Opcode::JMPFL);
@@ -496,7 +496,7 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
@@ -504,13 +504,13 @@
 
 	fillLabelList(true);
 
-	if(opcode->id() == Opcode::JMPF || opcode->id() == Opcode::JMPB) {
+	if (opcode->id() == Opcode::JMPF || opcode->id() == Opcode::JMPB) {
 		range->setCurrentIndex(0);
 	} else {
 		range->setCurrentIndex(1);
 	}
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 
@@ -524,11 +524,11 @@
 
 Opcode *ScriptEditorJumpPage::convertOpcode(Opcode::Keys key)
 {
-	if(key == opcodePtr()->id())	return opcodePtr();
+	if (key == opcodePtr()->id())	return opcodePtr();
 
 	OpcodeJump *jump = (OpcodeJump *)opcodePtr();
 
-	switch(key) {
+	switch (key) {
 	case Opcode::JMPF:	ScriptEditorView::setOpcode(new OpcodeJMPF(*jump));		break;
 	case Opcode::JMPFL:	ScriptEditorView::setOpcode(new OpcodeJMPFL(*jump));	break;
 	case Opcode::JMPB:	ScriptEditorView::setOpcode(new OpcodeJMPB(*jump));		break;
@@ -540,6 +540,53 @@
 	return opcodePtr();
 }
 
+
+ScriptEditorJumpNanakiPage::ScriptEditorJumpNanakiPage(Field *field, GrpScript *grpScript, Script *script, int opcodeID, QWidget *parent) :
+    ScriptEditorJumpPageInterface(field, grpScript, script, opcodeID, parent)
+{
+}
+
+void ScriptEditorJumpNanakiPage::build()
+{
+	label = new QComboBox(this);
+
+	QGridLayout *layout = new QGridLayout(this);
+	layout->addWidget(new QLabel(tr("Label")), 0, 0);
+	layout->addWidget(label, 0, 1);
+	layout->setRowStretch(1, 1);
+	layout->setContentsMargins(QMargins());
+
+	connect(label, SIGNAL(currentIndexChanged(int)), SIGNAL(opcodeChanged()));
+}
+
+Opcode *ScriptEditorJumpNanakiPage::opcode()
+{
+	OpcodeJump *opcodeJump = (OpcodeJump *)opcodePtr();
+	opcodeJump->setLabel(label->itemData(label->currentIndex()).toUInt());
+
+	return opcodePtr();
+}
+
+void ScriptEditorJumpNanakiPage::setOpcode(Opcode *opcode)
+{
+	ScriptEditorView::setOpcode(opcode);
+
+	for (QObject *o : children()) {
+		o->blockSignals(true);
+	}
+
+	fillLabelList();
+
+	for (QObject *o : children()) {
+		o->blockSignals(false);
+	}
+}
+
+bool ScriptEditorJumpNanakiPage::needsLabel() const
+{
+	return label->currentIndex() == label->count() - 1;
+}
+
 ScriptEditorIfPage::ScriptEditorIfPage(Field *field, GrpScript *grpScript, Script *script, int opcodeID, QWidget *parent) :
 	ScriptEditorJumpPageInterface(field, grpScript, script, opcodeID, parent), addJump(false)
 {
@@ -551,7 +598,7 @@
 	varOrValue2 = new VarOrValueWidget(this);
 
 	operatorList = new QComboBox(this);
-	for(int i=0 ; i<OPERATORS_SIZE; ++i) {
+	for (int i=0; i<OPERATORS_SIZE; ++i) {
 		operatorList->addItem(Opcode::operators[i]);
 	}
 
@@ -575,7 +622,7 @@
 	layout->addWidget(rangeTest, 1, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Label")), 2, 0);
 	layout->addWidget(label, 2, 1, 1, 3);
-	layout->addWidget(new QLabel(tr("Jump type")), 3, 0);
+	layout->addWidget(new QLabel(tr("Jump type (expert)")), 3, 0);
 	layout->addWidget(rangeJump, 3, 1, 1, 3);
 	layout->setRowStretch(4, 1);
 	layout->setContentsMargins(QMargins());
@@ -589,7 +636,7 @@
 
 void ScriptEditorIfPage::clear()
 {
-//	if(addJump) {
+//	if (addJump) {
 //		qDebug() << "ScriptEditorIfPage deleteOpcode" << (_opcodeID+1) << _script->opcode(_opcodeID+1)->name();
 //		_script->delOpcode(_opcodeID+1);
 //		addJump = false;
@@ -599,36 +646,36 @@
 Opcode *ScriptEditorIfPage::opcode()
 {
 //	qDebug() << "opcode" << _opcode->name();
-	if(rangeJump->currentIndex() == 0) { // short jump
-		switch(opcodePtr()->id()) {
+	if (rangeJump->currentIndex() == 0) { // short jump
+		switch (opcodePtr()->id()) {
 		case Opcode::IFUBL:		convertOpcode(Opcode::IFUB);	break;
 		case Opcode::IFSWL:		convertOpcode(Opcode::IFSW);	break;
 		case Opcode::IFUWL:		convertOpcode(Opcode::IFUW);	break;
 		}
 	} else { // long jump
-		switch(opcodePtr()->id()) {
+		switch (opcodePtr()->id()) {
 		case Opcode::IFUB:		convertOpcode(Opcode::IFUBL);	break;
 		case Opcode::IFSW:		convertOpcode(Opcode::IFSWL);	break;
 		case Opcode::IFUW:		convertOpcode(Opcode::IFUWL);	break;
 		}
 	}
 
-	if(rangeTest->currentIndex() == 0) { // byte test
-		switch(opcodePtr()->id()) {
+	if (rangeTest->currentIndex() == 0) { // byte test
+		switch (opcodePtr()->id()) {
 		case Opcode::IFSW:
 		case Opcode::IFUW:		convertOpcode(Opcode::IFUB);	break;
 		case Opcode::IFSWL:
 		case Opcode::IFUWL:		convertOpcode(Opcode::IFUBL);	break;
 		}
-	} else if(rangeTest->currentIndex() == 1) { // signed word test
-		switch(opcodePtr()->id()) {
+	} else if (rangeTest->currentIndex() == 1) { // signed word test
+		switch (opcodePtr()->id()) {
 		case Opcode::IFUB:
 		case Opcode::IFUW:		convertOpcode(Opcode::IFSW);	break;
 		case Opcode::IFUBL:
 		case Opcode::IFUWL:		convertOpcode(Opcode::IFSWL);	break;
 		}
 	} else { // unsigned word test
-		switch(opcodePtr()->id()) {
+		switch (opcodePtr()->id()) {
 		case Opcode::IFUB:
 		case Opcode::IFSW:		convertOpcode(Opcode::IFUW);	break;
 		case Opcode::IFUBL:
@@ -641,7 +688,7 @@
 	quint8 bank1, bank2;
 	int value1, value2;
 
-	if(varOrValue1->isValue()) {
+	if (varOrValue1->isValue()) {
 		bank1 = 0;
 		value1 = varOrValue1->value();
 	} else {
@@ -649,7 +696,7 @@
 		varOrValue1->var(bank1, adress1);
 		value1 = adress1;
 	}
-	if(varOrValue2->isValue()) {
+	if (varOrValue2->isValue()) {
 		bank2 = 0;
 		value2 = varOrValue2->value();
 	} else {
@@ -666,11 +713,11 @@
 	quint32 labelVal = label->itemData(label->currentIndex()).toUInt();
 
 	// Create a new label if chosen
-//	if(label->currentIndex() == label->count() - 1) {
+//	if (label->currentIndex() == label->count() - 1) {
 //		qDebug() << "ScriptEditorIfPage insertOpcode" << (_opcodeID+1);
 //		_script->insertOpcode(_opcodeID+1, new OpcodeLabel(labelVal));
 //		addJump = true;
-//	} else if(addJump) { // Remove the new label if not chosen
+//	} else if (addJump) { // Remove the new label if not chosen
 //		qDebug() << "ScriptEditorIfPage deleteOpcode" << (_opcodeID+1) << _script->opcode(_opcodeID+1)->name();
 //		_script->delOpcode(_opcodeID+1);
 //		addJump = false;
@@ -693,7 +740,7 @@
 	OpcodeIf *opcodeIf = (OpcodeIf *)opcode;
 	varOrValue1->blockSignals(true);
 	varOrValue2->blockSignals(true);
-	if(opcodeIf->id() == Opcode::IFUB || opcodeIf->id() == Opcode::IFUBL) {
+	if (opcodeIf->id() == Opcode::IFUB || opcodeIf->id() == Opcode::IFUBL) {
 		varOrValue1->setLongValueType(false);
 		varOrValue2->setLongValueType(false);
 	} else {
@@ -701,7 +748,7 @@
 		varOrValue2->setLongValueType(true);
 	}
 
-	if(opcodeIf->id() == Opcode::IFSW || opcodeIf->id() == Opcode::IFSWL) {
+	if (opcodeIf->id() == Opcode::IFSW || opcodeIf->id() == Opcode::IFSWL) {
 		varOrValue1->setSignedValueType(true);
 		varOrValue2->setSignedValueType(true);
 	} else {
@@ -709,14 +756,14 @@
 		varOrValue2->setSignedValueType(false);
 	}
 
-	if(B1(opcodeIf->banks) != 0) {
+	if (B1(opcodeIf->banks) != 0) {
 		varOrValue1->setIsValue(false);
 		varOrValue1->setVar(B1(opcodeIf->banks), opcodeIf->value1);
 	} else {
 		varOrValue1->setIsValue(true);
 		varOrValue1->setValue(opcodeIf->value1);
 	}
-	if(B2(opcodeIf->banks) != 0) {
+	if (B2(opcodeIf->banks) != 0) {
 		varOrValue2->setIsValue(false);
 		varOrValue2->setVar(B2(opcodeIf->banks), opcodeIf->value2);
 	} else {
@@ -733,7 +780,7 @@
 	fillLabelList();
 
 	rangeJump->blockSignals(true);
-	if(opcode->id() == Opcode::IFUB
+	if (opcode->id() == Opcode::IFUB
 			|| opcode->id() == Opcode::IFSW
 			|| opcode->id() == Opcode::IFUW) {
 		rangeJump->setCurrentIndex(0);
@@ -743,9 +790,9 @@
 	rangeJump->blockSignals(false);
 
 	rangeTest->blockSignals(true);
-	if(opcode->id() == Opcode::IFUB || opcode->id() == Opcode::IFUBL) {
+	if (opcode->id() == Opcode::IFUB || opcode->id() == Opcode::IFUBL) {
 		rangeTest->setCurrentIndex(0);
-	} else if(opcode->id() == Opcode::IFSW || opcode->id() == Opcode::IFSWL) {
+	} else if (opcode->id() == Opcode::IFSW || opcode->id() == Opcode::IFSWL) {
 		rangeTest->setCurrentIndex(1);
 	} else {
 		rangeTest->setCurrentIndex(2);
@@ -772,14 +819,14 @@
 Opcode *ScriptEditorIfPage::convertOpcode(Opcode::Keys key)
 {
 //	qDebug() << "convertOpcode" << _opcode->name();
-	if(key == opcodePtr()->id()) {
+	if (key == opcodePtr()->id()) {
 //		qDebug() << "convertOpcode1" << _opcode->name();
 		return opcodePtr();
 	}
 
 	OpcodeIf *ifop = (OpcodeIf *)opcodePtr();
 
-	switch(key) {
+	switch (key) {
 	case Opcode::IFUB:	ScriptEditorView::setOpcode(new OpcodeIFUB(*ifop));		break;
 	case Opcode::IFUBL:	ScriptEditorView::setOpcode(new OpcodeIFUBL(*ifop));	break;
 	case Opcode::IFSW:	ScriptEditorView::setOpcode(new OpcodeIFSW(*ifop));		break;
@@ -806,13 +853,13 @@
 
 	int row=1, column=0;
 
-	foreach(const QString &keyName, Data::key_names) {
+	for (const QString &keyName : qAsConst(Data::key_names)) {
 		QCheckBox *key = new QCheckBox(keyName, this);
 		keys.append(key);
 		connect(key, SIGNAL(toggled(bool)), SIGNAL(opcodeChanged()));
 		layout->addWidget(key, row, column);
 
-		if(column == 3) {
+		if (column == 3) {
 			column = 0;
 			++row;
 		} else {
@@ -820,7 +867,7 @@
 		}
 	}
 
-	if(column != 0) {
+	if (column != 0) {
 		column = 0;
 		++row;
 	}
@@ -844,9 +891,9 @@
 
 Opcode *ScriptEditorIfKeyPage::opcode()
 {
-	if(typeList->currentIndex() == 0) {
+	if (typeList->currentIndex() == 0) {
 		convertOpcode(Opcode::IFKEY);
-	} else if(typeList->currentIndex() == 1) {
+	} else if (typeList->currentIndex() == 1) {
 		convertOpcode(Opcode::IFKEYON);
 	} else {
 		convertOpcode(Opcode::IFKEYOFF);
@@ -856,8 +903,8 @@
 
 	quint16 result = 0;
 
-	for(int i=0 ; i<keys.size() ; ++i) {
-		if(keys.at(i)->isChecked()) {
+	for (int i=0; i<keys.size(); ++i) {
+		if (keys.at(i)->isChecked()) {
 			result |= 1 << i;
 		}
 	}
@@ -874,13 +921,13 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
 	OpcodeIfKey *opcodeIfKey = (OpcodeIfKey *)opcode;
 
-	switch(opcode->id()) {
+	switch (opcode->id()) {
 	case Opcode::IFKEY:
 		typeList->setCurrentIndex(0);
 		break;
@@ -892,13 +939,13 @@
 		break;
 	}
 
-	for(int i=0 ; i<keys.size() ; ++i) {
+	for (int i=0; i<keys.size(); ++i) {
 		keys.at(i)->setChecked(bool((opcodeIfKey->keys >> i) & 1));
 	}
 
 	fillLabelList();
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -910,11 +957,11 @@
 
 Opcode *ScriptEditorIfKeyPage::convertOpcode(Opcode::Keys key)
 {
-	if(key == opcodePtr()->id())	return opcodePtr();
+	if (key == opcodePtr()->id())	return opcodePtr();
 
 	OpcodeIfKey *ifkey = (OpcodeIfKey *)opcodePtr();
 
-	switch(key) {
+	switch (key) {
 	case Opcode::IFKEY:		ScriptEditorView::setOpcode(new OpcodeIFKEY(*ifkey));		break;
 	case Opcode::IFKEYON:	ScriptEditorView::setOpcode(new OpcodeIFKEYON(*ifkey));		break;
 	case Opcode::IFKEYOFF:	ScriptEditorView::setOpcode(new OpcodeIFKEYOFF(*ifkey));	break;
@@ -935,9 +982,9 @@
 	charList = new QComboBox(this);
 	charList->addItems(Data::char_names);
 	int nbItems = charList->count();
-	for(int i=nbItems ; i<100 ; i++)
+	for (int i=nbItems; i<100; i++)
 		charList->addItem(QString("%1").arg(i));
-	for(int i=100 ; i<254 ; i++)
+	for (int i=100; i<254; i++)
 		charList->addItem(Data::char_names.last());
 
 	charList->addItem(tr("(Empty)"));
@@ -947,9 +994,9 @@
 
 	QGridLayout *layout = new QGridLayout(this);
 	layout->addWidget(new QLabel(tr("Character")), 0, 0);
-	layout->addWidget(charList, 0, 1);
+	layout->addWidget(charList, 0, 1, 1, 3);
 	layout->addWidget(new QLabel(tr("Label")), 1, 0);
-	layout->addWidget(label, 1, 1);
+	layout->addWidget(label, 1, 1, 1, 3);
 	layout->setRowStretch(2, 1);
 	layout->setContentsMargins(QMargins());
 
@@ -972,7 +1019,7 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
@@ -981,7 +1028,7 @@
 
 	fillLabelList();
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -1022,14 +1069,14 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
 	OpcodeWAIT *opcodeWAIT = (OpcodeWAIT *)opcode;
 	frames->setValue(opcodeWAIT->frameCount);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorStructPage.h makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorStructPage.h
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorStructPage.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorStructPage.h	2020-08-08 18:46:56.000000000 +0000
@@ -109,6 +109,18 @@
 	bool addJump;
 };
 
+class ScriptEditorJumpNanakiPage : public ScriptEditorJumpPageInterface
+{
+	Q_OBJECT
+public:
+	explicit ScriptEditorJumpNanakiPage(Field *field, GrpScript *grpScript, Script *script, int opcodeID, QWidget *parent = 0);
+	Opcode *opcode();
+	void setOpcode(Opcode *opcode);
+	bool needsLabel() const;
+private:
+	void build();
+};
+
 class ScriptEditorIfPage : public ScriptEditorJumpPageInterface
 {
 	Q_OBJECT
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorView.cpp makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorView.cpp
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorView.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorView.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -29,7 +29,7 @@
 
 void ScriptEditorView::showEvent(QShowEvent *e)
 {
-	if(!_builded) {
+	if (!_builded) {
 		build();
 		_builded = true;
 	}
@@ -43,7 +43,7 @@
 
 void ScriptEditorView::setOpcode(Opcode *opcode)
 {
-	if(!_builded) {
+	if (!_builded) {
 		build();
 		_builded = true;
 	}
diff -Nru makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorWindowPage.cpp makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorWindowPage.cpp
--- makoureactor-1.7.2/widgets/ScriptEditorWidgets/ScriptEditorWindowPage.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptEditorWidgets/ScriptEditorWindowPage.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -42,7 +42,7 @@
 	previewText = new QComboBox(this);
 	previewText->addItem(tr("[Keep empty window]"));
 	bool jp = Config::value("jp_txt", false).toBool();
-	foreach(const FF7Text &t, field()->scriptsAndTexts()->texts())
+	for (const FF7Text &t : field()->scriptsAndTexts()->texts())
 		previewText->addItem(t.text(jp, true).simplified());
 	previewText->setMaximumWidth(textPreview->width()/2);
 
@@ -88,7 +88,7 @@
 {
 	OpcodeWROW *opcodeWROW;
 
-	switch((Opcode::Keys)opcodePtr()->id()) {
+	switch ((Opcode::Keys)opcodePtr()->id()) {
 	case Opcode::WINDOW:
 	case Opcode::WSIZW:
 		opcodePtr()->setWindowID(winID->value());
@@ -109,10 +109,10 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
-	if(opcode->id() == Opcode::WROW) {
+	if (opcode->id() == Opcode::WROW) {
 		xLabel->hide();
 		x->hide();
 		yLabel->hide();
@@ -129,7 +129,7 @@
 		textPreview->setWins(QList<FF7Window>() << ff7Win);
 		winID->setValue(opcodeWROW->windowID);
 		h->setValue(opcodeWROW->rowCount);
-	} else if(opcode->id() == Opcode::WINDOW || opcode->id() == Opcode::WSIZW) {
+	} else if (opcode->id() == Opcode::WINDOW || opcode->id() == Opcode::WSIZW) {
 		xLabel->show();
 		x->show();
 		yLabel->show();
@@ -148,21 +148,21 @@
 		w->setValue(opcodeWindow->width);
 		h->setValue(opcodeWindow->height);
 	}
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 
 	// If the current opcode is followed by MESSAGE or ASK, we can put a text in the window preview
-	if(opcodeID() + 1 < script()->size()) {
+	if (opcodeID() + 1 < script()->size()) {
 		Opcode *nextOpcode = script()->opcode(opcodeID() + 1);
-		if(nextOpcode->id() == Opcode::MESSAGE) {
+		if (nextOpcode->id() == Opcode::MESSAGE) {
 			OpcodeMESSAGE *mess = (OpcodeMESSAGE *)nextOpcode;
-			if(mess->windowID == winID->value()) {
+			if (mess->windowID == winID->value()) {
 				previewText->setCurrentIndex(mess->textID + 1);
 			}
-		} else if(nextOpcode->id() == Opcode::ASK) {
+		} else if (nextOpcode->id() == Opcode::ASK) {
 			OpcodeASK *ask = (OpcodeASK *)nextOpcode;
-			if(ask->windowID == winID->value()) {
+			if (ask->windowID == winID->value()) {
 				previewText->setCurrentIndex(ask->textID + 1);
 			}
 		}
@@ -172,7 +172,7 @@
 void ScriptEditorWindowPage::updatePreview()
 {
 	FF7Window ff7Win = textPreview->getWindow();
-	if(x->isVisible()) {
+	if (x->isVisible()) {
 		ff7Win.x = x->value();
 		ff7Win.y = y->value();
 		ff7Win.w = w->value();
@@ -198,7 +198,7 @@
 
 void ScriptEditorWindowPage::setPositionWindow(const QPoint &point)
 {
-	if(x->isVisible()) {
+	if (x->isVisible()) {
 		x->blockSignals(true);
 		y->blockSignals(true);
 		x->setValue(point.x());
@@ -212,13 +212,13 @@
 
 void ScriptEditorWindowPage::align(Qt::Alignment alignment)
 {
-	if(x->isVisible()) {
+	if (x->isVisible()) {
 		x->blockSignals(true);
 		y->blockSignals(true);
-		if(alignment.testFlag(Qt::AlignHCenter)) {
+		if (alignment.testFlag(Qt::AlignHCenter)) {
 			x->setValue((textPreview->width() - w->value()) / 2);
 		}
-		if(alignment.testFlag(Qt::AlignVCenter)) {
+		if (alignment.testFlag(Qt::AlignVCenter)) {
 			y->setValue((textPreview->height() - h->value()) / 2);
 		}
 		x->blockSignals(false);
@@ -236,7 +236,7 @@
 	w->blockSignals(true);
 	h->blockSignals(true);
 	w->setValue(newSize.width());
-	if(x->isVisible()) {
+	if (x->isVisible()) {
 		h->setValue(newSize.height());
 	} else {
 		h->setValue((newSize.height() - 9) / 16);
@@ -298,7 +298,7 @@
 void ScriptEditorWindowModePage::setOpcode(Opcode *opcode)
 {
 	ScriptEditorView::setOpcode(opcode);
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
@@ -313,7 +313,7 @@
 	winType->setCurrentIndex(opcodeWMODE->mode);
 	winClose->setCurrentIndex(opcodeWMODE->preventClose);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
@@ -372,7 +372,7 @@
 {
 	ScriptEditorView::setOpcode(opcode);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(true);
 	}
 
@@ -381,7 +381,7 @@
 	x->setValue(opcodeWMOVE->relativeX);
 	y->setValue(opcodeWMOVE->relativeY);
 
-	foreach(QObject *o, children()) {
+	for (QObject *o : children()) {
 		o->blockSignals(false);
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/ScriptList.cpp makoureactor-1.8.0/widgets/ScriptList.cpp
--- makoureactor-1.7.2/widgets/ScriptList.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptList.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -16,42 +16,56 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 #include "ScriptList.h"
+#include "Data.h"
 
 ScriptList::ScriptList(QWidget *parent) :
     QListWidget(parent), grpScript(0)
 {
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 	setContextMenuPolicy(Qt::ActionsContextMenu);
+	connect(this, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+	        SLOT(evidence(QListWidgetItem*,QListWidgetItem*)));
+}
+
+void ScriptList::evidence(QListWidgetItem *current, QListWidgetItem *previous)
+{
+	if (current) {
+		current->setBackground(Data::color(Data::ColorEvidence));
+	}
+
+	if (previous) {
+		previous->setBackground(QBrush());
+	}
 }
 
 Script *ScriptList::currentScript()
 {
-	if(!grpScript) {
-		return NULL;
+	if (!grpScript) {
+		return nullptr;
 	}
 
 	int scriptID = selectedID();
-	if(scriptID != -1)
+	if (scriptID != -1)
 		return grpScript->script(scriptID);
-	return NULL;
+	return nullptr;
 }
 
 void ScriptList::fill(GrpScript *_grpScript)
 {
 	clear();
 
-	if(_grpScript) {
+	if (_grpScript) {
 		grpScript = _grpScript;
 	}
 
 	int i=0;
 
-	foreach(Script *script, grpScript->scripts()) {
+	for (Script *script : grpScript->scripts()) {
 		QListWidgetItem *item = new QListWidgetItem(grpScript->scriptName(i), this);
-		if(script->isEmpty()) {
-			item->setForeground(QColor(0xCC,0xCC,0xCC));
-		} else if(script->isVoid()) {
-			item->setForeground(QColor(0x66,0x66,0x66));
+		if (script->isEmpty()) {
+			item->setForeground(Data::color(Data::ColorDisabledForeground));
+		} else if (script->isVoid()) {
+			item->setForeground(Data::color(Data::ColorGreyForeground));
 		}
 		++i;
 	}
@@ -59,18 +73,18 @@
 
 void ScriptList::localeRefresh()
 {
-	if(!grpScript) {
+	if (!grpScript) {
 		return;
 	}
 
 	int i = 0;
-	foreach(Script *script, grpScript->scripts()) {
+	for (Script *script : grpScript->scripts()) {
 		QListWidgetItem *itm = item(i);
 		itm->setText(grpScript->scriptName(i));
-		if(script->isEmpty()) {
-			itm->setForeground(QColor(0xCC,0xCC,0xCC));
-		} else if(script->isVoid()) {
-			itm->setForeground(QColor(0x66,0x66,0x66));
+		if (script->isEmpty()) {
+			itm->setForeground(Data::color(Data::ColorDisabledForeground));
+		} else if (script->isVoid()) {
+			itm->setForeground(Data::color(Data::ColorGreyForeground));
 		} else {
 			itm->setForeground(QBrush());
 		}
@@ -80,17 +94,21 @@
 
 int ScriptList::selectedID()
 {
-	if(!currentItem()) {
+	QListWidgetItem *itm = currentItem();
+	if (!itm) {
 		return -1;
 	}
-	return row(currentItem());
+	return row(itm);
 }
 
 void ScriptList::scroll(int id, bool focus)
 {
-	setCurrentItem(item(id));
-	scrollToItem(item(id), QAbstractItemView::PositionAtTop);
-	if(focus) {
+	if (selectedID() != id) {
+		QListWidgetItem *itm = item(id);
+		setCurrentItem(itm);
+		scrollToItem(itm, QAbstractItemView::PositionAtTop);
+	}
+	if (focus) {
 		setFocus();
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/ScriptList.h makoureactor-1.8.0/widgets/ScriptList.h
--- makoureactor-1.7.2/widgets/ScriptList.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptList.h	2020-08-08 18:46:56.000000000 +0000
@@ -23,6 +23,7 @@
 
 class ScriptList : public QListWidget
 {
+	Q_OBJECT
 public:
 	explicit ScriptList(QWidget *parent = 0);
 
@@ -33,6 +34,9 @@
 	void localeRefresh();
 	void scroll(int, bool focus=true);
 
+private slots:
+	void evidence(QListWidgetItem *current, QListWidgetItem *previous);
+
 private:
 	GrpScript *grpScript;
 };
diff -Nru makoureactor-1.7.2/widgets/ScriptManager.cpp makoureactor-1.8.0/widgets/ScriptManager.cpp
--- makoureactor-1.7.2/widgets/ScriptManager.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptManager.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -4,17 +4,15 @@
 ScriptManager::ScriptManager(QWidget *parent) :
     QWidget(parent), _field(0)
 {
-	QFont font;
-	font.setPointSize(8);
-
 	_groupScriptList = new GrpScriptList(this);
 	_groupScriptList->setMinimumHeight(176);
-	_groupScriptList->setFont(font);
 
 	_scriptList = new ScriptList(this);
-	_scriptList->setMaximumWidth(QFontMetrics(font).width(QString(20, 'M')));
+	_scriptList->setMaximumWidth(
+	    _scriptList->fontMetrics().boundingRect(QString(20, 'M')).width());
+	_scriptList->setMinimumWidth(
+	    _scriptList->fontMetrics().boundingRect(QString(10, 'M')).width());
 	_scriptList->setMinimumHeight(88);
-	_scriptList->setFont(font);
 
 	_opcodeList = new OpcodeList(this);
 
@@ -29,8 +27,8 @@
 	_compileScriptIcon->hide();
 	
 	QVBoxLayout *layoutGroupScript = new QVBoxLayout;
-	layoutGroupScript->addWidget(_groupScriptList->toolBar());
 	layoutGroupScript->addWidget(_groupScriptList);
+	layoutGroupScript->addWidget(_groupScriptList->helpWidget());
 	layoutGroupScript->setSpacing(2);
 	layoutGroupScript->setContentsMargins(QMargins());
 
@@ -40,16 +38,17 @@
 	compileLayout->setContentsMargins(QMargins());
 
 	QVBoxLayout *layoutScript = new QVBoxLayout;
-	layoutScript->addWidget(_opcodeList->toolBar());
 	layoutScript->addWidget(_opcodeList);
 	layoutScript->addLayout(compileLayout);
 	layoutScript->setSpacing(2);
 	layoutScript->setContentsMargins(QMargins());
 
 	QGridLayout *contentLayout = new QGridLayout(this);
-	contentLayout->addLayout(layoutGroupScript, 0, 0);
-	contentLayout->addWidget(_scriptList, 0, 1);
-	contentLayout->addLayout(layoutScript, 0, 2);
+	contentLayout->addWidget(_groupScriptList->toolBar(), 0, 0);
+	contentLayout->addLayout(layoutGroupScript, 1, 0);
+	contentLayout->addWidget(_scriptList, 1, 1);
+	contentLayout->addWidget(_opcodeList->toolBar(), 0, 2);
+	contentLayout->addLayout(layoutScript, 1, 2);
 	contentLayout->setColumnStretch(0, 2);
 	contentLayout->setColumnStretch(1, 1);
 	contentLayout->setColumnStretch(2, 9);
@@ -65,6 +64,7 @@
 	connect(_opcodeList, SIGNAL(changed()), SLOT(compile()));
 	connect(_opcodeList, SIGNAL(gotoScript(int,int)), SLOT(gotoScript(int,int)));
 	connect(_opcodeList, SIGNAL(gotoField(int)), SIGNAL(gotoField(int)));
+	connect(_opcodeList, SIGNAL(searchOpcode(int)), SIGNAL(searchOpcode(int)));
 
 	_groupScriptList->toolBar()->setVisible(Config::value("grpToolbarVisible", true).toBool());
 	_opcodeList->toolBar()->setVisible(Config::value("scriptToolbarVisible", true).toBool());
@@ -107,7 +107,7 @@
 	clear();
 
 	_field = field;
-	if(!_field) {
+	if (!_field) {
 		return;
 	}
 
@@ -123,7 +123,7 @@
 
 void ScriptManager::fillScripts()
 {
-	if(!_field) {
+	if (!_field) {
 		return;
 	}
 
@@ -138,9 +138,22 @@
 	emit groupScriptCurrentChanged(_groupScriptList->selectedID());
 }
 
+void ScriptManager::refreshOpcode(int groupID, int scriptID, int opcodeID)
+{
+	if (!_field || groupID != _groupScriptList->selectedID()
+	    || scriptID != _scriptList->selectedID()) {
+		return;
+	}
+
+	Script *currentScript = _scriptList->currentScript();
+	if (currentScript) {
+		_opcodeList->refreshOpcode(opcodeID);
+	}
+}
+
 void ScriptManager::fillOpcodes()
 {
-	if(!_field) {
+	if (!_field) {
 		return;
 	}
 
@@ -159,14 +172,14 @@
 void ScriptManager::compile()
 {
 	Script *currentScript = _scriptList->currentScript();
-	if(!currentScript) {
+	if (!currentScript) {
 		return;
 	}
 
 	int opcodeID;
 	QString errorStr;
 
-	if(!currentScript->compile(opcodeID, errorStr)) {
+	if (!currentScript->compile(opcodeID, errorStr)) {
 		_compileScriptLabel->setText(tr("Error on line %1 : %2")
 		                             .arg(opcodeID + 1)
 		                             .arg(errorStr));
diff -Nru makoureactor-1.7.2/widgets/ScriptManager.h makoureactor-1.8.0/widgets/ScriptManager.h
--- makoureactor-1.7.2/widgets/ScriptManager.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/ScriptManager.h	2020-08-08 18:46:56.000000000 +0000
@@ -40,7 +40,9 @@
 	void editText(int textID);
 	void groupScriptCurrentChanged(int groupID);
 	void gotoField(int fieldID);
+	void searchOpcode(int opcodeID);
 public slots:
+	void refreshOpcode(int groupID, int scriptID, int opcodeID);
 	void fill(Field *field);
 	void fillScripts();
 	void fillOpcodes();
diff -Nru makoureactor-1.7.2/widgets/SearchAll.cpp makoureactor-1.8.0/widgets/SearchAll.cpp
--- makoureactor-1.7.2/widgets/SearchAll.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/SearchAll.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -8,7 +8,7 @@
 {
 	setWindowTitle(tr("Find All"));
 
-	resize(parent->width(), 400);
+	resize(800, 600);
 	_resultList = new QTreeWidget(this);
 	_resultList->setAlternatingRowColors(true);
 	_resultList->setItemsExpandable(true);
@@ -38,7 +38,7 @@
 void SearchAll::clear()
 {
 	_resultList->clear();
-	itemByFieldID.clear();
+	itemByMapID.clear();
 }
 
 void SearchAll::setScriptSearch()
@@ -66,43 +66,45 @@
 	}
 }
 
-void SearchAll::addResultOpcode(int fieldID, int grpScriptID, int scriptID, int opcodeID)
+void SearchAll::addResultOpcode(int mapID, int grpScriptID, int scriptID, int opcodeID)
 {
-	addResult(fieldID, createItemOpcode(fieldID, grpScriptID, scriptID, opcodeID));
+	addResult(mapID, createItemOpcode(mapID, grpScriptID, scriptID, opcodeID));
 }
 
-void SearchAll::addResultText(int fieldID, int textID, int index, int size)
+void SearchAll::addResultText(int mapID, int textID, int index, int size)
 {
-	addResult(fieldID, createItemText(fieldID, textID, index, size));
+	addResult(mapID, createItemText(mapID, textID, index, size));
 }
 
-void SearchAll::addResult(int fieldID, QTreeWidgetItem *item)
+void SearchAll::addResult(int mapID, QTreeWidgetItem *item)
 {
-	QTreeWidgetItem *itemToAdd = itemByFieldID.value(fieldID);
+	QTreeWidgetItem *itemToAdd = itemByMapID.value(mapID);
 	if (!itemToAdd) {
-		itemToAdd = createItemField(fieldID);
-		itemByFieldID.insert(fieldID, itemToAdd);
+		itemToAdd = createItemField(mapID);
+		itemByMapID.insert(mapID, itemToAdd);
 		_resultList->addTopLevelItem(itemToAdd);
 		itemToAdd->setExpanded(true);
 	}
 	itemToAdd->addChild(item);
 }
 
-QTreeWidgetItem *SearchAll::createItemField(int fieldID) const
+QTreeWidgetItem *SearchAll::createItemField(int mapID) const
 {
 	QTreeWidgetItem *item = new QTreeWidgetItem(
 								QStringList()
-								<< QString("%1").arg(fieldID, 3));
+								<< QString("%1").arg(mapID, 3));
 
-	item->setData(0, Qt::UserRole, fieldID);
+	item->setData(0, Qt::UserRole, mapID);
 	if(_fieldArchive) {
-		Field *f = _fieldArchive->field(fieldID);
+		Field *f = _fieldArchive->field(mapID);
 		if(f) {
-			item->setText(0, QString("%1 : %2").arg(fieldID, 3).arg(f->name()));
+			item->setText(0, QString("%1 : %2")
+			                     .arg(mapID, 3)
+			                     .arg(f->name()));
 		}
 	}
 
-	for(int col = 0 ; col < _resultList->columnCount() ; ++col) {
+	for (int col = 0; col < _resultList->columnCount(); ++col) {
 		item->setBackground(col, Qt::gray);
 		item->setForeground(col, Qt::white);
 	}
@@ -110,7 +112,7 @@
 	return item;
 }
 
-QTreeWidgetItem *SearchAll::createItemOpcode(int fieldID, int grpScriptID, int scriptID, int opcodeID) const
+QTreeWidgetItem *SearchAll::createItemOpcode(int mapID, int grpScriptID, int scriptID, int opcodeID) const
 {
 	QTreeWidgetItem *item = new QTreeWidgetItem(
 								QStringList()
@@ -118,13 +120,13 @@
 								<< QString("%1").arg(scriptID, 2)
 								<< QString("%1").arg(opcodeID + 1, 5));
 
-	item->setData(0, Qt::UserRole, fieldID);
+	item->setData(0, Qt::UserRole, mapID);
 	item->setData(1, Qt::UserRole, grpScriptID);
 	item->setData(2, Qt::UserRole, scriptID);
 	item->setData(3, Qt::UserRole, opcodeID);
 
 	if(_fieldArchive) {
-		Field *f = _fieldArchive->field(fieldID);
+		Field *f = _fieldArchive->field(mapID);
 		if(f) {
 			GrpScript *grp = f->scriptsAndTexts()->grpScripts().value(grpScriptID);
 			if(grp) {
@@ -138,7 +140,7 @@
 	return item;
 }
 
-QTreeWidgetItem *SearchAll::createItemText(int fieldID, int textID, int index, int size) const
+QTreeWidgetItem *SearchAll::createItemText(int mapID, int textID, int index, int size) const
 {
 	Q_UNUSED(size)
 	QTreeWidgetItem *item = new QTreeWidgetItem(
@@ -146,12 +148,12 @@
 								<< QString("%1").arg(textID, 3)
 								<< QString("%1").arg(index, 3));
 
-	item->setData(0, Qt::UserRole, fieldID);
+	item->setData(0, Qt::UserRole, mapID);
 	item->setData(1, Qt::UserRole, textID);
 	item->setData(2, Qt::UserRole, index);
 
 	if(_fieldArchive) {
-		Field *f = _fieldArchive->field(fieldID);
+		Field *f = _fieldArchive->field(mapID);
 		if(f) {
 			const FF7Text &text = f->scriptsAndTexts()->text(textID);
 			item->setText(1, text.text(Config::value("jp_txt", false).toBool(), true));
@@ -163,19 +165,19 @@
 
 void SearchAll::gotoResult(QTreeWidgetItem *item)
 {
-	int fieldID = item->data(0, Qt::UserRole).toInt();
+	int mapID = item->data(0, Qt::UserRole).toInt();
 
 	if (_searchMode == ScriptSearch) {
 		int grpScriptID = item->data(1, Qt::UserRole).toInt(),
 				scriptID = item->data(2, Qt::UserRole).toInt(),
 				opcodeID = item->data(3, Qt::UserRole).toInt();
-		mainWindow()->gotoOpcode(fieldID, grpScriptID, scriptID, opcodeID);
+		mainWindow()->gotoOpcode(mapID, grpScriptID, scriptID, opcodeID);
 
 	} else {
 		int textID = item->data(1, Qt::UserRole).toInt(),
 				index = item->data(2, Qt::UserRole).toInt(),
 				size = item->data(3, Qt::UserRole).toInt();
-		mainWindow()->gotoText(fieldID, textID, index, size);
+		mainWindow()->gotoText(mapID, textID, index, size);
 	}
 }
 
@@ -185,10 +187,10 @@
 
 	QString str;
 	QTreeWidgetItemIterator it(_resultList);
-	while(*it) {
+	while (*it) {
 		if(selectedItems.contains(*it)) {
 			QStringList cols;
-			for (int col = 0 ; col < (*it)->columnCount() ; ++col) {
+			for (int col = 0; col < (*it)->columnCount(); ++col) {
 				cols.append((*it)->text(col).trimmed());
 			}
 			str.append(cols.join("\t").trimmed() + "\n");
diff -Nru makoureactor-1.7.2/widgets/SearchAll.h makoureactor-1.8.0/widgets/SearchAll.h
--- makoureactor-1.7.2/widgets/SearchAll.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/SearchAll.h	2020-08-08 18:46:56.000000000 +0000
@@ -16,8 +16,8 @@
 	void setFieldArchive(FieldArchive *fieldArchive);
 	void clear();
 public slots:
-	void addResultOpcode(int fieldID, int grpScriptID, int scriptID, int opcodeID);
-	void addResultText(int fieldID, int textID, int index, int size);
+	void addResultOpcode(int mapID, int grpScriptID, int scriptID, int opcodeID);
+	void addResultText(int mapID, int textID, int index, int size);
 private slots:
 	void gotoResult(QTreeWidgetItem *item);
 	void copySelected() const;
@@ -30,13 +30,13 @@
 		return reinterpret_cast<Window *>(parentWidget());
 	}
 	void addResult(int fieldID, QTreeWidgetItem *item);
-	QTreeWidgetItem *createItemField(int fieldID) const;
-	QTreeWidgetItem *createItemOpcode(int fieldID, int grpScriptID, int scriptID, int opcodeID) const;
-	QTreeWidgetItem *createItemText(int fieldID, int textID, int index, int size) const;
+	QTreeWidgetItem *createItemField(int mapID) const;
+	QTreeWidgetItem *createItemOpcode(int mapID, int grpScriptID, int scriptID, int opcodeID) const;
+	QTreeWidgetItem *createItemText(int mapID, int textID, int index, int size) const;
 	QTreeWidget *_resultList;
 	Mode _searchMode;
 	FieldArchive *_fieldArchive;
-	QMap<int, QTreeWidgetItem *> itemByFieldID;
+	QMap<int, QTreeWidgetItem *> itemByMapID;
 };
 
 #endif // SEARCHALL_H
diff -Nru makoureactor-1.7.2/widgets/Search.cpp makoureactor-1.8.0/widgets/Search.cpp
--- makoureactor-1.7.2/widgets/Search.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/Search.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -40,7 +40,7 @@
 	buttons.append(buttonAll = new QPushButton(tr("Find all"), this));
 
 	QMap<int, QPushButton *> buttonWidths;
-	foreach (QPushButton *button, buttons) {
+	for (QPushButton *button : buttons) {
 		button->setAutoDefault(false);
 		buttonWidths[button->sizeHint().width()] = button;
 	}
@@ -53,7 +53,7 @@
 
 	// buttonNext.width == buttonPrev.width
 	QPushButton *largerButton = (buttonWidths.constEnd() - 1).value();
-	foreach (QPushButton *button, buttons) {
+	for (QPushButton *button : buttons) {
 		button->setFixedSize(largerButton->sizeHint());
 	}
 
@@ -130,15 +130,19 @@
 
 	QWidget *opc = new QWidget(ret);
 	opcode = new QComboBox(opc);
-	for(quint16 i=0 ; i<256 ; ++i)
-		opcode->addItem(QString("%1 - %2").arg(i,2,16,QChar('0')).arg(Opcode::names[i]));
+	for (quint16 i=0; i<256; ++i)
+		opcode->addItem(QString("%1 - %2").arg(i, 2, 16, QChar('0')).arg(Opcode::names[i]).toUpper());
 	opcode->addItem(QString("100 - %1").arg(Opcode::names[0x100]));
 	// set config values
-	opcode->setCurrentIndex(Config::value("SearchedOpcode").toInt());
+	opcode->setCurrentIndex(Config::value("SearchedOpcode").toInt() & 0xFFFF);
+
+	opcode2 = new QComboBox(opc);
+	updateOpcode2(opcode->currentIndex());
 
 	QVBoxLayout *opcodeLayout = new QVBoxLayout(opc);
 	opcodeLayout->setContentsMargins(QMargins());
 	opcodeLayout->addWidget(opcode);
+	opcodeLayout->addWidget(opcode2);
 	opcodeLayout->addStretch();
 
 	QWidget *variable = new QWidget(ret);
@@ -153,7 +157,7 @@
 	variableLayout->setRowStretch(1, 1);
 	champBank->setRange(1,15);
 	champAddress->setRange(-1, 255); // -1 is an extra value to keep this field empty and search for every addresses
-	for(int i=0 ; i<256 ; ++i) {
+	for (int i=0; i<256; ++i) {
 		comboVarName->addItem(QString());
 	}
 	champValue->setPlaceholderText(tr("Value"));
@@ -174,7 +178,7 @@
 	comboVarName->setCurrentIndex(Config::value("SearchedVarAdress").toInt());
 	champOp->setCurrentIndex(Config::value("SearchedVarOperation").toInt());
 	int searchedVarValue = Config::value("SearchedVarValue", 65536).toInt();
-	if(searchedVarValue != 65536) {
+	if (searchedVarValue != 65536) {
 		champValue->setText(QString::number(searchedVarValue));
 	}
 	updateSearchVarPlaceholder(champOp->currentIndex());
@@ -219,7 +223,7 @@
 	currentScriptCheckBox = new QRadioButton(tr("Current script"));
 
 	FieldArchive::SearchScope searchScope = FieldArchive::SearchScope(Config::value("searchScope").toInt());
-	switch(searchScope) {
+	switch (searchScope) {
 	case FieldArchive::FieldScope:		currentFieldCheckBox->setChecked(true);		break;
 //	case FieldArchive::GrpScriptScope:	currentGrpScriptCheckBox->setChecked(true);	break;
 //	case FieldArchive::ScriptScope:		currentScriptCheckBox->setChecked(true);	break;
@@ -248,6 +252,7 @@
 	connect(champAddress, SIGNAL(valueChanged(int)), comboVarName, SLOT(setCurrentIndex(int)));
 	connect(comboVarName, SIGNAL(currentIndexChanged(int)), SLOT(updateChampAdress()));
 	connect(champOp, SIGNAL(currentIndexChanged(int)), SLOT(updateSearchVarPlaceholder(int)));
+	connect(opcode, SIGNAL(currentIndexChanged(int)), SLOT(updateOpcode2(int)));
 
 	liste->setCurrentIndex(Config::value("searchDialogScriptCurrentModule").toInt());
 
@@ -286,7 +291,7 @@
 	currentTextCheckBox = new QRadioButton(tr("Current text"));
 
 	FieldArchive::SearchScope searchScope = FieldArchive::SearchScope(Config::value("searchScope").toInt());
-	switch(searchScope) {
+	switch (searchScope) {
 	case FieldArchive::FieldScope:		currentFieldCheckBox2->setChecked(true);		break;
 //	case FieldArchive::TextScope:		currentTextCheckBox->setChecked(true);	break;
 	default:							globalCheckBox->setChecked(true);			break;
@@ -351,10 +356,10 @@
 	this->fieldArchive = fieldArchive;
 	searchAllDialog->setFieldArchive(fieldArchive);
 	updateRunSearch();
-	setActionsEnabled(fieldArchive != NULL);
-	if(mapJump->count() <= 0) {
+	setActionsEnabled(fieldArchive != nullptr);
+	if (mapJump->count() <= 0) {
 		int mapID=0;
-		foreach(const QString &fieldName, Data::field_names) {
+		for (const QString &fieldName : Data::maplist()) {
 			mapJump->addItem(QString("%1 - %2").arg(mapID++, 3, 10, QChar('0')).arg(fieldName));
 		}
 		// set config values
@@ -362,11 +367,16 @@
 	}
 }
 
-void Search::setOpcode(int opcode)
+void Search::setOpcode(int opcode, bool show)
 {
-	if(opcode >= 0 && opcode < this->opcode->count()) {
+	if (opcode >= 0 && opcode < this->opcode->count()) {
 		this->opcode->setCurrentIndex(opcode);
 	}
+
+	if (show) {
+		tabWidget->setCurrentIndex(0); // Script
+		liste->setCurrentIndex(2); // Opcode
+	}
 }
 
 void Search::setText(const QString &text)
@@ -377,7 +387,7 @@
 
 void Search::setScriptExec(int groupID, int scriptID)
 {
-	if(groupID >= 0) {
+	if (groupID >= 0) {
 		executionGroup->setCurrentIndex(groupID);
 		executionScript->setValue(scriptID);
 	}
@@ -386,11 +396,11 @@
 void Search::updateRunSearch()
 {
 	executionGroup->clear();
-	if(fieldArchive) {
-		Field *f = fieldArchive->field(mainWindow()->currentFieldId());
-		if(f) {
+	if (fieldArchive) {
+		Field *f = fieldArchive->field(mainWindow()->fieldList()->currentMapId());
+		if (f) {
 			int i=0;
-			foreach(const GrpScript *grp, f->scriptsAndTexts()->grpScripts())
+			for (const GrpScript *grp : f->scriptsAndTexts()->grpScripts())
 				executionGroup->addItem(QString("%1 - %2").arg(i++).arg(grp->name()));
 		}
 	}
@@ -398,7 +408,7 @@
 
 void Search::updateComboVarName()
 {
-	for(int i=0 ; i<256 ; ++i) {
+	for (int i=0; i<256; ++i) {
 		comboVarName->setItemText(i, QString("%1 - %2").arg(i, 3, 10, QChar('0')).arg(Var::name(champBank->value(), i)));
 	}
 }
@@ -420,6 +430,30 @@
 	}
 }
 
+void Search::updateOpcode2(int opIndex)
+{
+	if (opIndex == Opcode::AKAO || opIndex == Opcode::AKAO2) {
+		opcode2->clear();
+		QList<quint8> unknownItems;
+		for (quint16 i=0; i<256; ++i) {
+			bool ok;
+			QString str = Opcode::akao(i, &ok);
+			if (ok) {
+				opcode2->addItem(QString("%1 - %2").arg(i, 2, 16, QChar('0')).toUpper()
+				                     .arg(str.remove(QRegExp("\\[.*$"))), i);
+			} else {
+				unknownItems.append(i);
+			}
+		}
+		for (quint8 i : unknownItems) {
+			opcode2->addItem(QString("%1").arg(i, 2, 16, QChar('0')).toUpper(), i);
+		}
+		opcode2->show();
+	} else {
+		opcode2->hide();
+	}
+}
+
 void Search::cancelSearching()
 {
 	cancel = true;
@@ -427,21 +461,21 @@
 
 FieldArchive::SearchScope Search::searchScope() const
 {
-	if(tabWidget->currentIndex() == 0) {
-		if(currentFieldCheckBox->isChecked() || liste->currentIndex() == 3) { // Search exec
+	if (tabWidget->currentIndex() == 0) {
+		if (currentFieldCheckBox->isChecked() || liste->currentIndex() == 3) { // Search exec
 			return FieldArchive::FieldScope;
 		}
-		if(currentGrpScriptCheckBox->isChecked()) {
+		if (currentGrpScriptCheckBox->isChecked()) {
 			return FieldArchive::GrpScriptScope;
 		}
-		if(currentScriptCheckBox->isChecked()) {
+		if (currentScriptCheckBox->isChecked()) {
 			return FieldArchive::ScriptScope;
 		}
 	} else {
-		if(currentFieldCheckBox2->isChecked()) {
+		if (currentFieldCheckBox2->isChecked()) {
 			return FieldArchive::FieldScope;
 		}
-		if(currentTextCheckBox->isChecked()) {
+		if (currentTextCheckBox->isChecked()) {
 			return FieldArchive::TextScope;
 		}
 	}
@@ -451,7 +485,7 @@
 
 QString Search::lastMessage() const
 {
-	switch(searchScope()) {
+	switch (searchScope()) {
 	case FieldArchive::GlobalScope:		return tr("Last field");
 	case FieldArchive::FieldScope:		return tr("Last group");
 	case FieldArchive::GrpScriptScope:	return tr("Last script");
@@ -463,7 +497,7 @@
 
 QString Search::firstMessage() const
 {
-	switch(searchScope()) {
+	switch (searchScope()) {
 	case FieldArchive::GlobalScope:		return tr("First field");
 	case FieldArchive::FieldScope:		return tr("First group");
 	case FieldArchive::GrpScriptScope:	return tr("First script");
@@ -475,7 +509,7 @@
 
 void Search::findNext()
 {
-	if(!fieldArchive) {
+	if (!fieldArchive) {
 		return;
 	}
 
@@ -483,17 +517,21 @@
 	buttonNext->setDefault(true);
 	returnToBegin->hide();
 
+	QTimer timer(this);
+	connect(&timer, SIGNAL(timeout()), SLOT(processEvents()));
+	timer.start(700);
+
 	setSearchValues();
 
-	int fieldID, grpScriptID, scriptID, opcodeID,
-			textID, from;
+	int mapID, grpScriptID, scriptID, opcodeID,
+	    textID, from;
 	FieldArchive::Sorting sorting = mainWindow()->getFieldSorting();
 	FieldArchive::SearchScope scope = searchScope();
 
 	atTheBeginning = false;
 
-	if(atTheEnd) {
-		fieldID = scope == FieldArchive::FieldScope ? mainWindow()->currentFieldId() : -1;
+	if (atTheEnd) {
+		mapID = scope == FieldArchive::FieldScope ? mainWindow()->fieldList()->currentMapId() : -1;
 		grpScriptID = scope == FieldArchive::GrpScriptScope ? mainWindow()->scriptWidget()->currentGrpScriptId() : -1;
 		scriptID = scope == FieldArchive::ScriptScope ? mainWindow()->scriptWidget()->currentScriptId() : -1;
 		opcodeID = -1;
@@ -501,83 +539,92 @@
 		from = 0;
 		atTheEnd = false;
 	} else {
-		fieldID = mainWindow()->currentFieldId();
+		mapID = mainWindow()->fieldList()->currentMapId();
 		grpScriptID = mainWindow()->scriptWidget()->currentGrpScriptId();
 		scriptID = mainWindow()->scriptWidget()->currentScriptId();
 		opcodeID = mainWindow()->scriptWidget()->currentOpcodeId();
 		textID = mainWindow()->textWidget() ? mainWindow()->textWidget()->currentTextId() : -1;
 		from = mainWindow()->textWidget() ? qMax(mainWindow()->textWidget()->currentTextPosition(),
-												 mainWindow()->textWidget()->currentAnchorPosition())
-										  : 0;
+		                                         mainWindow()->textWidget()->currentAnchorPosition())
+		                                  : 0;
 	}
 
-	if(tabWidget->currentIndex() == 0) { // scripts page
+	bool f = false;
+
+	if (tabWidget->currentIndex() == 0) { // scripts page
 		if (findNextScript(sorting, scope,
-						   fieldID, grpScriptID, scriptID, opcodeID)) {
-			emit found(fieldID, grpScriptID, scriptID, opcodeID);
-			goto after;
+		                   mapID, grpScriptID, scriptID, opcodeID)) {
+			emit found(mapID, grpScriptID, scriptID, opcodeID);
+			f = true;
 		}
 	} else { // texts page
 		int size;
 		if (findNextText(sorting, scope,
-						 fieldID, textID, from, size)) {
-			emit foundText(fieldID, textID, from, size);
-			goto after;
+		                 mapID, textID, from, size)) {
+			emit foundText(mapID, textID, from, size);
+			f = true;
 		}
 	}
 
-	returnToBegin->setText(tr("%1,\ncontinued from top.")
-						   .arg(lastMessage()));
-	returnToBegin->show();
+	if (!f) {
+		returnToBegin->setText(tr("%1,\ncontinued from top.")
+		                           .arg(lastMessage()));
+		returnToBegin->show();
 
-	atTheEnd = true;
+		atTheEnd = true;
+	}
 
-after:
+	timer.stop();
 	mainWindow()->setEnabled(true);
 }
 
+void Search::processEvents() const
+{
+	QCoreApplication::processEvents();
+}
+
 bool Search::findNextScript(FieldArchive::Sorting sorting, FieldArchive::SearchScope scope,
-					  int &fieldID, int &grpScriptID, int &scriptID, int &opcodeID)
+                            int &mapID, int &grpScriptID, int &scriptID, int &opcodeID)
 {
 	++opcodeID;
 
-	switch(liste->currentIndex()) {
+	switch (liste->currentIndex()) {
 	case 0:
-		return fieldArchive->searchTextInScripts(text, fieldID, grpScriptID,
-												 scriptID, opcodeID,
-												 sorting, scope);
+		return fieldArchive->searchTextInScripts(text, mapID, grpScriptID,
+		                                         scriptID, opcodeID,
+		                                         sorting, scope);
 	case 1:
 		return fieldArchive->searchVar(bank, address, op, value,
-									   fieldID, grpScriptID,
-									   scriptID, opcodeID,
-									   sorting, scope);
+		                               mapID, grpScriptID,
+		                               scriptID, opcodeID,
+		                               sorting, scope);
 	case 2:
-		return fieldArchive->searchOpcode(clef, fieldID, grpScriptID,
-										  scriptID, opcodeID,
-										  sorting, scope);
+		return fieldArchive->searchOpcode(clef, mapID, grpScriptID,
+		                                  scriptID, opcodeID,
+		                                  sorting, scope);
 	case 4:
-		return fieldArchive->searchMapJump(field, fieldID, grpScriptID,
-										   scriptID, opcodeID,
-										   sorting, scope);
+		return fieldArchive->searchMapJump(field, mapID, grpScriptID,
+		                                   scriptID, opcodeID,
+		                                   sorting, scope);
 	case 3:
-		return fieldArchive->searchExec(e_group, e_script, fieldID,
-										grpScriptID, scriptID, opcodeID,
-										sorting, scope);
+		return fieldArchive->searchExec(e_group, e_script, mapID,
+		                                grpScriptID, scriptID, opcodeID,
+		                                sorting, scope);
 	}
 
 	return false;
 }
 
 bool Search::findNextText(FieldArchive::Sorting sorting, FieldArchive::SearchScope scope,
-					  int &fieldID, int &textID, int &from, int &size)
+					  int &mapID, int &textID, int &from, int &size)
 {
-	return fieldArchive->searchText(text, fieldID, textID, from,
+	return fieldArchive->searchText(text, mapID, textID, from,
 									size, sorting, scope);
 }
 
 void Search::findPrev()
 {
-	if(!fieldArchive) {
+	if (!fieldArchive) {
 		return;
 	}
 
@@ -585,7 +632,11 @@
 	buttonPrev->setDefault(true);
 	returnToBegin->hide();
 
-	int fieldID, grpScriptID, scriptID, opcodeID,
+	QTimer timer(this);
+	connect(&timer, SIGNAL(timeout()), SLOT(processEvents()));
+	timer.start(700);
+
+	int mapID, grpScriptID, scriptID, opcodeID,
 			textID, from;
 	FieldArchive::Sorting sorting = mainWindow()->getFieldSorting();
 	FieldArchive::SearchScope scope = searchScope();
@@ -594,8 +645,8 @@
 
 	atTheEnd = false;
 
-	if(atTheBeginning) {
-		fieldID = scope == FieldArchive::FieldScope ? mainWindow()->currentFieldId() : 2147483647;
+	if (atTheBeginning) {
+		mapID = scope == FieldArchive::FieldScope ? mainWindow()->fieldList()->currentMapId() : 2147483647;
 		grpScriptID = scope == FieldArchive::GrpScriptScope ? mainWindow()->scriptWidget()->currentGrpScriptId() : 2147483647;
 		scriptID = scope == FieldArchive::ScriptScope ? mainWindow()->scriptWidget()->currentScriptId() : 2147483647;
 		opcodeID = 2147483647;
@@ -603,87 +654,89 @@
 		from = -1;
 		atTheBeginning = false;
 	} else {
-		fieldID = mainWindow()->currentFieldId();
+		mapID = mainWindow()->fieldList()->currentMapId();
 		grpScriptID = mainWindow()->scriptWidget()->currentGrpScriptId();
 		scriptID = mainWindow()->scriptWidget()->currentScriptId();
 		opcodeID = mainWindow()->scriptWidget()->currentOpcodeId();
 		textID = mainWindow()->textWidget() ? mainWindow()->textWidget()->currentTextId() : -1;
 		from = mainWindow()->textWidget() ? qMin(mainWindow()->textWidget()->currentTextPosition(),
-												 mainWindow()->textWidget()->currentAnchorPosition())
-										  : -1;
-		if(from <= 0) {
+		                                         mainWindow()->textWidget()->currentAnchorPosition())
+		                                  : -1;
+		if (from <= 0) {
 			textID--;
 		}
 	}
 
-	if(tabWidget->currentIndex() == 0) { // scripts page
-		--opcodeID;
+	bool f = false;
 
-		switch(liste->currentIndex())
-		{
-		case 0:
-			if(fieldArchive->searchTextInScriptsP(text, fieldID, grpScriptID,
-												  scriptID, opcodeID,
-												  sorting, scope)) {
-				emit found(fieldID, grpScriptID, scriptID, opcodeID);
-				goto after;
-			}
-			break;
-		case 1:
-			if(fieldArchive->searchVarP(bank, address, op, value,
-										fieldID, grpScriptID,
-										scriptID, opcodeID,
-										sorting, scope)) {
-				emit found(fieldID, grpScriptID, scriptID, opcodeID);
-				goto after;
-			}
-			break;
-		case 2:
-			if(fieldArchive->searchOpcodeP(clef, fieldID, grpScriptID,
-										   scriptID, opcodeID,
-										   sorting, scope)) {
-				emit found(fieldID, grpScriptID, scriptID, opcodeID);
-				goto after;
-			}
-			break;
-		case 4:
-			if(fieldArchive->searchMapJumpP(field, fieldID, grpScriptID,
-											scriptID, opcodeID,
-											sorting, scope)) {
-				emit found(fieldID, grpScriptID, scriptID, opcodeID);
-				goto after;
-			}
-			break;
-		case 3:
-			if(fieldArchive->searchExecP(e_group, e_script, fieldID,
-										 grpScriptID, scriptID,
-										 opcodeID, sorting, scope)) {
-				emit found(fieldID, grpScriptID, scriptID, opcodeID);
-				goto after;
-			}
-			break;
+	if (tabWidget->currentIndex() == 0) { // scripts page
+		if (findPrevScript(sorting, scope, mapID, grpScriptID,
+		                   scriptID, opcodeID)) {
+			emit found(mapID, grpScriptID, scriptID, opcodeID);
+			f = true;
 		}
 	} else { // texts page
-		--from;
 		int index, size;
-		if(fieldArchive->searchTextP(text, fieldID, textID,
-									 from, index, size,
-									 sorting, scope)) {
-			emit foundText(fieldID, textID, index, size);
-			goto after;
+		if (findPrevText(sorting, scope, mapID, textID,
+		                 from, index, size)) {
+			emit foundText(mapID, textID, index, size);
+			f = true;
 		}
 	}
 
-	returnToBegin->setText(tr("%1,\nchase at the end.")
-						   .arg(firstMessage()));
-	returnToBegin->show();
+	if (!f) {
+		returnToBegin->setText(tr("%1,\nchase at the end.")
+		                           .arg(firstMessage()));
+		returnToBegin->show();
 
-	atTheBeginning = true;
+		atTheBeginning = true;
+	}
 
-after:
+	timer.stop();
 	mainWindow()->setEnabled(true);
 }
 
+bool Search::findPrevScript(FieldArchive::Sorting sorting, FieldArchive::SearchScope scope,
+                            int &mapID, int &grpScriptID, int &scriptID, int &opcodeID)
+{
+	--opcodeID;
+
+	switch (liste->currentIndex()) {
+	case 0:
+		return fieldArchive->searchTextInScriptsP(text, mapID, grpScriptID,
+		                                          scriptID, opcodeID,
+		                                          sorting, scope);
+	case 1:
+		return fieldArchive->searchVarP(bank, address, op, value,
+		                                mapID, grpScriptID,
+		                                scriptID, opcodeID,
+		                                sorting, scope);
+	case 2:
+		return fieldArchive->searchOpcodeP(clef, mapID, grpScriptID,
+		                                   scriptID, opcodeID,
+		                                   sorting, scope);
+	case 4:
+		return fieldArchive->searchMapJumpP(field, mapID, grpScriptID,
+		                                    scriptID, opcodeID,
+		                                    sorting, scope);
+	case 3:
+		return fieldArchive->searchExecP(e_group, e_script, mapID,
+		                                 grpScriptID, scriptID, opcodeID,
+		                                 sorting, scope);
+	}
+
+	return false;
+}
+
+bool Search::findPrevText(FieldArchive::Sorting sorting, FieldArchive::SearchScope scope,
+                          int &mapID, int &textID, int &index, int &from, int &size)
+{
+	--from;
+
+	return fieldArchive->searchTextP(text, mapID, textID, from,
+	                                 index, size, sorting, scope);
+}
+
 void Search::findAll()
 {
 	searchAllDialog->show();
@@ -693,51 +746,51 @@
 	mainWindow()->setEnabled(false);
 	setEnabled(false);
 	setSearchValues();
-	int fieldID = -1;
+	int mapID = -1;
 	FieldArchive::Sorting sorting = mainWindow()->getFieldSorting();
 	FieldArchive::SearchScope scope = searchScope();
 
-	if(scope == FieldArchive::FieldScope) {
-		fieldID = mainWindow()->currentFieldId();
+	if (scope == FieldArchive::FieldScope) {
+		mapID = mainWindow()->fieldList()->currentMapId();
 	}
 
-	if(tabWidget->currentIndex() == 0) { // scripts page
+	if (tabWidget->currentIndex() == 0) { // scripts page
 		int grpScriptID = -1, scriptID = -1, opcodeID = -1;
 
-		if(scope == FieldArchive::GrpScriptScope) {
+		if (scope == FieldArchive::GrpScriptScope) {
 			grpScriptID = mainWindow()->scriptWidget()->currentGrpScriptId();
 		}
-		if(scope == FieldArchive::ScriptScope) {
+		if (scope == FieldArchive::ScriptScope) {
 			scriptID = mainWindow()->scriptWidget()->currentScriptId();
 		}
 
 		searchAllDialog->setScriptSearch();
 		while (findNextScript(sorting, scope,
-						   fieldID, grpScriptID, scriptID, opcodeID)) {
+						   mapID, grpScriptID, scriptID, opcodeID)) {
 			QCoreApplication::processEvents();
 			// Cancelled
 			if (searchAllDialog->isHidden()) {
 				break;
 			}
-			searchAllDialog->addResultOpcode(fieldID, grpScriptID, scriptID, opcodeID);
+			searchAllDialog->addResultOpcode(mapID, grpScriptID, scriptID, opcodeID);
 		}
 	} else { // texts page
 		int textID = -1, from = -1;
 
-		if(scope == FieldArchive::TextScope && mainWindow()->textWidget()) {
+		if (scope == FieldArchive::TextScope && mainWindow()->textWidget()) {
 			textID = mainWindow()->textWidget()->currentTextId();
 		}
 
 		searchAllDialog->setTextSearch();
 		int size;
 		while (findNextText(sorting, scope,
-						 fieldID, textID, ++from, size)) {
+						 mapID, textID, ++from, size)) {
 			QCoreApplication::processEvents();
 			// Cancelled
 			if (searchAllDialog->isHidden()) {
 				break;
 			}
-			searchAllDialog->addResultText(fieldID, textID, from, size);
+			searchAllDialog->addResultText(mapID, textID, from, size);
 		}
 	}
 
@@ -755,8 +808,8 @@
 void Search::setSearchValues()
 {
 	bool ok;
-	if(tabWidget->currentIndex() == 0) { // scripts page
-		switch(liste->currentIndex())
+	if (tabWidget->currentIndex() == 0) { // scripts page
+		switch (liste->currentIndex())
 		{
 		case 0:
 		{
@@ -764,14 +817,14 @@
 			text = buildRegExp(lineEditText, caseSens->isChecked(), useRegexp->isChecked());
 			QStringList recentSearch = Config::value("recentSearch").toStringList();
 			int index;
-			if((index = recentSearch.indexOf(lineEditText)) != -1) {
+			if ((index = recentSearch.indexOf(lineEditText)) != -1) {
 				recentSearch.removeAt(index);
 			}
 			recentSearch.prepend(lineEditText);
 			champ->clear();
 			champ->addItems(recentSearch);
 			champ->setCurrentIndex(0);
-			if(recentSearch.size() > 20) {
+			if (recentSearch.size() > 20) {
 				recentSearch.removeLast();
 			}
 			Config::setValue("recentSearch", recentSearch);
@@ -784,7 +837,7 @@
 			address = champAddress->value();
 			op = Opcode::Operation(champOp->currentIndex());
 			value = champValue->text().toInt(&ok);
-			if(!ok)	value = 0x10000;
+			if (!ok)	value = 0x10000;
 			Config::setValue("SearchedVarBank", bank);
 			Config::setValue("SearchedVarAdress", qint16(address));
 			Config::setValue("SearchedVarOperation", champOp->currentIndex());
@@ -792,6 +845,9 @@
 			break;
 		case 2:
 			clef = opcode->currentIndex();
+			if (opcode2->isVisible()) {
+				clef |= (opcode2->currentData().toInt() + 1) << 16;
+			}
 			Config::setValue("SearchedOpcode", clef);
 			break;
 		case 3:
@@ -811,14 +867,14 @@
 		text = buildRegExp(lineEditText, caseSens2->isChecked(), useRegexp2->isChecked());
 		QStringList recentSearch = Config::value("recentSearch").toStringList();
 		int index;
-		if((index = recentSearch.indexOf(lineEditText)) != -1) {
+		if ((index = recentSearch.indexOf(lineEditText)) != -1) {
 			recentSearch.removeAt(index);
 		}
 		recentSearch.prepend(lineEditText);
 		champ2->clear();
 		champ2->addItems(recentSearch);
 		champ2->setCurrentIndex(0);
-		if(recentSearch.size() > 20) {
+		if (recentSearch.size() > 20) {
 			recentSearch.removeLast();
 		}
 		Config::setValue("recentSearch", recentSearch);
@@ -830,14 +886,14 @@
 
 void Search::replaceCurrent()
 {
-	if(!fieldArchive || !mainWindow()->textWidget()) {
+	if (!fieldArchive || !mainWindow()->textWidget()) {
 		return;
 	}
 
 	setSearchValues();
 
-	if(fieldArchive->replaceText(text, replace2->lineEdit()->text(),
-								 mainWindow()->currentFieldId(),
+	if (fieldArchive->replaceText(text, replace2->lineEdit()->text(),
+								 mainWindow()->fieldList()->currentMapId(),
 								 mainWindow()->textWidget()->currentTextId(),
 								 qMin(mainWindow()->textWidget()->currentTextPosition(),
 									  mainWindow()->textWidget()->currentAnchorPosition()))) {
@@ -849,7 +905,7 @@
 
 void Search::replaceAll()
 {
-	if(!fieldArchive) {
+	if (!fieldArchive) {
 		return;
 	}
 
@@ -859,19 +915,20 @@
 	setSearchValues();
 
 	QString after = replace2->lineEdit()->text();
-	int fieldID = 0, textID = 0, from = 0, size;
+	int mapID = 0, textID = 0, from = 0, size;
 
-	if(scope == FieldArchive::FieldScope) {
-		fieldID = mainWindow()->currentFieldId();
-	} else if(scope == FieldArchive::TextScope) {
-		if(mainWindow()->textWidget()) {
+	if (scope == FieldArchive::FieldScope) {
+		mapID = mainWindow()->fieldList()->currentMapId();
+	} else if (scope == FieldArchive::TextScope) {
+		if (mainWindow()->textWidget()) {
 			textID = mainWindow()->textWidget()->currentTextId();
 		}
 	}
 
 	bool modified = false;
-	while(fieldArchive->searchText(text, fieldID, textID, from, size, sorting, scope)) {
-		if(fieldArchive->replaceText(text, after, fieldID, textID, from)) {
+	while (fieldArchive->searchText(text, mapID, textID, from, size, sorting, scope)) {
+		if (fieldArchive->replaceText(text, after, mapID, textID, from)) {
+			fieldArchive->field(mapID)->setModified(true);
 			modified = true;
 		}
 		from += after.size();
@@ -879,10 +936,10 @@
 
 	mainWindow()->setEnabled(true);
 
-	if(modified) {
+	if (modified) {
 
 		// Update view
-		if(mainWindow()->textWidget()) {
+		if (mainWindow()->textWidget()) {
 			mainWindow()->textWidget()->updateText();
 		}
 		mainWindow()->setModified();
diff -Nru makoureactor-1.7.2/widgets/Search.h makoureactor-1.8.0/widgets/Search.h
--- makoureactor-1.7.2/widgets/Search.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/Search.h	2020-08-08 18:46:56.000000000 +0000
@@ -32,7 +32,7 @@
 	explicit Search(Window *mainWindow);
 
 	void setFieldArchive(FieldArchive *fieldArchive);
-	void setOpcode(int opcode);
+	void setOpcode(int opcode, bool show = false);
 	void setText(const QString &text);
 	void setScriptExec(int groupID, int scriptID);
 	void updateRunSearch();
@@ -43,6 +43,7 @@
 	void updateComboVarName();
 	void updateChampAdress();
 	void updateSearchVarPlaceholder(int opIndex);
+	void updateOpcode2(int opIndex);
 	void cancelSearching();
 	void findNext();
 	void findPrev();
@@ -50,6 +51,7 @@
 	void replaceCurrent();
 	void replaceAll();
 	void updateCaseSensitivity(bool cs);
+	void processEvents() const;
 
 private:
 	QWidget *scriptPageWidget();
@@ -64,10 +66,14 @@
 	}
 	void setActionsEnabled(bool enable);
 	bool findNextScript(FieldArchive::Sorting sorting, FieldArchive::SearchScope scope,
-				  int &fieldID, int &grpScriptID,
+				  int &mapID, int &grpScriptID,
 				  int &scriptID, int &opcodeID);
 	bool findNextText(FieldArchive::Sorting sorting, FieldArchive::SearchScope scope,
-				  int &fieldID, int &textID, int &from, int &size);
+				  int &mapID, int &textID, int &from, int &size);
+	bool findPrevScript(FieldArchive::Sorting sorting, FieldArchive::SearchScope scope,
+	                    int &mapID, int &grpScriptID, int &scriptID, int &opcodeID);
+	bool findPrevText(FieldArchive::Sorting sorting, FieldArchive::SearchScope scope,
+	                  int &mapID, int &textID, int &index, int &from, int &size);
 
 	bool atTheEnd, atTheBeginning;
 
@@ -76,7 +82,7 @@
 	FieldArchive *fieldArchive;
 	QComboBox *champ, *champ2, *replace2;
 	QComboBox *liste;
-	QComboBox *opcode;
+	QComboBox *opcode, *opcode2;
 	QCheckBox *caseSens, *useRegexp, *caseSens2, *useRegexp2;
 	QSpinBox *champBank;
 	QSpinBox *champAddress;
diff -Nru makoureactor-1.7.2/widgets/TextHighlighter.cpp makoureactor-1.8.0/widgets/TextHighlighter.cpp
--- makoureactor-1.7.2/widgets/TextHighlighter.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/TextHighlighter.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -16,29 +16,30 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 #include "TextHighlighter.h"
+#include "../Data.h"
 
 TextHighlighter::TextHighlighter(QTextDocument *parent, bool tut)
 	: QSyntaxHighlighter(parent)
 {
 	HighlightingRule rule;
 
-	if(tut) {
+	if (tut) {
 		rule.pattern = QRegExp("^TEXT\\(\"(.*)\"\\)$", Qt::CaseInsensitive);
-		rule.color = Qt::darkGreen;
+		rule.color = Data::color(Data::ColorGreenForeground);
 		highlightingRules.append(rule);
 	}
 
 	rule.pattern = QRegExp("\\{x[\\da-fA-F]{2}\\}");
-	rule.color = Qt::darkRed;
+	rule.color = Data::color(Data::ColorRedForeground);
 	highlightingRules.append(rule);
 
 	QStringList names;
-	names << "\\{CLOUD\\}" << "\\{BARRET\\}" << "\\{TIFA\\}" << "\\{AERIS\\}" << "\\{RED XIII\\}" << "\\{YUFFIE\\}" <<
+	names << "\\{CLOUD\\}" << "\\{BARRET\\}" << "\\{TIFA\\}" << "\\{AERITH\\}" << "\\{AERIS\\}" << "\\{RED XIII\\}" << "\\{YUFFIE\\}" <<
 			"\\{CAIT SITH\\}" << "\\{VINCENT\\}" << "\\{CID\\}" << "\\{MEMBER 1\\}" << "\\{MEMBER 2\\}" << "\\{MEMBER 3\\}";
 
-	foreach(const QString &name, names) {
+	for (const QString &name : qAsConst(names)) {
 		rule.pattern = QRegExp(name, Qt::CaseInsensitive);
-		rule.color = Qt::darkGreen;
+		rule.color = Data::color(Data::ColorGreenForeground);
 		highlightingRules.append(rule);
 	}
 
@@ -48,38 +49,38 @@
 			"\\{SPACED CHARACTERS\\}" << "\\{PAUSE\\}" << "\\{PAUSE\\d\\d\\d\\}" << "\\{MEMORY:var\\[(\\d+)\\]\\[(\\d+)\\];size=(\\d+)\\}" <<
 			"\\{CHOICE\\}" << "^\\{NEW PAGE\\}$" << "^\\{NEW PAGE 2\\}$" << "\\{CIRCLE\\}" << "\\{TRIANGLE\\}" << "\\{SQUARE\\}" << "\\{CROSS\\}";
 
-	foreach(const QString &s, syst) {
+	for (const QString &s : qAsConst(syst)) {
 		rule.pattern = QRegExp(s, Qt::CaseInsensitive);
-		rule.color = Qt::darkBlue;
+		rule.color = Data::color(Data::ColorBlueForeground);
 		highlightingRules.append(rule);
 	}
 
 	QStringList dchar;
 	dchar << "\\{, \\}" << "\\{\\.\"\\}" << QString::fromUtf8("\\{\xe2\x80\xa6\"\\}");//\xe2\x80\xa6 = "..."
 
-	foreach(const QString &s, dchar) {
+	for (const QString &s : qAsConst(dchar)) {
 		rule.pattern = QRegExp(s);
-		rule.color = Qt::darkMagenta;
+		rule.color = Data::color(Data::ColorGreyForeground);
 		highlightingRules.append(rule);
 	}
 
-	if(tut) {
+	if (tut) {
 		QStringList keys;
 		keys << "^\\[UP\\]$" << "^\\[DOWN\\]$" << "^\\[LEFT\\]$" << "^\\[RIGHT\\]$" << "^\\[MENU\\]$" << "^\\[CANCEL\\]$" <<
 				"^\\[CHANGE\\]$" << "^\\[OK\\]$" << "^\\[R1\\]$" << "^\\[R2\\]$" << "^\\[L1\\]$" << "^\\[L2\\]$" << "^\\[START\\]$" << "^\\[SELECT\\]$";
 
-		foreach(const QString &s, keys) {
+		for (const QString &s : qAsConst(keys)) {
 			rule.pattern = QRegExp(s, Qt::CaseInsensitive);
-			rule.color = QColor(0xe6,0x00,0xe6);
+			rule.color = Data::color(Data::ColorPurpleForeground);
 			highlightingRules.append(rule);
 		}
 
 		QStringList op;
 		op << "^\\{FINISH\\}$" << "^\\{NOP\\}$" << "^MOVE\\((\\d+),(\\d+)\\)$" << "^PAUSE\\((\\d+)\\)$";
 
-		foreach(const QString &s, op) {
+		for (const QString &s : qAsConst(op)) {
 			rule.pattern = QRegExp(s, Qt::CaseInsensitive);
-			rule.color = Qt::darkGreen;
+			rule.color = Data::color(Data::ColorGreenForeground);
 			highlightingRules.append(rule);
 		}
 	}
@@ -87,14 +88,14 @@
 
 void TextHighlighter::highlightBlock(const QString &text)
 {
-	foreach(const HighlightingRule &rule, highlightingRules) {
+	for (const HighlightingRule &rule : qAsConst(highlightingRules)) {
 		QRegExp expression(rule.pattern);
 		int index = 0;
 
 		do {
 			index = expression.indexIn(text, index);
 
-			if(index < 0) {
+			if (index < 0) {
 				break;
 			}
 
@@ -103,7 +104,7 @@
 
 			do {
 				firstCapturePos = expression.pos(capNb);
-				if(firstCapturePos == -1) {
+				if (firstCapturePos == -1) {
 					length = lastIndex - index;
 					capLength = 0;
 				} else {
@@ -114,7 +115,7 @@
 
 				index += length + capLength;
 				capNb++;
-			} while(firstCapturePos >= 0);
-		} while(index >= 0);
+			} while (firstCapturePos >= 0);
+		} while (index >= 0);
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/TextManager.cpp makoureactor-1.8.0/widgets/TextManager.cpp
--- makoureactor-1.7.2/widgets/TextManager.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/TextManager.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -21,6 +21,9 @@
 #include "core/Config.h"
 #include "Data.h"
 
+QIcon TextManager::winIcon;
+QIcon TextManager::noWinIcon;
+
 TextManager::TextManager(QWidget *parent) :
 	QDialog(parent, Qt::Tool), scriptsAndTexts(0)
 {
@@ -45,7 +48,7 @@
 	action = toolBar->addAction(QIcon(":/images/icon-char-2.png"), Data::char_names.at(2));
 	action->setData("{TIFA}");
 	action = toolBar->addAction(QIcon(":/images/icon-char-3.png"), Data::char_names.at(3));
-	action->setData("{AERIS}");
+	action->setData("{AERITH}");
 	action = toolBar->addAction(QIcon(":/images/icon-char-4.png"), Data::char_names.at(4));
 	action->setData("{RED XIII}");
 	action = toolBar->addAction(QIcon(":/images/icon-char-5.png"), Data::char_names.at(5));
@@ -169,7 +172,6 @@
 
 	QWidget *groupTextPreview = new QWidget(this);
 	textPreview = new TextPreview(groupTextPreview);
-	textPreview->setReadOnly(true);//TODO: unlock
 
 	prevPage = new QToolButton(groupTextPreview);
 	prevPage->setArrowType(Qt::UpArrow);
@@ -180,45 +182,58 @@
 	textPage = new QLabel(groupTextPreview);
 	textPage->setTextFormat(Qt::PlainText);
 
-//	prevWin = new QToolButton(groupTextPreview);
-//	prevWin->setArrowType(Qt::UpArrow);
-//	prevWin->setToolButtonStyle(Qt::ToolButtonIconOnly);
-//	nextWin = new QToolButton(groupTextPreview);
-//	nextWin->setArrowType(Qt::DownArrow);
-//	nextWin->setToolButtonStyle(Qt::ToolButtonIconOnly);
-//	textWin = new QLabel(groupTextPreview);
-//	textWin->setTextFormat(Qt::PlainText);
-
-//	xCoord = new QSpinBox(groupTextPreview);
-//	yCoord = new QSpinBox(groupTextPreview);
-//	xCoord->setRange(-32768, 32767);
-//	yCoord->setRange(-32768, 32767);
-//	xCoord->setReadOnly(true);
-//	yCoord->setReadOnly(true);
-
-//	wSize = new QSpinBox(groupTextPreview);
-//	hSize = new QSpinBox(groupTextPreview);
-//	wSize->setRange(0, 65535);
-//	hSize->setRange(0, 65535);
-//	wSize->setReadOnly(true);
-//	hSize->setReadOnly(true);
+	prevWin = new QToolButton(groupTextPreview);
+	prevWin->setArrowType(Qt::UpArrow);
+	prevWin->setToolButtonStyle(Qt::ToolButtonIconOnly);
+	nextWin = new QToolButton(groupTextPreview);
+	nextWin->setArrowType(Qt::DownArrow);
+	nextWin->setToolButtonStyle(Qt::ToolButtonIconOnly);
+	textWin = new QLabel(groupTextPreview);
+	textWin->setTextFormat(Qt::PlainText);
+
+	xCoord = new QSpinBox(groupTextPreview);
+	yCoord = new QSpinBox(groupTextPreview);
+	xCoord->setRange(-32768, 32767);
+	yCoord->setRange(-32768, 32767);
+
+	wSize = new QSpinBox(groupTextPreview);
+	hSize = new QSpinBox(groupTextPreview);
+	wSize->setRange(0, 65535);
+	hSize->setRange(0, 65535);
+
+	hAlign = new QPushButton(tr("Align horizontally"), groupTextPreview);
+	vAlign = new QPushButton(tr("Align vertically"), groupTextPreview);
+	autoSize = new QPushButton(tr("Autosize"), groupTextPreview);
+
+	QVBoxLayout *buttonLayout = new QVBoxLayout;
+	buttonLayout->addStretch(1);
+	buttonLayout->addWidget(hAlign);
+	buttonLayout->addWidget(vAlign);
+	buttonLayout->addWidget(autoSize);
+	buttonLayout->setContentsMargins(QMargins());
+
+	xLabel = new QLabel(tr("X"));
+	yLabel = new QLabel(tr("Y"));
+	wLabel = new QLabel(tr("W"));
+	hLabel = new QLabel(tr("H"));
 
 	QGridLayout *layoutTextPreview = new QGridLayout(groupTextPreview);
 	layoutTextPreview->addWidget(textPreview, 0, 0, 8, 1, Qt::AlignLeft | Qt::AlignTop);
 	layoutTextPreview->addWidget(prevPage, 0, 1, 1, 2, Qt::AlignLeft | Qt::AlignTop);
 	layoutTextPreview->addWidget(textPage, 1, 1, 1, 2, Qt::AlignLeft | Qt::AlignTop);
 	layoutTextPreview->addWidget(nextPage, 2, 1, 1, 2, Qt::AlignLeft | Qt::AlignTop);
-//	layoutTextPreview->addWidget(new QLabel(tr("X")), 3, 1, Qt::AlignLeft | Qt::AlignHCenter);
-//	layoutTextPreview->addWidget(xCoord, 3, 2, Qt::AlignLeft | Qt::AlignHCenter);
-//	layoutTextPreview->addWidget(new QLabel(tr("Y")), 4, 1, Qt::AlignLeft | Qt::AlignHCenter);
-//	layoutTextPreview->addWidget(yCoord, 4, 2, Qt::AlignLeft | Qt::AlignHCenter);
-//	layoutTextPreview->addWidget(new QLabel(tr("W")), 3, 3, Qt::AlignLeft | Qt::AlignHCenter);
-//	layoutTextPreview->addWidget(wSize, 3, 4, Qt::AlignLeft | Qt::AlignHCenter);
-//	layoutTextPreview->addWidget(new QLabel(tr("H")), 4, 3, Qt::AlignLeft | Qt::AlignHCenter);
-//	layoutTextPreview->addWidget(hSize, 4, 4, Qt::AlignLeft | Qt::AlignHCenter);
-//	layoutTextPreview->addWidget(prevWin, 5, 1, 1, 2, Qt::AlignLeft | Qt::AlignBottom);
-//	layoutTextPreview->addWidget(textWin, 6, 1, 1, 2, Qt::AlignLeft | Qt::AlignBottom);
-//	layoutTextPreview->addWidget(nextWin, 7, 1, 1, 2, Qt::AlignLeft | Qt::AlignBottom);
+	layoutTextPreview->addWidget(xLabel, 3, 1, Qt::AlignLeft | Qt::AlignHCenter);
+	layoutTextPreview->addWidget(xCoord, 3, 2, Qt::AlignLeft | Qt::AlignHCenter);
+	layoutTextPreview->addWidget(yLabel, 4, 1, Qt::AlignLeft | Qt::AlignHCenter);
+	layoutTextPreview->addWidget(yCoord, 4, 2, Qt::AlignLeft | Qt::AlignHCenter);
+	layoutTextPreview->addWidget(wLabel, 3, 3, Qt::AlignLeft | Qt::AlignHCenter);
+	layoutTextPreview->addWidget(wSize, 3, 4, Qt::AlignLeft | Qt::AlignHCenter);
+	layoutTextPreview->addWidget(hLabel, 4, 3, Qt::AlignLeft | Qt::AlignHCenter);
+	layoutTextPreview->addWidget(hSize, 4, 4, Qt::AlignLeft | Qt::AlignHCenter);
+	layoutTextPreview->addWidget(prevWin, 5, 1, 1, 2, Qt::AlignLeft | Qt::AlignBottom);
+	layoutTextPreview->addWidget(textWin, 6, 1, 1, 2, Qt::AlignLeft | Qt::AlignBottom);
+	layoutTextPreview->addWidget(nextWin, 7, 1, 1, 2, Qt::AlignLeft | Qt::AlignBottom);
+	layoutTextPreview->addLayout(buttonLayout, 5, 3, 3, 2, Qt::AlignLeft | Qt::AlignBottom);
 	layoutTextPreview->setColumnStretch(2, 1);
 	layoutTextPreview->setRowStretch(2, 1);
 	layoutTextPreview->setRowStretch(5, 1);
@@ -247,9 +262,17 @@
 	connect(textEdit, SIGNAL(textChanged()), SLOT(setTextChanged()));
 	connect(prevPage, SIGNAL(released()), SLOT(prevTextPreviewPage()));
 	connect(nextPage, SIGNAL(released()), SLOT(nextTextPreviewPage()));
-//	connect(prevWin, SIGNAL(released()), SLOT(prevTextPreviewWin()));
-//	connect(nextWin, SIGNAL(released()), SLOT(nextTextPreviewWin()));
+	connect(prevWin, SIGNAL(released()), SLOT(prevTextPreviewWin()));
+	connect(nextWin, SIGNAL(released()), SLOT(nextTextPreviewWin()));
+	connect(textPreview, SIGNAL(positionChanged(const QPoint&)), SLOT(changePosition(const QPoint&)));
 	connect(textPreview, SIGNAL(pageChanged(int)), SLOT(changeTextPreviewPage()));
+	connect(xCoord, SIGNAL(valueChanged(int)), SLOT(changeXCoord(int)));
+	connect(yCoord, SIGNAL(valueChanged(int)), SLOT(changeYCoord(int)));
+	connect(wSize, SIGNAL(valueChanged(int)), SLOT(changeWSize(int)));
+	connect(hSize, SIGNAL(valueChanged(int)), SLOT(changeHSize(int)));
+	connect(hAlign, SIGNAL(clicked()), SLOT(alignHorizontally()));
+	connect(vAlign, SIGNAL(clicked()), SLOT(alignVertically()));
+	connect(autoSize, SIGNAL(clicked()), SLOT(resizeWindow()));
 }
 
 void TextManager::focusInEvent(QFocusEvent *)
@@ -259,7 +282,7 @@
 
 void TextManager::setField(Field *field, bool reload)
 {
-	if(!field
+	if (!field
 	        || (!reload && this->scriptsAndTexts == field->scriptsAndTexts())
 	        || !field->scriptsAndTexts()->isOpen()) {
 		return;
@@ -267,9 +290,6 @@
 
 	clear();
 	this->scriptsAndTexts = field->scriptsAndTexts();
-//	_windows.clear();
-//	_text2win.clear();
-//	scriptsAndTexts->listWindows(_windows, _text2win);
 	usedTexts = scriptsAndTexts->listUsedTexts();
 	showList();
 	liste1->setCurrentRow(0);
@@ -278,7 +298,7 @@
 
 void TextManager::clear()
 {
-	scriptsAndTexts = 0;
+	scriptsAndTexts = nullptr;
 	usedTexts.clear();
 	liste1->clear();
 	textEdit->clear();
@@ -287,16 +307,22 @@
 
 void TextManager::setTextChanged()
 {
-	if(!scriptsAndTexts)	return;
+	if (!scriptsAndTexts) {
+		return;
+	}
 
 	QListWidgetItem *item = liste1->currentItem();
-	if(item == NULL)	return;
+
+	if (item == nullptr) {
+		return;
+	}
 
 	QString newText = textEdit->toPlainText();
 	int textId = item->data(Qt::UserRole).toInt();
 	const FF7Text &t = scriptsAndTexts->text(textId);
 	bool jp = Config::value("jp_txt", false).toBool();
-	if(newText != t.text(jp)) {
+
+	if (newText != t.text(jp)) {
 		scriptsAndTexts->setText(textId, FF7Text(newText, jp));
 		textPreview->setText(t.data());
 		changeTextPreviewPage();
@@ -305,27 +331,23 @@
 	}
 }
 
-/*QList<FF7Window> TextManager::getWindows(quint8 textID) const
+QList<FF7Window> TextManager::getWindows(int textID) const
 {
-	QList<quint64> winIDs = _text2win.values(textID);
-	QList<quint64> sawAlready;
 	QList<FF7Window> windows;
-	foreach(const quint64 &winID, winIDs) {
-		if(!sawAlready.contains(winID)) {
-			windows.append(_windows.values(winID));
-			sawAlready.append(winID);
-		}
-	}
+	scriptsAndTexts->listWindows(textID, windows);
 	return windows;
-}*/
+}
 
 void TextManager::selectText(QListWidgetItem *item, QListWidgetItem *)
 {
-	if(!item || !scriptsAndTexts)	return;
+	if (!item || !scriptsAndTexts) {
+		return;
+	}
+
 	int textID = item->data(Qt::UserRole).toInt();
 	const FF7Text &t = scriptsAndTexts->text(textID);
-//	textPreview->resetCurrentWin();
-//	textPreview->setWins(getWindows(textID));
+	textPreview->resetCurrentWin();
+	textPreview->setWins(getWindows(textID));
 	textPreview->setText(t.data());
 	textEdit->setPlainText(t.text(Config::value("jp_txt", false).toBool()));
 	changeTextPreviewPage();
@@ -334,7 +356,7 @@
 
 void TextManager::showList()
 {
-	if(!scriptsAndTexts)	return;
+	if (!scriptsAndTexts)	return;
 	bool show = dispUnusedText->isChecked();
 	liste1->blockSignals(true);
 	int nbTexts = scriptsAndTexts->textCount();
@@ -342,17 +364,30 @@
 
 	Config::setValue("dispUnusedText", show);
 
-	for(int i=0 ; i<nbTexts ; ++i)
-	{
-		if(!show && !usedTexts.contains(i))	continue;
+	if (winIcon.isNull()) {
+		QPixmap pix(16, 8);
+		QPainter p(&pix);
+		TextPreview::drawWindow(&p, pix.width(), pix.height(), TextPreview::WithoutFrame);
+		p.end();
+		winIcon = QIcon(pix);
+		noWinIcon = winIcon.pixmap(pix.width(), pix.height(), QIcon::Disabled);
+	}
+
+	for (int i=0; i<nbTexts; ++i) {
+		if (!show && !usedTexts.contains(i)) {
+			continue;
+		}
 
-		QListWidgetItem *item = new QListWidgetItem(tr("Text %1").arg(i));
+		bool hasWin = !getWindows(i).isEmpty();
+		QListWidgetItem *item = new QListWidgetItem(hasWin ? winIcon : noWinIcon, tr("Text %1").arg(i));
 		item->setData(Qt::UserRole, i);
 		liste1->addItem(item);
-		if(!usedTexts.contains(i)) {
+
+		if (!usedTexts.contains(i)) {
 			item->setForeground(Qt::darkGray);
 		}
 	}
+
 	liste1->setCurrentRow(0);
 	liste1->blockSignals(false);
 }
@@ -360,17 +395,21 @@
 void TextManager::updateText()
 {
 	selectText(liste1->currentItem());
-	textPreview->calcSize();
+	if (textPreview->winCount() == 0) {
+		textPreview->calcSize();
+	} else {
+		textPreview->update();
+	}
 }
 
 void TextManager::updateFromScripts()
 {
 	usedTexts = scriptsAndTexts->listUsedTexts();
 
-	for(int row = 0 ; row < liste1->count(); ++row) {
+	for (int row = 0; row < liste1->count(); ++row) {
 		QListWidgetItem *item = liste1->item(row);
 		int textID = item->data(Qt::UserRole).toInt();
-		if(!usedTexts.contains(textID)) {
+		if (!usedTexts.contains(textID)) {
 			item->setForeground(Qt::darkGray);
 		} else {
 			// Default foreground
@@ -381,8 +420,8 @@
 
 void TextManager::gotoText(int textID, int from, int size)
 {
-	for(int i=0 ; i<liste1->count() ; ++i) {
-		if(textID == liste1->item(i)->data(Qt::UserRole).toInt()) {
+	for (int i=0; i<liste1->count(); ++i) {
+		if (textID == liste1->item(i)->data(Qt::UserRole).toInt()) {
 			blockSignals(true);
 			textEdit->blockSignals(true);
 			liste1->setCurrentItem(liste1->item(i));
@@ -407,7 +446,7 @@
 int TextManager::currentTextId() const
 {
 	QListWidgetItem *currentItem = liste1->currentItem();
-	if(currentItem) {
+	if (currentItem) {
 		return currentItem->data(Qt::UserRole).toInt();
 	}
 	return -1;
@@ -425,9 +464,9 @@
 
 void TextManager::addText()
 {
-	if(!scriptsAndTexts || scriptsAndTexts->textCount() >= scriptsAndTexts->maxTextCount())	return;
+	if (!scriptsAndTexts || scriptsAndTexts->textCount() >= scriptsAndTexts->maxTextCount())	return;
 	QListWidgetItem *item = liste1->currentItem();
-	int row = !item ? scriptsAndTexts->textCount() : item->data(Qt::UserRole).toInt()+1;
+	int row = !item ? scriptsAndTexts->textCount() : item->data(Qt::UserRole).toInt() + 1;
 	liste1->blockSignals(true);
 	scriptsAndTexts->insertText(row, FF7Text());
 	usedTexts = scriptsAndTexts->listUsedTexts();
@@ -440,13 +479,17 @@
 
 void TextManager::delText()
 {
-	if(!scriptsAndTexts)	return;
+	if (!scriptsAndTexts) {
+		return;
+	}
 	QListWidgetItem *item = liste1->currentItem();
-	if(!item) return;
+	if (!item) {
+		return;
+	}
 	int row=item->data(Qt::UserRole).toInt();
-	if(usedTexts.contains(row)) {
+	if (usedTexts.contains(row)) {
 		QMessageBox::StandardButton rep = QMessageBox::warning(this, tr("Text used in scripts"), tr("This text is used by one or more scripts on this field.\nRemoving this text may break scripts that reference it.\nAre you sure you want to continue?"), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
-		if(rep == QMessageBox::Cancel) {
+		if (rep == QMessageBox::Cancel) {
 			return;
 		}
 	}
@@ -484,80 +527,163 @@
 
 void TextManager::prevTextPreviewWin()
 {
-//	textPreview->prevWin();
-//	changeTextPreviewWin();
+	textPreview->prevWin();
+	changeTextPreviewWin();
 }
 
 void TextManager::nextTextPreviewWin()
 {
-//	textPreview->nextWin();
-//	changeTextPreviewWin();
+	textPreview->nextWin();
+	changeTextPreviewWin();
 }
 
 void TextManager::changeTextPreviewWin()
 {
-//	int currentWin = textPreview->currentWin(), nbWin = textPreview->winCount();
+	int currentWin = textPreview->currentWin(), nbWin = textPreview->winCount();
 
-//	textWin->setText(tr("Fenêtre %1/%2").arg(currentWin).arg(nbWin));
-//	prevWin->setEnabled(currentWin > 1);
-//	nextWin->setEnabled(currentWin < nbWin);
-//	textWin->setEnabled(nbWin > 0);
-//	xCoord->setEnabled(nbWin > 0);
-//	yCoord->setEnabled(nbWin > 0);
-//	wSize->setEnabled(nbWin > 0);
-//	hSize->setEnabled(nbWin > 0);
+	textWin->setText(tr("Window %1/%2").arg(currentWin).arg(nbWin));
+	prevWin->setEnabled(currentWin > 1);
+	nextWin->setEnabled(currentWin < nbWin);
+	textWin->setEnabled(nbWin > 0);
+	xCoord->setEnabled(nbWin > 0);
+	xLabel->setEnabled(nbWin > 0);
+	yCoord->setEnabled(nbWin > 0);
+	yLabel->setEnabled(nbWin > 0);
+	wSize->setEnabled(nbWin > 0);
+	wLabel->setEnabled(nbWin > 0);
+	hSize->setEnabled(nbWin > 0);
+	hLabel->setEnabled(nbWin > 0);
+	hAlign->setEnabled(nbWin > 0);
+	vAlign->setEnabled(nbWin > 0);
+	autoSize->setEnabled(nbWin > 0);
 
-//	updateWindowCoord();
+	updateWindowCoord();
 }
 
-void TextManager::changeRect(QRect rect)
+void TextManager::changePosition(const QPoint &point)
 {
-	xCoord->setValue(rect.x());
-	yCoord->setValue(rect.y());
-	wSize->setValue(rect.width());
-	hSize->setValue(rect.height());
+	if (!scriptsAndTexts || textPreview->winCount() <= 0
+	    || liste1->currentItem() == nullptr) {
+		return;
+	}
+
+	xCoord->blockSignals(true);
+	xCoord->setValue(point.x());
+	xCoord->blockSignals(false);
+	yCoord->blockSignals(true);
+	yCoord->setValue(point.y());
+	yCoord->blockSignals(false);
+
+	FF7Window ff7Window = textPreview->getWindow();
+	ff7Window.x = point.x();
+	ff7Window.y = point.y();
+	scriptsAndTexts->setWindow(ff7Window);
+	textPreview->setWindow(ff7Window);
+	emit modified();
+	emit opcodeModified(ff7Window.groupID, ff7Window.scriptID, ff7Window.opcodeID);
 }
 
-void TextManager::changeXCoord(int /*x*/)
+void TextManager::changeSize(const QSize &size)
 {
-	/*if(!scriptsAndTexts || textPreview->winCount()<=0 || liste1->currentItem()==NULL)	return;
+	if (!scriptsAndTexts || textPreview->winCount() <= 0
+	    || liste1->currentItem() == nullptr) {
+		return;
+	}
+
+	wSize->blockSignals(true);
+	wSize->setValue(size.width());
+	wSize->blockSignals(false);
+	hSize->blockSignals(true);
+	hSize->setValue(size.height());
+	hSize->blockSignals(false);
 
-	int textID = liste1->currentItem()->data(Qt::UserRole).toInt();
-	int winID = textPreview->currentWin()-1;
 	FF7Window ff7Window = textPreview->getWindow();
-	if(ff7Window.x != x) {
-		ff7Window.x = x;
+	ff7Window.w = size.width();
+	ff7Window.h = size.height();
+	scriptsAndTexts->setWindow(ff7Window);
+	textPreview->setWindow(ff7Window);
+	emit modified();
+	emit opcodeModified(ff7Window.groupID, ff7Window.scriptID, ff7Window.opcodeID);
+}
+
+void TextManager::changeXCoord(int x)
+{
+	if (!scriptsAndTexts || textPreview->winCount() <= 0
+	    || liste1->currentItem() == nullptr) {
+		return;
+	}
 
-//		qDebug() << "changeXCoord()" << x << textID << winID;
+	FF7Window ff7Window = textPreview->getWindow();
+
+	if (ff7Window.x != x) {
+		ff7Window.x = x;
 
 		scriptsAndTexts->setWindow(ff7Window);
-//		_windows.clear();
-//		_text2win.clear();
-//		scriptsAndTexts->listWindows(_windows, _text2win); // refresh
-//		textPreview->setWins(getWindows(textID));
+		textPreview->setWindow(ff7Window);
+		textPreview->update();
 		emit modified();
-	}*/
+		emit opcodeModified(ff7Window.groupID, ff7Window.scriptID, ff7Window.opcodeID);
+	}
 }
 
-void TextManager::changeYCoord(int /*y*/)
+void TextManager::changeYCoord(int y)
 {
-	/*if(!scriptsAndTexts || textPreview->winCount()<=0 || liste1->currentItem()==NULL)	return;
+	if (!scriptsAndTexts || textPreview->winCount() <= 0
+	    || liste1->currentItem() == nullptr) {
+		return;
+	}
 
-	int textID = liste1->currentItem()->data(Qt::UserRole).toInt();
-	int winID = textPreview->currentWin()-1;
 	FF7Window ff7Window = textPreview->getWindow();
-	if(ff7Window.y != y) {
+
+	if (ff7Window.y != y) {
 		ff7Window.y = y;
 
-//		qDebug() << "changeYCoord()" << y << textID << winID;
+		scriptsAndTexts->setWindow(ff7Window);
+		textPreview->setWindow(ff7Window);
+		textPreview->update();
+		emit modified();
+		emit opcodeModified(ff7Window.groupID, ff7Window.scriptID, ff7Window.opcodeID);
+	}
+}
+
+void TextManager::changeWSize(int w)
+{
+	if (!scriptsAndTexts || textPreview->winCount() <= 0
+	    || liste1->currentItem() == nullptr) {
+		return;
+	}
+
+	FF7Window ff7Window = textPreview->getWindow();
+
+	if (ff7Window.w != w) {
+		ff7Window.w = w;
+
+		scriptsAndTexts->setWindow(ff7Window);
+		textPreview->setWindow(ff7Window);
+		textPreview->update();
+		emit modified();
+		emit opcodeModified(ff7Window.groupID, ff7Window.scriptID, ff7Window.opcodeID);
+	}
+}
+
+void TextManager::changeHSize(int h)
+{
+	if (!scriptsAndTexts || textPreview->winCount() <= 0
+	    || liste1->currentItem() == nullptr) {
+		return;
+	}
+
+	FF7Window ff7Window = textPreview->getWindow();
+
+	if (ff7Window.h != h) {
+		ff7Window.h = h;
 
 		scriptsAndTexts->setWindow(ff7Window);
-//		_windows.clear();
-//		_text2win.clear();
-//		scriptsAndTexts->listWindows(_windows, _text2win); // refresh
-//		textPreview->setWins(getWindows(textID));
+		textPreview->setWindow(ff7Window);
+		textPreview->update();
 		emit modified();
-	}*/
+		emit opcodeModified(ff7Window.groupID, ff7Window.scriptID, ff7Window.opcodeID);
+	}
 }
 
 void TextManager::updateWindowCoord()
@@ -571,7 +697,31 @@
 
 void TextManager::insertTag(QAction *action)
 {
-	if(sender() != action->parentWidget())	return;// toolBar/Menu signals hack
+	if (sender() != action->parentWidget()) {
+		return; // toolBar/Menu signals hack
+	}
 	textEdit->insertPlainText(action->data().toString());
 	textEdit->setFocus();
 }
+
+void TextManager::align(Qt::Alignment alignment)
+{
+	if (xCoord->isEnabled()) {
+		QPoint point(xCoord->value(), yCoord->value());
+		if (alignment.testFlag(Qt::AlignHCenter)) {
+			point.setX((textPreview->width() - wSize->value()) / 2);
+		}
+		if (alignment.testFlag(Qt::AlignVCenter)) {
+			point.setY((textPreview->height() - hSize->value()) / 2);
+		}
+		changePosition(point);
+		textPreview->update();
+	}
+}
+
+void TextManager::resizeWindow()
+{
+	textPreview->calcSize();
+	changeSize(textPreview->getCalculatedSize());
+	textPreview->update();
+}
diff -Nru makoureactor-1.7.2/widgets/TextManager.h makoureactor-1.8.0/widgets/TextManager.h
--- makoureactor-1.7.2/widgets/TextManager.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/TextManager.h	2020-08-08 18:46:56.000000000 +0000
@@ -38,6 +38,7 @@
 	int currentAnchorPosition() const;
 signals:
 	void modified();
+	void opcodeModified(int groupID, int scriptID, int opcodeID);
 public slots:
 	void updateFromScripts();
 private slots:
@@ -53,12 +54,23 @@
 	void prevTextPreviewWin();
 	void nextTextPreviewWin();
 	void changeTextPreviewWin();
-	void changeRect(QRect rect);
+	void changePosition(const QPoint &point);
+	void changeSize(const QSize &size);
 	void changeXCoord(int);
 	void changeYCoord(int);
+	void changeWSize(int);
+	void changeHSize(int);
+	void resizeWindow();
+	inline void alignHorizontally() {
+		align(Qt::AlignHCenter);
+	}
+	inline void alignVertically() {
+		align(Qt::AlignVCenter);
+	}
 private:
 	void updateWindowCoord();
-//	QList<FF7Window> getWindows(quint8 textID) const;
+	QList<FF7Window> getWindows(int textID) const;
+	void align(Qt::Alignment alignment);
 
 	QCheckBox *dispUnusedText;
 	QListWidget *liste1;
@@ -69,13 +81,14 @@
 	QToolButton *prevPage, *prevWin;
 	QToolButton *nextPage, *nextWin;
 	QLabel *textPage, *textWin;
+	QLabel *xLabel, *yLabel, *wLabel, *hLabel;
 	QSpinBox *xCoord, *yCoord;
 	QSpinBox *wSize, *hSize;
+	QPushButton *hAlign, *vAlign, *autoSize;
 
 	Section1File *scriptsAndTexts;
-//	QMultiMap<quint64, FF7Window> _windows;
-//	QMultiMap<quint8, quint64> _text2win;
 	QSet<quint8> usedTexts;
+	static QIcon winIcon, noWinIcon;
 protected:
 	virtual void focusInEvent(QFocusEvent *e);
 };
diff -Nru makoureactor-1.7.2/widgets/TextPreview.cpp makoureactor-1.8.0/widgets/TextPreview.cpp
--- makoureactor-1.7.2/widgets/TextPreview.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/TextPreview.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -38,7 +38,7 @@
 	setFixedSize(320, 224);
 	clear();
 
-	if(names.isEmpty()) {
+	if (names.isEmpty()) {
 		fontImage = QImage(":/images/font.png");
 		fillNames();
 	}
@@ -47,9 +47,9 @@
 void TextPreview::fillNames()
 {
 	QStringList dataNames = Data::char_names;
-	for(int i=0 ; i<9 ; ++i) {
+	for (int i=0; i<9; ++i) {
 		QString customName = Config::value(QString("customCharName%1").arg(i)).toString();
-		if(!customName.isEmpty()) {
+		if (!customName.isEmpty()) {
 			dataNames.replace(i, customName);
 		}
 	}
@@ -59,11 +59,10 @@
 //	bool jp = Config::value("jp_txt", false).toBool();
 //	Config::setValue("jp_txt", false);
 
-	for(int i=0 ; i<12 ; ++i) {
-		QByteArray nameData = FF7Text(dataNames.at(i), false).data();
-		names.append(nameData);
-		namesWidth[i] = calcFF7TextWidth(nameData);
+	for (int i=0; i<12; ++i) {
+		names.append(FF7Text(dataNames.at(i), false).data());
 	}
+	namesWidth = calcFF7TextWidth(FF7Text("WWWWWWWWW", false).data());
 //	Config::setValue("jp_txt", jp);
 }
 
@@ -82,8 +81,8 @@
 {
 	int width = 0;
 
-	foreach(const quint8 &c, ff7Text) {
-		if(c<0xe0) {
+	for (const quint8 &c : ff7Text) {
+		if (c<0xe0) {
 			width += charFullWidth(0, c);
 		}
 	}
@@ -108,7 +107,7 @@
 {
 //	qDebug() << "TextPreview::setWins()";
 	ff7Windows = windows;
-	if(update)
+	if (update)
 		this->update();
 	//qDebug() << "type" << window.type << "x" << window.x << "y" << window.y << "u1" << window.u1;
 }
@@ -125,13 +124,25 @@
 
 FF7Window TextPreview::getWindow() const
 {
-	if(!ff7Windows.isEmpty())
+	if (!ff7Windows.isEmpty()) {
 		return ff7Windows.at(_currentWin);
-	else {
-		FF7Window ff7Window = FF7Window();
-		ff7Window.type = NOWIN;
-		return ff7Window;
 	}
+
+	FF7Window ff7Window = FF7Window();
+	ff7Window.type = NOWIN;
+
+	return ff7Window;
+}
+
+bool TextPreview::setWindow(const FF7Window &win)
+{
+	if (!ff7Windows.isEmpty()) {
+		ff7Windows[_currentWin] = win;
+
+		return true;
+	}
+
+	return false;
 }
 
 int TextPreview::winCount() const
@@ -141,7 +152,7 @@
 
 void TextPreview::nextWin()
 {
-	if(_currentWin+1 < ff7Windows.size()) {
+	if (_currentWin+1 < ff7Windows.size()) {
 //		qDebug() << "TextPreview::nextWin()";
 		++_currentWin;
 		update();
@@ -150,7 +161,7 @@
 
 void TextPreview::prevWin()
 {
-	if(_currentWin > 0) {
+	if (_currentWin > 0) {
 //		qDebug() << "TextPreview::prevWin()";
 		--_currentWin;
 		update();
@@ -166,7 +177,7 @@
 {
 //	qDebug() << "TextPreview::setText()";
 	ff7Text = textData;
-	if(reset)
+	if (reset)
 		_currentPage = 0;
 	calcSize();
 }
@@ -183,7 +194,7 @@
 
 void TextPreview::nextPage()
 {
-	if(_currentPage+1 < pagesPos.size()) {
+	if (_currentPage+1 < pagesPos.size()) {
 //		qDebug() << "TextPreview::nextPage()";
 		++_currentPage;
 		update();
@@ -192,7 +203,7 @@
 
 void TextPreview::prevPage()
 {
-	if(_currentPage > 0) {
+	if (_currentPage > 0) {
 //		qDebug() << "TextPreview::prevPage()";
 		--_currentPage;
 		update();
@@ -218,6 +229,10 @@
 
 QSize TextPreview::calcSize(const QByteArray &ff7Text, QList<int> &pagesPos)
 {
+	if (names.isEmpty()) {
+		fillNames();
+	}
+
 	const int baseWidth = 8 + Config::value("autoSizeMarginRight", 14).toInt();
 	int line=0, width=baseWidth - 3, height=25, size=ff7Text.size(), maxW=0, maxH=0;
 	pagesPos.clear();
@@ -225,23 +240,23 @@
 	bool jp = Config::value("jp_txt", false).toBool(), spaced_characters=false;
 	int spacedCharsW = Config::value("spacedCharactersWidth", 13).toInt();
 
-	for(int i=0 ; i<size ; ++i) {
+	for (int i=0; i<size; ++i) {
 		quint8 caract = (quint8)ff7Text.at(i);
-		if(caract==0xff) break;
-		switch(caract) {
+		if (caract==0xff) break;
+		switch (caract) {
 		case 0xe8: // New Page
 		case 0xe9: // New Page 2
-			if(line == 0)	width += 3;
-			if(height>maxH)	maxH = height;
-			if(width>maxW)	maxW = width;
+			if (line == 0)	width += 3;
+			if (height>maxH)	maxH = height;
+			if (width>maxW)	maxW = width;
 			++line;
 			width = baseWidth;
 			height = 25;
 			pagesPos.append(i+1);
 			break;
 		case 0xe7: // \n
-			if(line == 0)	width += 3;
-			if(width>maxW)	maxW = width;
+			if (line == 0)	width += 3;
+			if (width>maxW)	maxW = width;
 			++line;
 			width = baseWidth;
 			height += 16;
@@ -249,65 +264,65 @@
 		case 0xfa: // Jap 1
 			++i;
 			caract = (quint8)ff7Text.at(i);
-			if(jp) {
+			if (jp) {
 				width += spaced_characters ? spacedCharsW : charFullWidth(2, caract);
-			} else if(caract < 0xd2) {
+			} else if (caract < 0xd2) {
 				width += spaced_characters ? spacedCharsW : 1;
 			}
 			break;
 		case 0xfb: // Jap 2
 			++i;
-			if(jp) {
+			if (jp) {
 				caract = (quint8)ff7Text.at(i);
 				width += spaced_characters ? spacedCharsW : charFullWidth(3, caract);
 			}
 			break;
 		case 0xfc: // Jap 3
 			++i;
-			if(jp) {
+			if (jp) {
 				caract = (quint8)ff7Text.at(i);
 				width += spaced_characters ? spacedCharsW : charFullWidth(4, caract);
 			}
 			break;
 		case 0xfd: // Jap 4
 			++i;
-			if(jp) {
+			if (jp) {
 				caract = (quint8)ff7Text.at(i);
 				width += spaced_characters ? spacedCharsW : charFullWidth(5, caract);
 			}
 			break;
 		case 0xfe: // Jap 5 + add
 			++i;
-			if(i >= size)		break;
+			if (i >= size)		break;
 			caract = (quint8)ff7Text.at(i);
-			if(caract == 0xdd)
+			if (caract == 0xdd)
 				++i;
-			else if(caract == 0xde || caract == 0xdf || caract == 0xe1) {
-				if(caract == 0xe1)		width += spaced_characters ? spacedCharsW * 4 : 12;
+			else if (caract == 0xde || caract == 0xdf || caract == 0xe1) {
+				if (caract == 0xe1)		width += spaced_characters ? spacedCharsW * 4 : 12;
 				int zeroId = !jp ? 0x10 : 0x33;
 				width += spaced_characters ? spacedCharsW : charFullWidth(0, zeroId);
-			} else if(caract == 0xe2)
+			} else if (caract == 0xe2)
 				i += 4;
-			else if(caract == 0xe9)
+			else if (caract == 0xe9)
 				spaced_characters = !spaced_characters;
-			else if(caract < 0xd2 && jp)
+			else if (caract < 0xd2 && jp)
 				width += spaced_characters ? spacedCharsW : charFullWidth(6, caract);
 			break;
 		default:
-			if(!jp && caract==0xe0) {// {CHOICE}
+			if (!jp && caract==0xe0) {// {CHOICE}
 				width += spaced_characters ? spacedCharsW * 10 : 30;
-			} else if(!jp && caract==0xe1) {// \t
+			} else if (!jp && caract==0xe1) {// \t
 				width += spaced_characters ? spacedCharsW * 4 : 12;
-			} else if(!jp && caract>=0xe2 && caract<=0xe4) {// duo
+			} else if (!jp && caract>=0xe2 && caract<=0xe4) {// duo
 				const char *duo = optimisedDuo[caract-0xe2];
 				width += spaced_characters ? spacedCharsW : charFullWidth(1, (quint8)duo[0]);
 				width += spaced_characters ? spacedCharsW : charFullWidth(1, (quint8)duo[1]);
-			} else if(caract>=0xea && caract<=0xf5) {// Character names
-				width += spaced_characters ? spacedCharsW * names.at(caract-0xea).size() : namesWidth[caract-0xea];
-			} else if(caract>=0xf6 && caract<=0xf9) {// Keys
+			} else if (caract>=0xea && caract<=0xf5) {// Character names
+				width += spaced_characters ? spacedCharsW * 9 : namesWidth;
+			} else if (caract>=0xf6 && caract<=0xf9) {// Keys
 				width += 17;
 			} else {
-				if(jp) {
+				if (jp) {
 					width += spaced_characters ? spacedCharsW : charFullWidth(1, caract);
 				} else {
 					width += spaced_characters ? spacedCharsW : charFullWidth(0, caract);
@@ -317,10 +332,10 @@
 		}
 	}
 
-	if(height>maxH)	maxH = height;
-	if(width>maxW)	maxW = width;
-	if(maxW>322)	maxW = 322;
-	if(maxH>226)	maxH = 226;
+	if (height>maxH)	maxH = height;
+	if (width>maxW)	maxW = width;
+	if (maxW>322)	maxW = 322;
+	if (maxH>226)	maxH = 226;
 
 	return QSize(maxW, maxH);
 }
@@ -333,18 +348,18 @@
 QPoint TextPreview::realPos(const FF7Window &ff7Window)
 {
 //	qDebug() << "TextPreview::realPos()";
-	if(ff7Window.type == NOWIN)	return QPoint();
+	if (ff7Window.type == NOWIN)	return QPoint();
 
 	int windowX=ff7Window.x, windowY=ff7Window.y;
-	if(windowX+ff7Window.w>312) {
+	if (windowX+ff7Window.w>312) {
 		windowX = 312-ff7Window.w;
 	}
-	if(windowY+ff7Window.h>223) {
+	if (windowY+ff7Window.h>223) {
 		windowY = 223-ff7Window.h;
 	}
 
-	if(windowX<8)	windowX = 8;
-	if(windowY<8)	windowY = 8;
+	if (windowX<8)	windowX = 8;
+	if (windowY<8)	windowY = 8;
 
 	return QPoint(windowX, windowY);
 }
@@ -355,12 +370,17 @@
 
 	curFrame = !curFrame;
 	--startMulticolor;
-	if(startMulticolor < 0)		startMulticolor = 7;
+	if (startMulticolor < 0)		startMulticolor = 7;
 	repaint();
 }
 
 void TextPreview::drawWindow(QPainter *painter, WindowType type) const
 {
+	drawWindow(painter, maxW, maxH, type);
+}
+
+void TextPreview::drawWindow(QPainter *painter, int maxW, int maxH, WindowType type)
+{
 	QRgb windowColorTopLeft = Config::value("windowColorTopLeft", qRgb(0,88,176)).toInt();
 	QRgb windowColorTopRight = Config::value("windowColorTopRight", qRgb(0,0,80)).toInt();
 	QRgb windowColorBottomLeft = Config::value("windowColorBottomLeft", qRgb(0,0,128)).toInt();
@@ -371,8 +391,8 @@
 
 void TextPreview::drawWindow(QPainter *painter, int maxW, int maxH, QRgb colorTopLeft, QRgb colorTopRight, QRgb colorBottomLeft, QRgb colorBottomRight, WindowType type)
 {
-	if(type != WithoutFrame) {
-		if(type == Transparent) {
+	if (type != WithoutFrameAndBg) {
+		if (type == Transparent) {
 			colorTopLeft = qRgba(qRed(colorTopLeft), qGreen(colorTopLeft), qBlue(colorTopLeft), 127);
 			colorTopRight = qRgba(qRed(colorTopRight), qGreen(colorTopRight), qBlue(colorTopRight), 127);
 			colorBottomLeft = qRgba(qRed(colorBottomLeft), qGreen(colorBottomLeft), qBlue(colorBottomLeft), 127);
@@ -391,6 +411,12 @@
 		QPen pen;
 		pen.setStyle(Qt::NoPen);
 		painter->setPen(pen);
+
+		if (type == WithoutFrame) {
+			painter->drawRect(0, 0, maxW, maxH);
+			return;
+		}
+
 		painter->drawRect(3, 3, maxW-6, maxH-6);
 
 		// Vertical
@@ -463,41 +489,41 @@
 
 	/* Window Background */
 
-	if(ff7Window.type!=NOWIN) {
+	if (ff7Window.type != NOWIN) {
 		painter->translate(realPos(ff7Window));
 		maxW = ff7Window.w;
 		maxH = ff7Window.h;
-		mode = (WindowType)ff7Window.mode;
+		mode = WindowType(ff7Window.mode);
 	}
 
 	drawWindow(painter, mode);
 
 	/* Text */
 
-	if(ff7Text.isEmpty())	return false;
+	if (ff7Text.isEmpty())	return false;
 
 	setFontColor(WHITE);
 
 	int line = 0, x = 8, y = 6;
 	int start = pagesPos.value(_currentPage, 0), size = ff7Text.size();
 
-	for(int i=start ; i<size ; ++i) {
+	for (int i=start; i<size; ++i) {
 		int charId = (quint8)ff7Text.at(i);
 
-		if(charId==0xff || charId==0xe8 || charId==0xe9) { //end | NewPage | NewPage2
+		if (charId==0xff || charId==0xe8 || charId==0xe9) { //end | NewPage | NewPage2
 			break;
-		} else if(charId==0xe7) { //\n
+		} else if (charId==0xe7) { //\n
 			++line;
 			x = 8;
 			y += 16;
-			if(y > maxH-16)	break;
-		} else if(charId<0xe7) {
-			if(!jp) {
-				if(charId==0xe0)//{CHOICE}
+			if (y > maxH-16)	break;
+		} else if (charId<0xe7) {
+			if (!jp) {
+				if (charId==0xe0)//{CHOICE}
 					x += spaced_characters ? spacedCharsW * 10 : 30;
-				else if(charId==0xe1)//\t
+				else if (charId==0xe1)//\t
 					x += spaced_characters ? spacedCharsW * 4 : 12;
-				else if(charId>=0xe2 && charId<=0xe4) {
+				else if (charId>=0xe2 && charId<=0xe4) {
 					const quint8 *opti = (const quint8 *)optimisedDuo[charId-0xe2];
 					letter(&x, &y, opti[0], painter, 0);
 					letter(&x, &y, opti[1], painter, 0);
@@ -507,58 +533,58 @@
 			} else {
 				letter(&x, &y, charId, painter, 1);
 			}
-		} else if(charId>=0xea && charId<=0xf5) {
+		} else if (charId>=0xea && charId<=0xf5) {
 			word(&x, &y, names.at(charId-0xea), painter);
-		} else if(charId>=0xf6 && charId<=0xf9) {
+		} else if (charId>=0xf6 && charId<=0xf9) {
 			painter->drawPixmap(x, y - 2, getIconImage(charId-0xf6));
 			x += 17;
 		} else {
 			++i;
-			if(i >= size)	break;
+			if (i >= size)	break;
 			int charId2 = (quint8)ff7Text.at(i);
 
-			switch(charId) {
+			switch (charId) {
 			case 0xfa:
-				if(jp)	letter(&x, &y, charId2, painter, 2);
-				else if(charId2 < 0xd2)		x += spaced_characters ? spacedCharsW : 1;
+				if (jp)	letter(&x, &y, charId2, painter, 2);
+				else if (charId2 < 0xd2)		x += spaced_characters ? spacedCharsW : 1;
 				break;
 			case 0xfb:
-				if(jp)	letter(&x, &y, charId2, painter, 3);
+				if (jp)	letter(&x, &y, charId2, painter, 3);
 				break;
 			case 0xfc:
-				if(jp)	letter(&x, &y, charId2, painter, 4);
+				if (jp)	letter(&x, &y, charId2, painter, 4);
 				break;
 			case 0xfd:
-				if(jp)	letter(&x, &y, charId2, painter, 5);
+				if (jp)	letter(&x, &y, charId2, painter, 5);
 				break;
 			case 0xfe:
-				if(charId2 >= 0xd2 && charId2 <= 0xd9) {
+				if (charId2 >= 0xd2 && charId2 <= 0xd9) {
 					setFontColor(charId2-0xd2, blink && !curFrame);
-				} else if(charId2 == 0xda) {
+				} else if (charId2 == 0xda) {
 					useTimer = true;
 					blink = !blink;
 					setFontColor(fontColor, blink && !curFrame);
-				} else if(charId2 == 0xdb) {
+				} else if (charId2 == 0xdb) {
 					useTimer = true;
-					if(multicolor == -1) {
+					if (multicolor == -1) {
 						savFontColor = fontColor;
 						multicolor = startMulticolor;
 					} else {
 						multicolor = -1;
 						setFontColor(savFontColor, blink && !curFrame);
 					}
-				} else if(charId2 == 0xdd) {
+				} else if (charId2 == 0xdd) {
 					++i;
-				} else if(charId2 == 0xde || charId2 == 0xdf) {
+				} else if (charId2 == 0xde || charId2 == 0xdf) {
 					letter(&x, &y, !jp ? 0x10 : 0x33, painter, jp);// zero
-				} else if(charId2 == 0xe1) {
+				} else if (charId2 == 0xe1) {
 					x += spaced_characters ? spacedCharsW * 4 : 12;// tab
 					letter(&x, &y, !jp ? 0x10 : 0x33, painter, jp);// zero
-				} else if(charId2 == 0xe2) {
+				} else if (charId2 == 0xe2) {
 					i += 4;
-				} else if(charId2 == 0xe9) {
+				} else if (charId2 == 0xe9) {
 					spaced_characters = !spaced_characters;
-				} else if(charId2 < 0xd2 && jp) {
+				} else if (charId2 < 0xd2 && jp) {
 					letter(&x, &y, charId2, painter, 6);
 				}
 				break;
@@ -567,9 +593,12 @@
 	}
 
 	/* Ask */
-//	if(ff7Window.type==0x48 && ff7Window.ask_last >= ff7Window.ask_first) {
-//		painter->drawPixmap(10, 11+16*ff7Window.ask_first, QPixmap(":/images/cursor.png"));
-//	}
+	if (ff7Window.type == Opcode::ASK && _currentPage == pagesPos.size() - 1) {
+		QPixmap cursor(":/images/cursor.png");
+		for (int i = ff7Window.ask_first; i <= ff7Window.ask_last; ++i) {
+			painter->drawPixmap(10, 6 + 16 * i, cursor);
+		}
+	}
 
 	return useTimer;
 }
@@ -592,7 +621,7 @@
 
 	QPainter painter2(this);
 
-	if(!isEnabled()) {
+	if (!isEnabled()) {
 		QStyleOption opt;
 		opt.initFrom(this);
 		painter2.drawPixmap(0, 0, QWidget::style()->generatedIconPixmap(QIcon::Disabled, pix, &opt));
@@ -603,25 +632,25 @@
 
 	painter2.end();
 
-	if(!timer.isActive()) {
-		if(useTimer)	timer.start(100);
+	if (!timer.isActive()) {
+		if (useTimer)	timer.start(100);
 	}
 	else {
-		if(!useTimer)	timer.stop();
+		if (!useTimer)	timer.stop();
 	}
 }
 
 void TextPreview::mousePressEvent(QMouseEvent *event)
 {
-	if(event->button() == Qt::LeftButton && !readOnly) {
+	if (event->button() == Qt::LeftButton && !readOnly) {
 		FF7Window ff7Window = getWindow();
-		if(ff7Window.type!=NOWIN) {
+		if (ff7Window.type!=NOWIN) {
 			QPoint real = realPos(ff7Window);
 
 			acceptMove = event->x() >= real.x() && event->x() < real.x()+maxW
 						 && event->y() >= real.y() && event->y() < real.y()+maxH;
 
-			if(acceptMove) {
+			if (acceptMove) {
 				moveStartPosition = event->pos();
 				setCursor(Qt::ClosedHandCursor);
 			}
@@ -633,18 +662,18 @@
 
 void TextPreview::mouseMoveEvent(QMouseEvent *event)
 {
-	if(!(event->buttons() & Qt::LeftButton) && !acceptMove)
+	if (!(event->buttons() & Qt::LeftButton) && !acceptMove)
 		return;
 
 	FF7Window ff7Window = getWindow();
 
-	if(ff7Window.type==NOWIN)	return;
+	if (ff7Window.type==NOWIN)	return;
 
 	int x = ff7Window.x + event->x() - moveStartPosition.x();
 	int y = ff7Window.y + event->y() - moveStartPosition.y();
 
-	if(x<0)	x = 0;
-	if(y<0)	y = 0;
+	if (x<0)	x = 0;
+	if (y<0)	y = 0;
 
 	ff7Window.x = x;
 	ff7Window.y = y;
@@ -663,7 +692,7 @@
 
 void TextPreview::mouseReleaseEvent(QMouseEvent *)
 {
-	if(acceptMove) {
+	if (acceptMove) {
 		unsetCursor();
 	}
 }
@@ -673,12 +702,12 @@
 	int numDegrees = event->delta() / 8,
 			numSteps = numDegrees / 15;
 
-	if(event->orientation() == Qt::Vertical) {
+	if (event->orientation() == Qt::Vertical) {
 		int oldPage = _currentPage;
 
-		if(numSteps > 0) {
+		if (numSteps > 0) {
 			prevPage();
-		} else if(numSteps < 0) {
+		} else if (numSteps < 0) {
 			nextPage();
 		}
 
@@ -693,24 +722,28 @@
 	int charWidth = charW(tableId, charId);
 	int leftPadd = leftPadding(tableId, charId);
 
-	if(*x + leftPadd + charWidth > maxW) {
+	if (*x + leftPadd + charWidth > maxW) {
 		*x = 8;
 		*y += 16;
+
+		if (*y > maxH - 16) {
+			return;
+		}
 	}
 
-	if(multicolor != -1) {
+	if (multicolor != -1) {
 		setFontColor(multicolor);
 		multicolor = (multicolor + 1) % 8;
 	}
 
-	if(!spaced_characters)	*x += leftPadd;
+	if (!spaced_characters)	*x += leftPadd;
 	painter->drawImage(*x, *y, letterImage(tableId, charId));
 	*x += spaced_characters ? Config::value("spacedCharactersWidth", 13).toInt() : charWidth;
 }
 
 void TextPreview::word(int *x, int *y, const QByteArray &charIds, QPainter *painter, quint8 tableId)
 {
-	foreach(char charId, charIds) {
+	for (char charId : charIds) {
 		letter(x, y, charId, painter, tableId);
 	}
 }
@@ -720,7 +753,7 @@
 	return Data::windowBin.isValid() &&
 			(tableId != 0 || !Data::windowBin.isJp())
 			? Data::windowBin.charWidth(tableId == 0 ? 0 : tableId - 1, charId)
-			: CHAR_WIDTH(charWidth[tableId][charId]);
+			: CHARACTER_WIDTH(charWidth[tableId][charId]);
 }
 
 quint8 TextPreview::leftPadding(int tableId, int charId)
@@ -738,7 +771,7 @@
 
 QImage TextPreview::letterImage(int tableId, int charId)
 {
-	if(Data::windowBin.isValid() &&
+	if (Data::windowBin.isValid() &&
 			(tableId != 0 || !Data::windowBin.isJp())) {
 		return Data::windowBin.letter(tableId == 0 ? 0 : tableId - 1, charId, WindowBinFile::FontColor(fontColor));
 	} else {
@@ -749,7 +782,7 @@
 
 void TextPreview::setFontColor(int id, bool blink)
 {
-	if(!Data::windowBin.isValid()) {
+	if (!Data::windowBin.isValid()) {
 		fontImage.setColorTable(fontPalettes[blink ? DARKGREY : id]);
 	}
 	fontColor = id;
@@ -918,4 +951,4 @@
 
 QList<QByteArray> TextPreview::names;
 
-int TextPreview::namesWidth[12];
+int TextPreview::namesWidth;
diff -Nru makoureactor-1.7.2/widgets/TextPreview.h makoureactor-1.8.0/widgets/TextPreview.h
--- makoureactor-1.7.2/widgets/TextPreview.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/TextPreview.h	2020-08-08 18:46:56.000000000 +0000
@@ -36,7 +36,7 @@
 	Q_OBJECT
 public:
 	enum WindowType {
-		Normal=0, WithoutFrame, Transparent
+		Normal=0, WithoutFrameAndBg, Transparent, WithoutFrame
 	};
 
 	explicit TextPreview(QWidget *parent=0);
@@ -47,6 +47,7 @@
 	void resetCurrentWin();
 	int currentWin() const;
 	FF7Window getWindow() const;
+	bool setWindow(const FF7Window &win);
 	int winCount() const;
 	void nextWin();
 	void prevWin();
@@ -59,9 +60,11 @@
 	void calcSize();
 	static QSize calcSize(const QByteArray &ff7Text);
 	static QSize calcSize(const QByteArray &ff7Text, QList<int> &pagesPos);
+	static QPoint realPos(const FF7Window &ff7Window);
 	QSize getCalculatedSize() const;
 	static QPixmap getIconImage(int iconId);
 	void drawWindow(QPainter *painter, WindowType type=Normal) const;
+	static void drawWindow(QPainter *painter, int maxW, int maxH, WindowType type=Normal);
 	static void drawWindow(QPainter *painter, int maxW, int maxH, QRgb colorTopLeft, QRgb colorTopRight, QRgb colorBottomLeft, QRgb colorBottomRight, WindowType type=Normal);
 private slots:
 	void animate();
@@ -71,7 +74,6 @@
 private:
 	static void fillNames();
 	bool drawTextArea(QPainter *painter);
-	static QPoint realPos(const FF7Window &ff7Window);
 	QList<FF7Window> ff7Windows;
 	QByteArray ff7Text;
 	int _currentPage;
@@ -102,7 +104,7 @@
 	static quint8 charWidth[7][256];
 	static const char *optimisedDuo[3];
 	static QList<QByteArray> names;
-	static int namesWidth[12];
+	static int namesWidth;
 protected:
 	void paintEvent(QPaintEvent *event);
 	void mousePressEvent(QMouseEvent *event);
diff -Nru makoureactor-1.7.2/widgets/TutWidget.cpp makoureactor-1.8.0/widgets/TutWidget.cpp
--- makoureactor-1.7.2/widgets/TutWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/TutWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -18,7 +18,9 @@
 #include "TutWidget.h"
 #include "TextHighlighter.h"
 #include "Data.h"
+#include "PsfDialog.h"
 #include "core/Config.h"
+#include "core/PsfFile.h"
 
 TutWidget::TutWidget(QWidget *parent) :
 	QDialog(parent, Qt::Tool), copied(false)
@@ -74,7 +76,7 @@
 
 void TutWidget::fill(Field *field, TutFilePC *tutPC, bool reload)
 {
-	if(!field || (!reload && this->tut == field->tutosAndSounds()))	return;
+	if (!field || (!reload && this->tut == field->tutosAndSounds()))	return;
 	clear();
 	tut = field->tutosAndSounds();
 	this->tutPC = tutPC;
@@ -82,7 +84,7 @@
 	usedTuts = field->scriptsAndTexts()->listUsedTuts();
 	currentTut = tut;
 
-	if(tutPC != NULL && tut->hasTut()) {
+	if (tutPC != nullptr && tut->hasTut()) {
 		versionPS->setVisible(true);
 		versionPC->setVisible(true);
 		versionPS->setChecked(true);
@@ -126,7 +128,7 @@
 	akaoIDList = new QComboBox(ret);
 	akaoIDList->setEditable(true);
 	int i=0;
-	foreach(const QString &musicName, Data::music_names) {
+	for (const QString &musicName : qAsConst(Data::music_names)) {
 		akaoIDList->addItem(tr("%1 - %2 : %3")
 							.arg(i, 2, 10, QChar('0'))
 							.arg(musicName)
@@ -178,7 +180,7 @@
 
 	stackedWidget->setCurrentIndex(0);
 
-	if(isPS) {
+	if (isPS) {
 		currentTut = tut;
 	} else {
 		currentTut = tutPC;
@@ -202,7 +204,7 @@
 	list->clear();
 	int size = currentTut->size();
 
-	for(int i=0 ; i<size ; ++i) {
+	for (int i=0; i<size; ++i) {
 		list->addItem(new QListWidgetItem(listItemText(i)));
 	}
 	list->blockSignals(false);
@@ -211,9 +213,9 @@
 QString TutWidget::listItemText(int id) const
 {
 	QString text;
-	if(currentTut->isBroken(id)) {
+	if (currentTut->isBroken(id)) {
 		text = tr("Broken %1");
-	} else if(currentTut->isTut(id)) {
+	} else if (currentTut->isTut(id)) {
 		text = tr("Tuto %1");
 	} else {
 		text = tr("Music %1");
@@ -223,10 +225,10 @@
 
 int TutWidget::currentRow(QListWidgetItem *item) const
 {
-	if(!item) {
+	if (!item) {
 		item = list->currentItem();
 	}
-	if(item) {
+	if (item) {
 		return list->row(item);
 	}
 	return -1;
@@ -236,7 +238,7 @@
 {
 	QList<int> ret;
 	QList<QListWidgetItem *> items = list->selectedItems();
-	foreach(QListWidgetItem *item, items) {
+	for (QListWidgetItem *item : qAsConst(items)) {
 		ret.append(list->row(item));
 	}
 
@@ -246,7 +248,7 @@
 void TutWidget::updateAkaoID(quint16 akaoID)
 {
 	int index = akaoIDList->findData(akaoID);
-	if(index != -1) {
+	if (index != -1) {
 		akaoIDList->setCurrentIndex(index);
 	} else {
 		akaoIDList->setEditText(QString::number(akaoID));
@@ -255,13 +257,13 @@
 
 void TutWidget::showText(QListWidgetItem *item, QListWidgetItem *lastItem)
 {
-	if(item == NULL) {
+	if (item == nullptr) {
 		exportButton->setEnabled(false);
 		importButton->setEnabled(false);
 		return;
 	}
 
-	if(lastItem != NULL) {
+	if (lastItem != nullptr) {
 		saveText(lastItem);
 	}
 
@@ -269,10 +271,10 @@
 	bool isTut = currentTut->isTut(id),
 	        isBroken = currentTut->isBroken(id);
 
-	if(isBroken) {
+	if (isBroken) {
 		stackedWidget->setCurrentIndex(2);
 		repairButton->setVisible(currentTut->canBeRepaired(id));
-	} else if(isTut) {
+	} else if (isTut) {
 		stackedWidget->setCurrentIndex(0);
 		textEdit->setPlainText(currentTut->parseScripts(id));
 	} else {
@@ -289,24 +291,24 @@
 
 void TutWidget::saveText(QListWidgetItem *item)
 {
-	if(item == NULL)	return;
+	if (item == nullptr)	return;
 
 	int id = currentRow(item);
-	if(currentTut->isBroken(id)) {
+	if (currentTut->isBroken(id)) {
 		// Do nothing
-	} else if(currentTut->isTut(id)) {
+	} else if (currentTut->isTut(id)) {
 		currentTut->parseText(id, textEdit->toPlainText());
-		if(currentTut->isModified()) {
+		if (currentTut->isModified()) {
 			emit modified();
 		}
 	} else {
 		QString userText = akaoIDList->lineEdit()->text();
 		QRegExp regExp("\\d+");
-		if(regExp.indexIn(userText) != -1) {
+		if (regExp.indexIn(userText) != -1) {
 			userText = regExp.capturedTexts().first();
 			quint16 akaoID = userText.toInt();
 
-			if(tut->akaoID(id) != akaoID) {
+			if (tut->akaoID(id) != akaoID) {
 				tut->setAkaoID(id, akaoID);
 				emit modified();
 			}
@@ -317,7 +319,7 @@
 void TutWidget::add()
 {
 	int row = currentRow();
-	if(row < 0) {
+	if (row < 0) {
 		row = currentTut->size();
 	} else {
 		row += 1;
@@ -325,7 +327,7 @@
 
 	QString akaoPath;
 	bool addTut = true;
-	if(currentTut == tut) {
+	if (currentTut == tut) {
 		QDialog chooseType(this, Qt::Dialog | Qt::WindowCloseButtonHint);
 		QRadioButton *tutType = new QRadioButton(tr("Tutorial"), &chooseType);
 		QRadioButton *akaoType = new QRadioButton(tr("Music"), &chooseType);
@@ -337,29 +339,29 @@
 		chooseLayout->addWidget(buttonBox, 1, 0, 1, 2);
 		connect(buttonBox, SIGNAL(accepted()), &chooseType, SLOT(accept()));
 		connect(buttonBox, SIGNAL(rejected()), &chooseType, SLOT(reject()));
-		if(chooseType.exec() != QDialog::Accepted) {
+		if (chooseType.exec() != QDialog::Accepted) {
 			return;
 		}
 
 		addTut = tutType->isChecked();
 
-		if(!addTut) {
+		if (!addTut) {
 			akaoPath = QDir::fromNativeSeparators(QDir::cleanPath(Config::value("akaoImportExportPath").toString()));
 			akaoPath = QFileDialog::getOpenFileName(this, tr("Import"), akaoPath + "/" + tr("sound_%1.akao").arg(row), tr("Final Fantasy Sound (*.akao)"));
-			if(akaoPath.isNull())	return;
+			if (akaoPath.isNull())	return;
 			Config::setValue("akaoImportExportPath", akaoPath.left(akaoPath.lastIndexOf('/')));
 		}
 	}
 
-	if(addTut && row < currentTut->size() && currentTut == tutPC) {
+	if (addTut && row < currentTut->size() && currentTut == tutPC) {
 		QMessageBox::StandardButton rep = QMessageBox::warning(this, tr("Tutorial used in scripts"), tr("Insert a tutorial here will shift the IDs of the tutorials that follows, this may be a problem.\nAre you sure you want to continue?"), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
-		if(rep == QMessageBox::Cancel) 	return;
+		if (rep == QMessageBox::Cancel) 	return;
 	}
 
-	if(addTut) {
+	if (addTut) {
 		currentTut->insertTut(row);
 		Section1File *scriptsAndTexts = field->scriptsAndTexts();
-		if(tutPC == NULL)
+		if (tutPC == nullptr)
 			scriptsAndTexts->shiftTutIds(row-1, +1);
 		usedTuts = scriptsAndTexts->listUsedTuts();
 	} else {
@@ -374,19 +376,19 @@
 void TutWidget::del()
 {
 	int row = currentRow();
-	if(row < 0) {
+	if (row < 0) {
 		return;
 	}
 
-	if((tutPC == NULL || currentTut == tutPC) && usedTuts.contains(row)) {
+	if ((tutPC == nullptr || currentTut == tutPC) && usedTuts.contains(row)) {
 		QMessageBox::StandardButton rep = QMessageBox::warning(this, tr("Tutorial used in scripts"), currentTut == tutPC ? tr("This tutorial may be used by one or more scripts on this field.\nDelete can cause errors.\nAre you sure you want to continue?") : tr("This tutorial is used by one or more scripts on this field.\nRemove will replace calls to this tutorial with calls to the tutorial that follows.\nAre you sure you want to continue?"), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
-		if(rep == QMessageBox::Cancel) 	return;
+		if (rep == QMessageBox::Cancel) 	return;
 	}
 
 	currentTut->removeTut(row);
 	emit modified();
 	Section1File *scriptsAndTexts = field->scriptsAndTexts();
-	if(tutPC == NULL)
+	if (tutPC == nullptr)
 		scriptsAndTexts->shiftTutIds(row, -1);
 	usedTuts = scriptsAndTexts->listUsedTuts();
 	fillList();
@@ -407,7 +409,7 @@
 void TutWidget::pasteOnCurrent()
 {
 	int row = currentRow();
-	if(row < 0) {
+	if (row < 0) {
 		row = list->count();
 	} else {
 		row += 1;
@@ -417,7 +419,7 @@
 
 void TutWidget::cut(const QList<int> &rows)
 {
-	if(rows.isEmpty()) {
+	if (rows.isEmpty()) {
 		return;
 	}
 
@@ -426,12 +428,12 @@
 	Section1File *scriptsAndTexts = field->scriptsAndTexts();
 
 	QList<int> sortedRows = rows;
-	qSort(sortedRows);
+	std::sort(sortedRows.begin(), sortedRows.end());
 
-	for(int i=sortedRows.size()-1 ; i>=0 ; --i) {
+	for (int i=sortedRows.size()-1; i>=0; --i) {
 		int row = sortedRows.at(i);
 		currentTut->removeTut(row);
-		if(tutPC == NULL)
+		if (tutPC == nullptr)
 			scriptsAndTexts->shiftTutIds(row, -1);
 	}
 
@@ -444,12 +446,12 @@
 
 void TutWidget::copy(const QList<int> &rows)
 {
-	if(rows.isEmpty()) {
+	if (rows.isEmpty()) {
 		return;
 	}
 
 	_copiedData.clear();
-	foreach(int row, rows) {
+	for (int row : rows) {
 		_copiedData.append(currentTut->data(row));
 	}
 	copied = true;
@@ -457,11 +459,11 @@
 
 void TutWidget::paste(int row)
 {
-	if(!copied) {
+	if (!copied) {
 		return;
 	}
 
-	for(int i=_copiedData.size()-1 ; i>=0 ; --i) {
+	for (int i=_copiedData.size()-1; i>=0; --i) {
 		currentTut->insertData(row, _copiedData.at(i));
 	}
 
@@ -477,44 +479,54 @@
 void TutWidget::exportation()
 {
 	int row = currentRow();
-	if(row < 0) {
+	if (row < 0) {
 		return;
 	}
 
 	bool isTut = currentTut->isTut(row);
 	QString path = QDir::fromNativeSeparators(QDir::cleanPath(Config::value("akaoImportExportPath").toString()));
-	QString filename, filter;
+	QString filename, filter, selectedFilter;
+	QString akaoF = tr("Final Fantasy Sound (*.akao)"),
+	        psfF = tr("PSF MIDI file (*.minipsf)");
 
-	if(isTut) {
+	if (isTut) {
 		filename = tr("tuto_%1.tutps").arg(row);
 		filter = tr("Tuto Final Fantasy VII PS (*.tutps)");
 	} else {
-		filename = tr("sound_%1.akao").arg(row);
-		filter = tr("Final Fantasy Sound (*.akao)");
+		filename = tr("%1.akao").arg(Data::music_names.value(tut->akaoID(row)));
+		filter = (QStringList() << akaoF << psfF).join(";;");
 	}
 
-	path = QFileDialog::getSaveFileName(this, tr("Export"), path + "/" + filename, filter);
+	path = QFileDialog::getSaveFileName(this, tr("Export"), path + "/" + filename,
+	                                    filter, &selectedFilter);
 
-	if(path.isNull()) {
+	if (path.isNull()) {
 		return;
 	}
 
 	Config::setValue("akaoImportExportPath", path.left(path.lastIndexOf('/')));
 
 	QFile akao(path);
-	if(!akao.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+	if (!akao.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
 		QMessageBox::warning(this, tr("Error"), tr("Opening error file"));
 		return;
 	}
 
-	akao.write(currentTut->data(row));
+	if (selectedFilter == psfF) {
+		PsfDialog dialog(Data::music_desc.value(tut->akaoID(row)));
+		if (dialog.exec() == QDialog::Accepted) {
+			akao.write(PsfFile::fromAkao(currentTut->data(row), dialog.tags()).save());
+		}
+	} else {
+		akao.write(currentTut->data(row));
+	}
 	akao.close();
 }
 
 void TutWidget::importation()
 {
 	int row = currentRow();
-	if(row < 0) {
+	if (row < 0) {
 		return;
 	}
 
@@ -523,7 +535,7 @@
 	QString path = QDir::fromNativeSeparators(QDir::cleanPath(Config::value("akaoImportExportPath").toString()));
 	QString filename, filter;
 
-	if(isTut) {
+	if (isTut) {
 		filename = tr("tuto_%1.tutps").arg(row);
 		filter = tr("Tuto Final Fantasy VII PS (*.tutps)");
 	} else {
@@ -533,19 +545,19 @@
 
 	path = QFileDialog::getOpenFileName(this, tr("Import"), path + "/" + filename, filter);
 
-	if(path.isNull()) {
+	if (path.isNull()) {
 		return;
 	}
 
 	Config::setValue("akaoImportExportPath", path.left(path.lastIndexOf('/')));
 
 	QFile akao(path);
-	if(!akao.open(QIODevice::ReadOnly)) {
+	if (!akao.open(QIODevice::ReadOnly)) {
 		QMessageBox::warning(this, tr("Error"), tr("Opening Error File"));
 		return;
 	}
 
-	if(akao.size() > 1000000) { // FIXME: remove fixed limitation
+	if (akao.size() > 1000000) { // FIXME: remove fixed limitation
 		QMessageBox::warning(this, tr("Error"), tr("File too large"));
 		return;
 	}
@@ -569,11 +581,11 @@
 void TutWidget::repairBroken()
 {
 	int row = currentRow();
-	if(row < 0 || !currentTut->canBeRepaired(row)) {
+	if (row < 0 || !currentTut->canBeRepaired(row)) {
 		return;
 	}
 
-	if(currentTut->repair(row)) {
+	if (currentTut->repair(row)) {
 		list->currentItem()->setText(listItemText(row));
 		showText(list->currentItem(), list->currentItem());
 		emit modified();
@@ -583,7 +595,7 @@
 void TutWidget::replaceByEmptyAkao()
 {
 	int row = currentRow();
-	if(row < 0) {
+	if (row < 0) {
 		return;
 	}
 
@@ -596,7 +608,7 @@
 void TutWidget::replaceByEmptyTuto()
 {
 	int row = currentRow();
-	if(row < 0) {
+	if (row < 0) {
 		return;
 	}
 
diff -Nru makoureactor-1.7.2/widgets/VarManager.cpp makoureactor-1.8.0/widgets/VarManager.cpp
--- makoureactor-1.7.2/widgets/VarManager.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/VarManager.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -17,13 +17,12 @@
  ****************************************************************************/
 #include "VarManager.h"
 #include "core/field/FieldArchive.h"
+#include "../Data.h"
 
 VarManager::VarManager(FieldArchive *fieldArchive, QWidget *parent)
 	: QWidget(parent, Qt::Tool)
 {
 	setWindowTitle(tr("Variable manager"));
-	QFont font;
-	font.setPointSize(8);
 
 	QHBoxLayout *layout1 = new QHBoxLayout();
 
@@ -43,8 +42,9 @@
 	QHBoxLayout *layout2 = new QHBoxLayout();
 
 	liste1 = new QListWidget(this);
-	liste1->setFixedWidth(fontMetrics().width(QString(" WW-WW ")) + contentsMargins().left() + contentsMargins().right());
-	liste1->setFont(font);
+	liste1->setFixedWidth(
+	    liste1->fontMetrics().boundingRect(QString(" WW-WW ")).width()
+	    + contentsMargins().left() + contentsMargins().right());
 
 	liste2 = new QTreeWidget(this);
 	liste2->setColumnCount(4);
@@ -52,7 +52,6 @@
 	liste2->setIndentation(0);
 	liste2->setItemsExpandable(false);
 	liste2->setSortingEnabled(true);
-	liste2->setFont(font);
 
 	layout2->addWidget(liste1);
 	layout2->addWidget(liste2);
@@ -117,7 +116,7 @@
 
 QPair<quint8, quint8> VarManager::banksFromRow(int row)
 {
-	switch(row) {
+	switch (row) {
 	case 0:
 		return qMakePair(quint8(1), quint8(2));
 	case 1:
@@ -137,7 +136,7 @@
 
 int VarManager::rowFromBank(quint8 bank)
 {
-	switch(bank) {
+	switch (bank) {
 	case 1:
 	case 2:
 		return 0;
@@ -163,7 +162,7 @@
 
 void VarManager::fillList1()
 {
-	for(quint8 row=0 ; row<6 ; ++row) {
+	for (quint8 row=0; row<6; ++row) {
 		QPair<quint8, quint8> pair = banksFromRow(row);
 		liste1->addItem(QString("%1-%2")
 						.arg(pair.first, 2, 10, QChar('0'))
@@ -173,7 +172,7 @@
 
 void VarManager::fillList2()
 {
-	for(quint16 adressID=0 ; adressID<256 ; ++adressID) {
+	for (quint16 adressID=0; adressID<256; ++adressID) {
 		new QTreeWidgetItem(liste2, QStringList() << QString("%1").arg(adressID, 3));
 	}
 
@@ -191,7 +190,7 @@
 	liste2->blockSignals(true);
 
 	QTreeWidgetItemIterator it(liste2);
-	while(*it) {
+	while (*it) {
 		QTreeWidgetItem *item = *it;
 		quint16 addressID = itemAddress(item);
 		QString varName1 = local_var_names.value(addressID | (b << 8)),
@@ -230,7 +229,7 @@
 void VarManager::scrollToList2(int adressID)
 {
 	QTreeWidgetItem *item = findList2Item(adressID);
-	if(item) {
+	if (item) {
 		liste2->setCurrentItem(item);
 		liste2->scrollToItem(item);
 	}
@@ -239,13 +238,13 @@
 QTreeWidgetItem *VarManager::findList2Item(int adressID)
 {
 	QList<QTreeWidgetItem *> items = liste2->findItems(QString("%1").arg(adressID, 3), Qt::MatchExactly);
-	if(items.isEmpty())	return NULL;
+	if (items.isEmpty())	return nullptr;
 	return items.first();
 }
 
 void VarManager::fillForm()
 {
-	if(liste2->selectedItems().isEmpty())	return;
+	if (liste2->selectedItems().isEmpty())	return;
 	QTreeWidgetItem *item = liste2->selectedItems().first();
 	address->setValue(itemAddress(item));
 	name->setText(item->text(1));
@@ -253,7 +252,7 @@
 
 void VarManager::renameVar()
 {
-	if(liste2->selectedItems().isEmpty())	return;
+	if (liste2->selectedItems().isEmpty())	return;
 	local_var_names.insert(address->value() | (bank->value() << 8), name->text());
 	liste2->selectedItems().first()->setText(1, name->text());
 	ok->setEnabled(true);
@@ -261,7 +260,7 @@
 
 void VarManager::save()
 {
-	if(!Var::save(local_var_names)) {
+	if (!Var::save(local_var_names)) {
 		QMessageBox::warning(this, tr("Error"), tr("Save Failed"));
 	} else {
 		ok->setEnabled(false);
@@ -275,12 +274,22 @@
 	mess.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint | Qt::MSWindowsFixedSizeDialogHint);
 	mess.setStandardButtons(QMessageBox::NoButton);
 	mess.show();
+	QTimer t(this);
+	connect(&t, SIGNAL(timeout()), SLOT(processEvents()));
+	t.start(700);
 	allVars = fieldArchive->searchAllVars(_fieldNames);
 	int b = bank->value();
 
-	for(int address=0 ; address<256 ; ++address) {
+	for (int address=0; address<256; ++address) {
 		colorizeItem(liste2->topLevelItem(address), FF7Var(b, address));
 	}
+
+	t.stop();
+}
+
+void VarManager::processEvents() const
+{
+	QCoreApplication::processEvents();
 }
 
 void VarManager::findVar(const FF7Var &var, bool &foundR, bool &foundW, QSet<FF7Var::VarSize> &varSize)
@@ -314,32 +323,29 @@
 	QString rwText;
 	QStringList sizeText;
 
-	if(foundR || foundW) {
-		item->setBackground(0, QColor(0xff,0xe5,0x99));
-		item->setBackground(1, QColor(0xff,0xe5,0x99));
-		item->setBackground(2, QColor(0xff,0xe5,0x99));
-		item->setBackground(3, QColor(0xff,0xe5,0x99));
-		item->setForeground(0, QColor(Qt::black));
-		item->setForeground(1, QColor(Qt::black));
-		item->setForeground(2, QColor(Qt::black));
-		item->setForeground(3, QColor(Qt::black));
-		if(foundR && foundW) {
+	if (foundR || foundW) {
+		QColor color = Data::color(Data::ColorEvidence);
+		item->setBackground(0, color);
+		item->setBackground(1, color);
+		item->setBackground(2, color);
+		item->setBackground(3, color);
+		if (foundR && foundW) {
 			rwText = tr("rw");
-		} else if(foundR) {
+		} else if (foundR) {
 			rwText = tr("r");
 		} else {
 			rwText = tr("w");
 		}
-		if(varSize.contains(FF7Var::Bit)) {
+		if (varSize.contains(FF7Var::Bit)) {
 			sizeText.append(tr("bitfield"));
 		}
-		if(varSize.contains(FF7Var::Byte)) {
+		if (varSize.contains(FF7Var::Byte)) {
 			sizeText.append(tr("1 Byte"));
 		}
-		if(varSize.contains(FF7Var::Word)) {
+		if (varSize.contains(FF7Var::Word)) {
 			sizeText.append(tr("2 Bytes"));
 		}
-		if(varSize.contains(FF7Var::SignedWord)) {
+		if (varSize.contains(FF7Var::SignedWord)) {
 			sizeText.append(tr("2 Signed Bytes"));
 		}
 	} else {
diff -Nru makoureactor-1.7.2/widgets/VarManager.h makoureactor-1.8.0/widgets/VarManager.h
--- makoureactor-1.7.2/widgets/VarManager.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/VarManager.h	2020-08-08 18:46:56.000000000 +0000
@@ -37,6 +37,7 @@
 	void renameVar();
 	void save();
 	void search();
+	void processEvents() const;
 
 private:
 	QTreeWidgetItem *findList2Item(int);
diff -Nru makoureactor-1.7.2/widgets/VarOrValueWidget.cpp makoureactor-1.8.0/widgets/VarOrValueWidget.cpp
--- makoureactor-1.7.2/widgets/VarOrValueWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/VarOrValueWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -115,14 +115,14 @@
 
 void VarOrValueWidget::updateValueRange()
 {
-	if(isSignedValueType()) {
-		if(isLongValueType()) {
+	if (isSignedValueType()) {
+		if (isLongValueType()) {
 			_value->setRange(-32768, 32767);
 		} else {
 			_value->setRange(-128, 127);
 		}
 	} else {
-		if(isLongValueType()) {
+		if (isLongValueType()) {
 			_value->setRange(0, 65535);
 		} else {
 			_value->setRange(0, 255);
diff -Nru makoureactor-1.7.2/widgets/VertexWidget.cpp makoureactor-1.8.0/widgets/VertexWidget.cpp
--- makoureactor-1.7.2/widgets/VertexWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/VertexWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -73,7 +73,7 @@
 
 void VertexWidget::emitValuesChanged()
 {
-	if(!dontEmit) {
+	if (!dontEmit) {
 		emit valuesChanged(values());
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/WalkmeshManager.cpp makoureactor-1.8.0/widgets/WalkmeshManager.cpp
--- makoureactor-1.7.2/widgets/WalkmeshManager.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/WalkmeshManager.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -19,13 +19,13 @@
 #include "core/Config.h"
 #include "Data.h"
 
-WalkmeshManager::WalkmeshManager(QWidget *parent, const QGLWidget *shareWidget) :
+WalkmeshManager::WalkmeshManager(QWidget *parent) :
 	QDialog(parent, Qt::Tool),
-	idFile(0), caFile(0), infFile(0), scriptsAndTexts(0)
+    idFile(nullptr), caFile(nullptr), infFile(nullptr), scriptsAndTexts(nullptr)
 {
 	setWindowTitle(tr("Walkmesh"));
 
-	walkmesh = Config::value("OpenGL", true).toBool() ? new WalkmeshWidget(0, shareWidget) : 0;
+	walkmesh = Config::value("OpenGL", true).toBool() ? new WalkmeshWidget() : nullptr;
 	QWidget *walkmeshWidget = walkmesh ? walkmesh : new QWidget(this);
 
 	slider1 = new QSlider(this);
@@ -44,7 +44,7 @@
 	keyInfos->setTextFormat(Qt::PlainText);
 	keyInfos->setWordWrap(true);
 
-	QPushButton *resetCamera = new QPushButton(tr("Reset"));
+	QPushButton *resetCamera = new QPushButton(tr("Reset Camera"));
 
 	showModels = new QCheckBox(tr("Show 3D models"));
 	showModels->setChecked(Config::value("fieldModelsVisible", true).toBool());
@@ -68,7 +68,7 @@
 	layout->addWidget(showModels, 3, 1, 1, 3);
 	layout->addWidget(tabWidget, 4, 0, 1, 4);
 
-	if(walkmesh) {
+	if (walkmesh) {
 		connect(slider1, SIGNAL(valueChanged(int)), walkmesh, SLOT(setXRotation(int)));
 		connect(slider2, SIGNAL(valueChanged(int)), walkmesh, SLOT(setYRotation(int)));
 		connect(slider3, SIGNAL(valueChanged(int)), walkmesh, SLOT(setZRotation(int)));
@@ -330,17 +330,14 @@
 	arrowList = new QListWidget(ret);
 	arrowList->setFixedWidth(125);
 
-	arrowX = new QDoubleSpinBox(ret);
-	arrowX->setDecimals(0);
-	arrowX->setRange(-pow(2, 31), pow(2, 31)-1);
-
-	arrowY = new QDoubleSpinBox(ret);
-	arrowY->setDecimals(0);
-	arrowY->setRange(-pow(2, 31), pow(2, 31)-1);
-
-	arrowZ = new QDoubleSpinBox(ret);
-	arrowZ->setDecimals(0);
-	arrowZ->setRange(-pow(2, 31), pow(2, 31)-1);
+	arrowX = new QSpinBox(ret);
+	arrowX->setRange(-32767, 32767);
+
+	arrowY = new QSpinBox(ret);
+	arrowY->setRange(-32767, 32767);
+
+	arrowZ = new QSpinBox(ret);
+	arrowZ->setRange(-32767, 32767);
 
 	arrowType = new QComboBox(ret);
 	arrowType->addItem(tr("Invisible"), 0);
@@ -366,9 +363,9 @@
 	layout->setColumnStretch(2, 1);
 
 	connect(arrowList, SIGNAL(currentRowChanged(int)), SLOT(setCurrentArrow(int)));
-	connect(arrowX, SIGNAL(valueChanged(double)), SLOT(editArrowX(double)));
-	connect(arrowY, SIGNAL(valueChanged(double)), SLOT(editArrowY(double)));
-	connect(arrowZ, SIGNAL(valueChanged(double)), SLOT(editArrowZ(double)));
+	connect(arrowX, SIGNAL(valueChanged(int)), SLOT(editArrowX(int)));
+	connect(arrowY, SIGNAL(valueChanged(int)), SLOT(editArrowY(int)));
+	connect(arrowZ, SIGNAL(valueChanged(int)), SLOT(editArrowZ(int)));
 	connect(arrowType, SIGNAL(currentIndexChanged(int)), SLOT(editArrowType(int)));
 
 	return ret;
@@ -382,7 +379,7 @@
 	QGroupBox *group2 = new QGroupBox(tr("Layer sizes (for layer animations)"), ret);
 	QGroupBox *group3 = new QGroupBox(tr("Layer flags"), ret);
 
-	for(int i=0 ; i<4 ; ++i) {
+	for (int i=0; i<4; ++i) {
 		rangeEdit[i] = new QSpinBox(group1);
 		rangeEdit[i]->setRange(-32768, 32767);
 		bgSizeEdit[i] = new QSpinBox(group2);
@@ -391,9 +388,9 @@
 		bgFlagEdit[i]->setRange(0, 255);
 	}
 	QGridLayout *layout1 = new QGridLayout(group1);
-	layout1->addWidget(new QLabel(tr("Up")), 0, 0);
+	layout1->addWidget(new QLabel(tr("Top")), 0, 0);
 	layout1->addWidget(rangeEdit[0], 0, 1);
-	layout1->addWidget(new QLabel(tr("Down")), 0, 2);
+	layout1->addWidget(new QLabel(tr("Bottom")), 0, 2);
 	layout1->addWidget(rangeEdit[1], 0, 3);
 	layout1->addWidget(new QLabel(tr("Right")), 1, 0);
 	layout1->addWidget(rangeEdit[2], 1, 1);
@@ -436,7 +433,7 @@
 	layout->addWidget(group3);
 	//layout->addStretch();
 
-	for(int i=0 ; i<4 ; ++i) {
+	for (int i=0; i<4; ++i) {
 		connect(rangeEdit[i], SIGNAL(valueChanged(int)), SLOT(editRange(int)));
 		connect(bgSizeEdit[i], SIGNAL(valueChanged(int)), SLOT(editRange(int)));
 		connect(bgFlagEdit[i], SIGNAL(valueChanged(int)), SLOT(editRange(int)));
@@ -470,7 +467,7 @@
 	layout->addWidget(cameraFocusHeight, 1, 1, 1, 2);
 	layout->addWidget(new QLabel(tr("Unknown:")), 2, 0);
 	layout->addWidget(unknown, 2, 1, 1, 2);
-	layout->addWidget(new QLabel(tr("Field scale:")), 3, 0);
+	layout->addWidget(new QLabel(tr("Field map scale:")), 3, 0);
 	layout->addWidget(mapScale, 3, 1, 1, 2);
 	layout->setRowStretch(4, 1);
 
@@ -490,7 +487,7 @@
 
 void WalkmeshManager::fill(Field *field, bool reload)
 {
-	if(!field || (!reload && field->inf() == infFile))	return;
+	if (!field || (!reload && field->inf() == infFile))	return;
 
 	infFile = field->inf();
 	idFile = field->walkmesh();
@@ -499,23 +496,23 @@
 
 	walkmesh->setModelsVisible(showModels->isChecked());
 
-	if(!idFile->isOpen() || !caFile->isOpen() || !infFile->isOpen()) {
+	if (!idFile->isOpen() || !caFile->isOpen() || !infFile->isOpen()) {
 		QMessageBox::warning(this, tr("Opening error"), tr("Error opening walkmesh"));
 	}
 
 	int camCount = 0;
 
-	if(walkmesh) {
+	if (walkmesh) {
 		walkmesh->fill(field);
 	}
 
-	if(caFile->isOpen()) {
+	if (caFile->isOpen()) {
 		camCount = caFile->cameraCount();
 
-		if(camList->count() != camCount) {
+		if (camList->count() != camCount) {
 			camList->blockSignals(true);
 			camList->clear();
-			for(int i=0 ; i<camCount ; ++i) {
+			for (int i=0; i<camCount; ++i) {
 				camList->addItem(tr("Camera %1").arg(i));
 			}
 			camList->blockSignals(false);
@@ -525,13 +522,13 @@
 	}
 	tabWidget->widget(0)->setEnabled(caFile->isOpen() && camCount > 0);
 
-	if(idFile->isOpen()) {
+	if (idFile->isOpen()) {
 		int triangleCount = idFile->triangleCount();
 
-		if(idList->count() != triangleCount) {
+		if (idList->count() != triangleCount) {
 			idList->blockSignals(true);
 			idList->clear();
-			for(int i=0 ; i<triangleCount ; ++i) {
+			for (int i=0; i<triangleCount; ++i) {
 				idList->addItem(tr("Triangle %1").arg(i));
 			}
 			idList->blockSignals(false);
@@ -541,11 +538,11 @@
 	}
 	tabWidget->widget(1)->setEnabled(idFile->isOpen());
 
-	if(infFile->isOpen()) {
+	if (infFile->isOpen()) {
 		gateList->clear();
-		foreach(const Exit &gateway, infFile->exitLines()) {
-			if(gateway.fieldID != 0x7FFF) {
-				gateList->addItem(QString("%1 (%2)").arg(Data::field_names.value(gateway.fieldID)).arg(gateway.fieldID));
+		for (const Exit &gateway : infFile->exitLines()) {
+			if (gateway.fieldID != 0x7FFF) {
+				gateList->addItem(QString("%1 (%2)").arg(Data::mapName(gateway.fieldID)).arg(gateway.fieldID));
 			} else {
 				QListWidgetItem *item = new QListWidgetItem(tr("Unused"));
 				item->setForeground(Qt::darkGray);
@@ -557,8 +554,8 @@
 
 		doorList->clear();
 		int doorID = 0;
-		foreach(const Trigger &trigger, infFile->triggers()) {
-			if(trigger.background_parameter != 0xFF) {
+		for (const Trigger &trigger : infFile->triggers()) {
+			if (trigger.background_parameter != 0xFF) {
 				doorList->addItem(tr("Door %1").arg(doorID));
 			} else {
 				QListWidgetItem *item = new QListWidgetItem(tr("Unused"));
@@ -570,11 +567,11 @@
 		doorList->setCurrentRow(0);
 		setCurrentDoor(0);
 
-		if(!infFile->isJap()) {
+		if (!infFile->isJap()) {
 			arrowList->clear();
 			int arrowID = 0;
-			foreach(const Arrow &arrow, infFile->arrows()) {
-				if(arrow.type != 0) {
+			for (const Arrow &arrow : infFile->arrows()) {
+				if (arrow.type != 0) {
 					arrowList->addItem(tr("Arrow %1").arg(arrowID));
 				} else {
 					QListWidgetItem *item = new QListWidgetItem(tr("Unused"));
@@ -616,7 +613,7 @@
 	cameraFocusHeight->setEnabled(infFile->isOpen());
 	unknown->setEnabled(infFile->isOpen());
 
-	if(scriptsAndTexts->isOpen()) {
+	if (scriptsAndTexts->isOpen()) {
 		mapScale->setValue(scriptsAndTexts->scale());
 	}
 	mapScale->setEnabled(scriptsAndTexts->isOpen());
@@ -630,19 +627,19 @@
 
 void WalkmeshManager::clear()
 {
-	infFile = 0;
-	idFile = 0;
-	caFile = 0;
-	scriptsAndTexts = 0;
+	infFile = nullptr;
+	idFile = nullptr;
+	caFile = nullptr;
+	scriptsAndTexts = nullptr;
 
-	if(walkmesh) {
+	if (walkmesh) {
 		walkmesh->clear();
 	}
 }
 
 int WalkmeshManager::currentCamera() const
 {
-	if(!caFile->isOpen())	return 0;
+	if (!caFile->isOpen())	return 0;
 
 	int camID = camList->currentRow();
 	return camID < 0 || camID >= caFile->cameraCount() ? 0 : camID;
@@ -650,13 +647,13 @@
 
 void WalkmeshManager::setCurrentCamera(int camID)
 {
-	if(!caFile->isOpen() || camID < 0) {
+	if (!caFile->isOpen() || camID < 0) {
 		return;
 	}
 
 	bool hasCamera = camID < caFile->cameraCount();
 
-	if(hasCamera) {
+	if (hasCamera) {
 		const Camera &cam = caFile->camera(camID);
 
 		caVectorXEdit->blockSignals(true);
@@ -677,7 +674,7 @@
 
 		caZoomEdit->setValue(cam.camera_zoom);
 
-		if(walkmesh)	walkmesh->setCurrentFieldCamera(camID);
+		if (walkmesh)	walkmesh->setCurrentFieldCamera(camID);
 		caVectorXEdit->blockSignals(false);
 		caVectorYEdit->blockSignals(false);
 		caVectorZEdit->blockSignals(false);
@@ -697,7 +694,7 @@
 
 	caZoomEdit->setEnabled(hasCamera);
 
-	if(camList->currentRow() != camID) {
+	if (camList->currentRow() != camID) {
 		camList->blockSignals(true);
 		camList->setCurrentRow(camID);
 		camList->blockSignals(false);
@@ -708,16 +705,16 @@
 {
 	int row = camList->currentRow();
 
-	if(caFile->isOpen()) {
+	if (caFile->isOpen()) {
 		Camera ca;
-		if(row < caFile->cameraCount()) {
+		if (row < caFile->cameraCount()) {
 			ca = caFile->camera(row);
 		} else {
 			ca = Camera();
 		}
 		caFile->insertCamera(row+1, ca);
 		camList->insertItem(row+1, tr("Camera %1").arg(row+1));
-		for(int i=row+2 ; i<camList->count() ; ++i) {
+		for (int i=row+2; i<camList->count(); ++i) {
 			camList->item(i)->setText(tr("Camera %1").arg(i));
 		}
 		camList->setCurrentRow(row+1);
@@ -728,16 +725,16 @@
 
 void WalkmeshManager::removeCamera()
 {
-	if(caFile->cameraCount() < 2) return;
+	if (caFile->cameraCount() < 2) return;
 
 	int row = camList->currentRow();
 
-	if(row < 0)		return;
+	if (row < 0)		return;
 
-	if(caFile->isOpen() && row < caFile->cameraCount()) {
-		if(caFile->removeCamera(row)) {
+	if (caFile->isOpen() && row < caFile->cameraCount()) {
+		if (caFile->removeCamera(row)) {
 			delete camList->item(row);
-			for(int i=row ; i<camList->count() ; ++i) {
+			for (int i=row; i<camList->count(); ++i) {
 				camList->item(i)->setText(tr("Camera %1").arg(i));
 			}
 			setCurrentCamera(row);
@@ -751,22 +748,22 @@
 {
 	QObject *s = sender();
 
-	if(s == caVectorXEdit)			editCaVector(0, values);
-	else if(s == caVectorYEdit)		editCaVector(1, values);
-	else if(s == caVectorZEdit)		editCaVector(2, values);
+	if (s == caVectorXEdit)			editCaVector(0, values);
+	else if (s == caVectorYEdit)		editCaVector(1, values);
+	else if (s == caVectorZEdit)		editCaVector(2, values);
 }
 
 void WalkmeshManager::editCaVector(int id, const Vertex_s &values)
 {
-	if(caFile->isOpen() && caFile->hasCamera()) {
+	if (caFile->isOpen() && caFile->hasCamera()) {
 		const int camID = currentCamera();
 		Camera cam = caFile->camera(camID);
 		Vertex_s oldV = cam.camera_axis[id];
 
-		if(oldV.x != values.x || oldV.y != values.y || oldV.z != values.z) {
+		if (oldV.x != values.x || oldV.y != values.y || oldV.z != values.z) {
 			cam.camera_axis[id] = values;
 			caFile->setCamera(camID, cam);
-			if(walkmesh)	walkmesh->updateGL();
+			if (walkmesh)	walkmesh->update();
 
 			emit modified();
 		}
@@ -777,20 +774,20 @@
 {
 	QObject *s = sender();
 
-	if(s == caSpaceXEdit)			editCaPos(0, value);
-	else if(s == caSpaceYEdit)		editCaPos(1, value);
-	else if(s == caSpaceZEdit)		editCaPos(2, value);
+	if (s == caSpaceXEdit)			editCaPos(0, value);
+	else if (s == caSpaceYEdit)		editCaPos(1, value);
+	else if (s == caSpaceZEdit)		editCaPos(2, value);
 }
 
 void WalkmeshManager::editCaPos(int id, double value)
 {
-	if(caFile->isOpen() && caFile->hasCamera()) {
+	if (caFile->isOpen() && caFile->hasCamera()) {
 		const int camID = currentCamera();
 		Camera cam = caFile->camera(camID);
-		if(cam.camera_position[id] != (qint32)value) {
-			cam.camera_position[id] = value;
+		if (cam.camera_position[id] != qint32(value)) {
+			cam.camera_position[id] = qint32(value);
 			caFile->setCamera(camID, cam);
-			walkmesh->updateGL();
+			walkmesh->update();
 
 			emit modified();
 		}
@@ -799,13 +796,13 @@
 
 void WalkmeshManager::editCaZoom(int value)
 {
-	if(caFile->isOpen() && caFile->hasCamera()) {
+	if (caFile->isOpen() && caFile->hasCamera()) {
 		const int camID = currentCamera();
 		Camera cam = caFile->camera(camID);
-		if(cam.camera_zoom != value) {
-			cam.camera_zoom = value;
+		if (cam.camera_zoom != value) {
+			cam.camera_zoom = quint16(value);
 			caFile->setCamera(camID, cam);
-			if(walkmesh)	walkmesh->updatePerspective();
+			if (walkmesh)	walkmesh->updatePerspective();
 
 			emit modified();
 		}
@@ -814,9 +811,9 @@
 
 void WalkmeshManager::setCurrentId(int i)
 {
-	if(!idFile->isOpen() || i < 0)	return;
+	if (!idFile->isOpen() || i < 0)	return;
 
-	if(idFile->triangleCount() <= i)	return;
+	if (idFile->triangleCount() <= i)	return;
 
 	const Triangle &triangle = idFile->triangle(i);
 	const Access &access = idFile->access(i);
@@ -829,17 +826,17 @@
 	idAccess[1]->setValue(access.a[1]);
 	idAccess[2]->setValue(access.a[2]);
 
-	if(walkmesh)	walkmesh->setSelectedTriangle(i);
+	if (walkmesh)	walkmesh->setSelectedTriangle(i);
 }
 
 void WalkmeshManager::addTriangle()
 {
 	int row = idList->currentRow();
 
-	if(idFile->isOpen()) {
+	if (idFile->isOpen()) {
 		Triangle tri;
 		Access acc;
-		if(row < idFile->triangleCount()) {
+		if (row < idFile->triangleCount()) {
 			tri = idFile->triangle(row);
 			acc = idFile->access(row);
 		} else {
@@ -848,7 +845,7 @@
 		}
 		idFile->insertTriangle(row+1, tri, acc);
 		idList->insertItem(row+1, tr("Triangle %1").arg(row+1));
-		for(int i=row+2 ; i<idList->count() ; ++i) {
+		for (int i=row+2; i<idList->count(); ++i) {
 			idList->item(i)->setText(tr("Triangle %1").arg(i));
 		}
 		idList->setCurrentRow(row+1);
@@ -861,12 +858,12 @@
 {
 	int row = idList->currentRow();
 
-	if(row < 0)		return;
+	if (row < 0)		return;
 
-	if(idFile->isOpen() && row < idFile->triangleCount()) {
+	if (idFile->isOpen() && row < idFile->triangleCount()) {
 		idFile->removeTriangle(row);
 		delete idList->item(row);
-		for(int i=row ; i<idList->count() ; ++i) {
+		for (int i=row; i<idList->count(); ++i) {
 			idList->item(i)->setText(tr("Triangle %1").arg(i));
 		}
 		setCurrentId(row);
@@ -879,22 +876,22 @@
 {
 	QObject *s = sender();
 
-	if(s == idVertices[0])			editIdTriangle(0, values);
-	else if(s == idVertices[1])		editIdTriangle(1, values);
-	else if(s == idVertices[2])		editIdTriangle(2, values);
+	if (s == idVertices[0])			editIdTriangle(0, values);
+	else if (s == idVertices[1])		editIdTriangle(1, values);
+	else if (s == idVertices[2])		editIdTriangle(2, values);
 }
 
 void WalkmeshManager::editIdTriangle(int id, const Vertex_s &values)
 {
-	if(idFile->isOpen()) {
+	if (idFile->isOpen()) {
 		const int triangleID = idList->currentRow();
-		if(triangleID > -1 && triangleID < idFile->triangleCount()) {
+		if (triangleID > -1 && triangleID < idFile->triangleCount()) {
 			Triangle old = idFile->triangle(triangleID);
 			Vertex_sr &oldV = old.vertices[id];
-			if(oldV.x != values.x || oldV.y != values.y || oldV.z != values.z) {
+			if (oldV.x != values.x || oldV.y != values.y || oldV.z != values.z) {
 				oldV = IdFile::fromVertex_s(values);
 				idFile->setTriangle(triangleID, old);
-				if(walkmesh)	walkmesh->updateGL();
+				if (walkmesh)	walkmesh->update();
 
 				emit modified();
 			}
@@ -906,22 +903,22 @@
 {
 	QObject *s = sender();
 
-	if(s == idAccess[0])			editIdAccess(0, value);
-	else if(s == idAccess[1])		editIdAccess(1, value);
-	else if(s == idAccess[2])		editIdAccess(2, value);
+	if (s == idAccess[0])			editIdAccess(0, value);
+	else if (s == idAccess[1])		editIdAccess(1, value);
+	else if (s == idAccess[2])		editIdAccess(2, value);
 }
 
 void WalkmeshManager::editIdAccess(int id, int value)
 {
-	if(idFile->isOpen()) {
+	if (idFile->isOpen()) {
 		const int triangleID = idList->currentRow();
-		if(triangleID > -1 && triangleID < idFile->triangleCount()) {
+		if (triangleID > -1 && triangleID < idFile->triangleCount()) {
 			Access old = idFile->access(triangleID);
 			qint16 oldV = old.a[id];
-			if(oldV != value) {
-				old.a[id] = value;
+			if (oldV != value) {
+				old.a[id] = qint16(value);
 				idFile->setAccess(triangleID, old);
-				if(walkmesh)	walkmesh->updateGL();
+				if (walkmesh)	walkmesh->update();
 
 				emit modified();
 			}
@@ -931,16 +928,16 @@
 
 void WalkmeshManager::setCurrentGateway(int id)
 {
-	if(!infFile->isOpen() || id < 0 || 12 <= id)    return;
+	if (!infFile->isOpen() || id < 0 || 12 <= id)    return;
 
-	const Exit &gateway = infFile->exitLine(id);
+	const Exit &gateway = infFile->exitLine(quint8(id));
 
 	exitPoints[0]->setValues(gateway.exit_line[0]);
 	exitPoints[1]->setValues(gateway.exit_line[1]);
 	entryPoint->setValues(gateway.destination);
 	fieldId->blockSignals(true);
 	gateEnabled->blockSignals(true);
-	if(gateway.fieldID == 0x7FFF) {
+	if (gateway.fieldID == 0x7FFF) {
 		gateEnabled->setChecked(false);
 		fieldId->setValue(0);
 	} else {
@@ -950,20 +947,20 @@
 	fieldId->blockSignals(false);
 	gateEnabled->blockSignals(false);
 	setGateEnabled(gateEnabled->isChecked());
-	if(!infFile->isJap()) {
-		arrowDisplay->setChecked(infFile->arrowIsDisplayed(id));
+	if (!infFile->isJap()) {
+		arrowDisplay->setChecked(infFile->arrowIsDisplayed(quint8(id)));
 	}
 
 	exitDirection->setValue(gateway.dir);
 
-	if(walkmesh)	walkmesh->setSelectedGate(id);
+	if (walkmesh)	walkmesh->setSelectedGate(id);
 }
 
 void WalkmeshManager::setCurrentDoor(int id)
 {
-	if(!infFile->isOpen() || id < 0 || 12 <= id)    return;
+	if (!infFile->isOpen() || id < 0 || 12 <= id)    return;
 
-	const Trigger &trigger = infFile->trigger(id);
+	const Trigger &trigger = infFile->trigger(quint8(id));
 
 	doorEnabled->blockSignals(true);
 	bgParamId->blockSignals(true);
@@ -976,7 +973,7 @@
 	doorPosition[0]->setValues(trigger.trigger_line[0]);
 	doorPosition[1]->setValues(trigger.trigger_line[1]);
 
-	if(trigger.background_parameter == 0xFF) {
+	if (trigger.background_parameter == 0xFF) {
 		doorEnabled->setChecked(false);
 		bgParamId->setValue(0);
 	} else {
@@ -999,47 +996,47 @@
 	setDoorEnabled(doorEnabled->isChecked());
 
 
-	if(walkmesh)	walkmesh->setSelectedDoor(id);
+	if (walkmesh)	walkmesh->setSelectedDoor(id);
 }
 
 void WalkmeshManager::setCurrentArrow(int id)
 {
-	if(!infFile->isOpen() || id < 0 || 12 <= id)    return;
+	if (!infFile->isOpen() || id < 0 || 12 <= id)    return;
 
-	const Arrow &arrow = infFile->arrow(id);
+	const Arrow &arrow = infFile->arrow(quint8(id));
 
-	arrowX->setValue(arrow.positionX);
-	arrowY->setValue(arrow.positionY);
-	arrowZ->setValue(arrow.positionZ);
+	arrowX->setValue(qint16(arrow.positionX));
+	arrowY->setValue(qint16(arrow.positionY));
+	arrowZ->setValue(qint16(arrow.positionZ));
 	int index = arrowType->findData(arrow.type);
-	if(index != -1) {
+	if (index != -1) {
 		arrowType->setCurrentIndex(index);
 	} else {
 		arrowType->addItem(tr("?"), arrow.type);
 		arrowType->setCurrentIndex(arrowType->count()-1);
 	}
 
-	if(walkmesh)	walkmesh->setSelectedArrow(id);
+	if (walkmesh)	walkmesh->setSelectedArrow(id);
 }
 
 void WalkmeshManager::editExitPoint(const Vertex_s &values)
 {
 	QObject *s = sender();
 
-	if(s == exitPoints[0])			editExitPoint(0, values);
-	else if(s == exitPoints[1])		editExitPoint(1, values);
+	if (s == exitPoints[0])			editExitPoint(0, values);
+	else if (s == exitPoints[1])		editExitPoint(1, values);
 }
 
 void WalkmeshManager::editExitPoint(int id, const Vertex_s &values)
 {
-	if(infFile->isOpen()) {
-		int gateId = gateList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 gateId = quint8(gateList->currentRow());
 		Exit old = infFile->exitLine(gateId);
 		Vertex_s oldVertex = old.exit_line[id];
-		if(oldVertex.x != values.x || oldVertex.y != values.y || oldVertex.z != values.z) {
+		if (oldVertex.x != values.x || oldVertex.y != values.y || oldVertex.z != values.z) {
 			old.exit_line[id] = values;
 			infFile->setExitLine(gateId, old);
-			if(walkmesh)	walkmesh->updateGL();
+			if (walkmesh)	walkmesh->update();
 
 			emit modified();
 		}
@@ -1048,11 +1045,11 @@
 
 void WalkmeshManager::editEntryPoint(const Vertex_s &values)
 {
-	if(infFile->isOpen()) {
-		int gateId = gateList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 gateId = quint8(gateList->currentRow());
 		Exit old = infFile->exitLine(gateId);
 		Vertex_s oldVertex = old.destination;
-		if(oldVertex.x != values.x || oldVertex.y != values.y || oldVertex.z != values.z) {
+		if (oldVertex.x != values.x || oldVertex.y != values.y || oldVertex.z != values.z) {
 			old.destination = values;
 			infFile->setExitLine(gateId, old);
 
@@ -1065,20 +1062,20 @@
 {
 	QObject *s = sender();
 
-	if(s == doorPosition[0])			editDoorPoint(0, values);
-	else if(s == doorPosition[1])		editDoorPoint(1, values);
+	if (s == doorPosition[0])			editDoorPoint(0, values);
+	else if (s == doorPosition[1])		editDoorPoint(1, values);
 }
 
 void WalkmeshManager::editDoorPoint(int id, const Vertex_s &values)
 {
-	if(infFile->isOpen()) {
-		int gateId = gateList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 gateId = quint8(gateList->currentRow());
 		Trigger old = infFile->trigger(gateId);
 		Vertex_s oldVertex = old.trigger_line[id];
-		if(oldVertex.x != values.x || oldVertex.y != values.y || oldVertex.z != values.z) {
+		if (oldVertex.x != values.x || oldVertex.y != values.y || oldVertex.z != values.z) {
 			old.trigger_line[id] = values;
 			infFile->setTrigger(gateId, old);
-			if(walkmesh)	walkmesh->updateGL();
+			if (walkmesh)	walkmesh->update();
 
 			emit modified();
 		}
@@ -1087,11 +1084,11 @@
 
 void WalkmeshManager::editExitDirection(int dir)
 {
-	if(infFile->isOpen()) {
-		int gateId = gateList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 gateId = quint8(gateList->currentRow());
 		Exit old = infFile->exitLine(gateId);
-		old.dir_copy1 = old.dir_copy2 = old.dir_copy3 = old.dir = dir;
-		if(old.dir != infFile->exitLine(gateId).dir
+		old.dir_copy1 = old.dir_copy2 = old.dir_copy3 = old.dir = quint8(dir);
+		if (old.dir != infFile->exitLine(gateId).dir
 				|| old.dir_copy1 != infFile->exitLine(gateId).dir_copy1
 				|| old.dir_copy2 != infFile->exitLine(gateId).dir_copy2
 				|| old.dir_copy3 != infFile->exitLine(gateId).dir_copy3) {
@@ -1116,7 +1113,7 @@
 {
 	setGateEnabled(enabled);
 
-	if(enabled) {
+	if (enabled) {
 		editFieldId(fieldId->value());
 	} else {
 		editFieldId(0x7FFF);
@@ -1125,20 +1122,20 @@
 
 void WalkmeshManager::editFieldId(int v)
 {
-	if(infFile->isOpen()) {
-		if(!gateEnabled->isChecked()) {
+	if (infFile->isOpen()) {
+		if (!gateEnabled->isChecked()) {
 			v = 0x7FFF;
 		}
 
-		int gateId = gateList->currentRow();
+		quint8 gateId = quint8(gateList->currentRow());
 		Exit old = infFile->exitLine(gateId);
-		if(old.fieldID != v) {
-			old.fieldID = v;
+		if (old.fieldID != v) {
+			old.fieldID = quint16(v);
 			infFile->setExitLine(gateId, old);
 			QListWidgetItem *item = gateList->currentItem();
-			if(v != 0x7FFF) {
+			if (v != 0x7FFF) {
 				item->setText(QString("%1 (%2)")
-				              .arg(Data::field_names.value(v))
+				                  .arg(Data::mapName(v))
 				              .arg(v));
 				// Default foreground
 				item->setForeground(QListWidgetItem().foreground());
@@ -1154,9 +1151,9 @@
 
 void WalkmeshManager::editArrowDisplay(bool checked)
 {
-	if(infFile->isOpen()) {
-		int gateId = gateList->currentRow();
-		if(infFile->arrowIsDisplayed(gateId) != checked) {
+	if (infFile->isOpen()) {
+		quint8 gateId = quint8(gateList->currentRow());
+		if (infFile->arrowIsDisplayed(gateId) != checked) {
 			infFile->setArrowDiplay(gateId, checked);
 
 			emit modified();
@@ -1178,7 +1175,7 @@
 {
 	setDoorEnabled(enabled);
 
-	if(enabled) {
+	if (enabled) {
 		editParamId(fieldId->value());
 	} else {
 		editParamId(0xFF);
@@ -1187,18 +1184,18 @@
 
 void WalkmeshManager::editParamId(int v)
 {
-	if(infFile->isOpen()) {
-		if(!doorEnabled->isChecked()) {
+	if (infFile->isOpen()) {
+		if (!doorEnabled->isChecked()) {
 			v = 0xFF;
 		}
 
-		int gateId = doorList->currentRow();
+		quint8 gateId = quint8(doorList->currentRow());
 		Trigger old = infFile->trigger(gateId);
-		if(old.background_parameter != v) {
-			old.background_parameter = v;
+		if (old.background_parameter != v) {
+			old.background_parameter = quint8(v);
 			infFile->setTrigger(gateId, old);
 			QListWidgetItem *item = doorList->currentItem();
-			if(v != 0xFF) {
+			if (v != 0xFF) {
 				item->setText(tr("Door %1").arg(gateId));
 				// Default foreground
 				item->setForeground(QListWidgetItem().foreground());
@@ -1207,7 +1204,7 @@
 				item->setForeground(Qt::darkGray);
 			}
 
-			if(walkmesh)	walkmesh->updateGL();
+			if (walkmesh)	walkmesh->update();
 			emit modified();
 		}
 	}
@@ -1215,14 +1212,14 @@
 
 void WalkmeshManager::editStateId(int v)
 {
-	if(infFile->isOpen()) {
-		int gateId = doorList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 gateId = quint8(doorList->currentRow());
 		Trigger old = infFile->trigger(gateId);
-		if(old.background_state != v) {
-			old.background_state = v;
+		if (old.background_state != v) {
+			old.background_state = quint8(v);
 			infFile->setTrigger(gateId, old);
 
-			if(walkmesh)	walkmesh->updateGL();
+			if (walkmesh)	walkmesh->update();
 			emit modified();
 		}
 	}
@@ -1230,14 +1227,14 @@
 
 void WalkmeshManager::editBehavior(int v)
 {
-	if(infFile->isOpen()) {
-		int gateId = doorList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 gateId = quint8(doorList->currentRow());
 		Trigger old = infFile->trigger(gateId);
-		if(old.behavior != v) {
-			old.behavior = v;
+		if (old.behavior != v) {
+			old.behavior = quint8(v);
 			infFile->setTrigger(gateId, old);
 
-			if(walkmesh)	walkmesh->updateGL();
+			if (walkmesh)	walkmesh->update();
 			emit modified();
 		}
 	}
@@ -1245,26 +1242,26 @@
 
 void WalkmeshManager::editSoundId(int v)
 {
-	if(infFile->isOpen()) {
-		int gateId = doorList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 gateId = quint8(doorList->currentRow());
 		Trigger old = infFile->trigger(gateId);
-		if(old.soundID != v) {
-			old.soundID = v;
+		if (old.soundID != v) {
+			old.soundID = quint8(v);
 			infFile->setTrigger(gateId, old);
 
-			if(walkmesh)	walkmesh->updateGL();
+			if (walkmesh)	walkmesh->update();
 			emit modified();
 		}
 	}
 }
 
-void WalkmeshManager::editArrowX(double value)
+void WalkmeshManager::editArrowX(int value)
 {
-	if(infFile->isOpen()) {
-		int arrowId = arrowList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 arrowId = quint8(arrowList->currentRow());
 		Arrow old = infFile->arrow(arrowId);
-		if(old.positionX != value) {
-			old.positionX = value;
+		if (old.positionX != qint32(value)) {
+			old.positionX = qint32(value);
 			infFile->setArrow(arrowId, old);
 
 			emit modified();
@@ -1272,13 +1269,13 @@
 	}
 }
 
-void WalkmeshManager::editArrowY(double value)
+void WalkmeshManager::editArrowY(int value)
 {
-	if(infFile->isOpen()) {
-		int arrowId = arrowList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 arrowId = quint8(arrowList->currentRow());
 		Arrow old = infFile->arrow(arrowId);
-		if(old.positionY != value) {
-			old.positionY = value;
+		if (old.positionY != qint32(value)) {
+			old.positionY = qint32(value);
 			infFile->setArrow(arrowId, old);
 
 			emit modified();
@@ -1286,13 +1283,13 @@
 	}
 }
 
-void WalkmeshManager::editArrowZ(double value)
+void WalkmeshManager::editArrowZ(int value)
 {
-	if(infFile->isOpen()) {
-		int arrowId = arrowList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 arrowId = quint8(arrowList->currentRow());
 		Arrow old = infFile->arrow(arrowId);
-		if(old.positionZ != value) {
-			old.positionZ = value;
+		if (old.positionZ != qint32(value)) {
+			old.positionZ = qint32(value);
 			infFile->setArrow(arrowId, old);
 
 			emit modified();
@@ -1302,15 +1299,15 @@
 
 void WalkmeshManager::editArrowType(int index)
 {
-	if(infFile->isOpen()) {
-		int arrowId = arrowList->currentRow();
+	if (infFile->isOpen()) {
+		quint8 arrowId = quint8(arrowList->currentRow());
 		quint32 value = arrowType->itemData(index).toUInt();
 		Arrow old = infFile->arrow(arrowId);
-		if(old.type != value) {
-			old.type = index;
+		if (old.type != value) {
+			old.type = quint32(index);
 			infFile->setArrow(arrowId, old);
 			QListWidgetItem *item = arrowList->currentItem();
-			if(index != 0) {
+			if (index != 0) {
 				item->setText(tr("Arrow %1").arg(arrowId));
 				// Default foreground
 				item->setForeground(QListWidgetItem().foreground());
@@ -1328,39 +1325,39 @@
 {
 	QObject *s = sender();
 
-	if(s == rangeEdit[0])			editRange(0, v);
-	else if(s == rangeEdit[1])		editRange(1, v);
-	else if(s == rangeEdit[2])		editRange(2, v);
-	else if(s == rangeEdit[3])		editRange(3, v);
-	else if(s == bgSizeEdit[0])		editBgSize(0, v);
-	else if(s == bgSizeEdit[1])		editBgSize(1, v);
-	else if(s == bgSizeEdit[2])		editBgSize(2, v);
-	else if(s == bgSizeEdit[3])		editBgSize(3, v);
-	else if(s == bgFlagEdit[0])		editBgFlag(0, v);
-	else if(s == bgFlagEdit[1])		editBgFlag(1, v);
-	else if(s == bgFlagEdit[2])		editBgFlag(2, v);
-	else if(s == bgFlagEdit[3])		editBgFlag(3, v);
+	if (s == rangeEdit[0])			editRange(0, v);
+	else if (s == rangeEdit[1])		editRange(1, v);
+	else if (s == rangeEdit[2])		editRange(2, v);
+	else if (s == rangeEdit[3])		editRange(3, v);
+	else if (s == bgSizeEdit[0])		editBgSize(0, v);
+	else if (s == bgSizeEdit[1])		editBgSize(1, v);
+	else if (s == bgSizeEdit[2])		editBgSize(2, v);
+	else if (s == bgSizeEdit[3])		editBgSize(3, v);
+	else if (s == bgFlagEdit[0])		editBgFlag(0, v);
+	else if (s == bgFlagEdit[1])		editBgFlag(1, v);
+	else if (s == bgFlagEdit[2])		editBgFlag(2, v);
+	else if (s == bgFlagEdit[3])		editBgFlag(3, v);
 }
 
 void WalkmeshManager::editRange(int id, int v)
 {
-	if(infFile->isOpen()) {
+	if (infFile->isOpen()) {
 		Range old = infFile->cameraRange();
 		qint16 oldv=0;
 
-		switch(id) {
+		switch (id) {
 		case 0:	oldv = old.top;		break;
 		case 1:	oldv = old.bottom;	break;
 		case 2:	oldv = old.right;	break;
 		case 3:	oldv = old.left;	break;
 		}
 
-		if(oldv != v) {
-			switch(id) {
-			case 0:	old.top = v;	break;
-			case 1:	old.bottom = v;	break;
-			case 2:	old.right = v;	break;
-			case 3:	old.left = v;	break;
+		if (oldv != v) {
+			switch (id) {
+			case 0: old.top = qint16(v);    break;
+			case 1: old.bottom = qint16(v); break;
+			case 2: old.right = qint16(v);  break;
+			case 3: old.left = qint16(v);   break;
 			}
 			infFile->setCameraRange(old);
 
@@ -1371,22 +1368,22 @@
 
 void WalkmeshManager::editBgSize(int id, int v)
 {
-	if(infFile->isOpen()) {
+	if (infFile->isOpen()) {
 		qint16 oldv=0;
 
-		switch(id) {
+		switch (id) {
 		case 0:	oldv = infFile->bgLayer3Width();	break;
 		case 1:	oldv = infFile->bgLayer3Height();	break;
 		case 2:	oldv = infFile->bgLayer4Width();	break;
 		case 3:	oldv = infFile->bgLayer4Height();	break;
 		}
 
-		if(oldv != v) {
-			switch(id) {
-			case 0:	infFile->setBgLayer3Width(v);	break;
-			case 1:	infFile->setBgLayer3Height(v);	break;
-			case 2:	infFile->setBgLayer4Width(v);	break;
-			case 3:	infFile->setBgLayer4Height(v);	break;
+		if (oldv != v) {
+			switch (id) {
+			case 0: infFile->setBgLayer3Width(qint16(v));  break;
+			case 1: infFile->setBgLayer3Height(qint16(v)); break;
+			case 2: infFile->setBgLayer4Width(qint16(v));  break;
+			case 3: infFile->setBgLayer4Height(qint16(v)); break;
 			}
 
 			emit modified();
@@ -1396,22 +1393,22 @@
 
 void WalkmeshManager::editBgFlag(int id, int v)
 {
-	if(infFile->isOpen()) {
+	if (infFile->isOpen()) {
 		qint16 oldv=0;
 
-		switch(id) {
+		switch (id) {
 		case 0:	oldv = infFile->bgLayer1Flag();	break;
 		case 1:	oldv = infFile->bgLayer2Flag();	break;
 		case 2:	oldv = infFile->bgLayer3Flag();	break;
 		case 3:	oldv = infFile->bgLayer4Flag();	break;
 		}
 
-		if(oldv != v) {
-			switch(id) {
-			case 0:	infFile->setBgLayer1Flag(v);	break;
-			case 1:	infFile->setBgLayer2Flag(v);	break;
-			case 2:	infFile->setBgLayer3Flag(v);	break;
-			case 3:	infFile->setBgLayer4Flag(v);	break;
+		if (oldv != v) {
+			switch (id) {
+			case 0:	infFile->setBgLayer1Flag(quint8(v));	break;
+			case 1:	infFile->setBgLayer2Flag(quint8(v));	break;
+			case 2:	infFile->setBgLayer3Flag(quint8(v));	break;
+			case 3:	infFile->setBgLayer4Flag(quint8(v));	break;
 			}
 
 			emit modified();
@@ -1421,11 +1418,11 @@
 
 void WalkmeshManager::editNavigation(int v)
 {
-	if(infFile->isOpen()) {
+	if (infFile->isOpen()) {
 		int old = infFile->control();
-		if(old != v) {
+		if (old != v) {
 			navigation->setValue(v);
-			infFile->setControl(v);
+			infFile->setControl(quint8(v));
 
 			emit modified();
 		}
@@ -1434,10 +1431,10 @@
 
 void WalkmeshManager::editCameraFocusHeight(int value)
 {
-	if(infFile->isOpen()) {
+	if (infFile->isOpen()) {
 		int old = infFile->cameraFocusHeight();
-		if(old != value) {
-			infFile->setCameraFocusHeight(value);
+		if (old != value) {
+			infFile->setCameraFocusHeight(qint16(value));
 			emit modified();
 		}
 	}
@@ -1445,9 +1442,9 @@
 
 void WalkmeshManager::editUnknown(const QByteArray &data)
 {
-	if(infFile->isOpen()) {
+	if (infFile->isOpen()) {
 		QByteArray old = infFile->unknown();
-		if(old != data) {
+		if (old != data) {
 			infFile->setUnknown(data);
 			emit modified();
 		}
@@ -1456,10 +1453,10 @@
 
 void WalkmeshManager::editMapScale(int scale)
 {
-	if(scriptsAndTexts->isOpen()) {
+	if (scriptsAndTexts->isOpen()) {
 		int old = scriptsAndTexts->scale();
-		if(old != scale) {
-			scriptsAndTexts->setScale(scale);
+		if (old != scale) {
+			scriptsAndTexts->setScale(quint16(scale));
 			emit modified();
 		}
 	}
@@ -1467,12 +1464,12 @@
 
 void WalkmeshManager::focusInEvent(QFocusEvent *e)
 {
-	if(walkmesh)	walkmesh->setFocus();
+	if (walkmesh)	walkmesh->setFocus();
 	QWidget::focusInEvent(e);
 }
 
 void WalkmeshManager::focusOutEvent(QFocusEvent *e)
 {
-	if(walkmesh)	walkmesh->clearFocus();
+	if (walkmesh)	walkmesh->clearFocus();
 	QWidget::focusOutEvent(e);
 }
diff -Nru makoureactor-1.7.2/widgets/WalkmeshManager.h makoureactor-1.8.0/widgets/WalkmeshManager.h
--- makoureactor-1.7.2/widgets/WalkmeshManager.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/WalkmeshManager.h	2020-08-08 18:46:56.000000000 +0000
@@ -30,7 +30,7 @@
 {
 	Q_OBJECT
 public:
-	explicit WalkmeshManager(QWidget *parent=0, const QGLWidget *shareWidget=0);
+	explicit WalkmeshManager(QWidget *parent=nullptr);
 	void saveConfig();
 	void fill(Field *field, bool reload=false);
 	void clear();
@@ -68,9 +68,9 @@
 	void editStateId(int v);
 	void editBehavior(int v);
 	void editSoundId(int v);
-	void editArrowX(double value);
-	void editArrowY(double value);
-	void editArrowZ(double value);
+	void editArrowX(int value);
+	void editArrowY(int value);
+	void editArrowZ(int value);
 	void editArrowType(int index);
 	void editRange(int v);
 	void editExitDirection(int dir);
@@ -127,7 +127,7 @@
 	QCheckBox *arrowDisplay;
 	//ArrowPage
 	QListWidget *arrowList;
-	QDoubleSpinBox *arrowX, *arrowY, *arrowZ;
+	QSpinBox *arrowX, *arrowY, *arrowZ;
 	QComboBox *arrowType;
 	//DoorPage
 	QListWidget *doorList;
diff -Nru makoureactor-1.7.2/widgets/WalkmeshWidget.cpp makoureactor-1.8.0/widgets/WalkmeshWidget.cpp
--- makoureactor-1.7.2/widgets/WalkmeshWidget.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/WalkmeshWidget.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -16,32 +16,48 @@
  ** along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 #include "WalkmeshWidget.h"
+#include "Parameters.h"
 #include "FieldModel.h"
 
-WalkmeshWidget::WalkmeshWidget(QWidget *parent, const QGLWidget *shareWidget) :
-	QGLWidget(/*QGLFormat(QGL::SampleBuffers),*/ parent, shareWidget),
+WalkmeshWidget::WalkmeshWidget(QWidget *parent) :
+    QOpenGLWidget(/*QGLFormat(QGL::SampleBuffers),*/ parent),
 	distance(0.0f), xRot(0.0f), yRot(0.0f), zRot(0.0f),
 	xTrans(0.0f), yTrans(0.0f), transStep(360.0f), lastKeyPressed(-1),
 	_camID(0), _selectedTriangle(-1), _selectedDoor(-1), _selectedGate(-1),
-	_selectedArrow(-1), fovy(70.0), walkmesh(0), camera(0), infFile(0),
-	bgFile(0), scripts(0), field(0), modelsVisible(true)/*, thread(0)*/
+    _selectedArrow(-1), fovy(70.0), walkmesh(nullptr), camera(nullptr), infFile(nullptr),
+    bgFile(nullptr), scripts(nullptr), field(nullptr), modelsVisible(true)/*, thread(0)*/
 {
 	setMinimumSize(320, 240);
 //	setAutoFillBackground(false);
 //	arrow = QPixmap(":/images/field-arrow-red.png");
+
+	QSurfaceFormat format;
+	format.setRenderableType(QSurfaceFormat::OpenGL);
+	// asks for a OpenGL 2.1 debug context using the Core profile
+	format.setVersion(2, 1);
+	format.setProfile(QSurfaceFormat::CoreProfile);
+#ifdef OPENGL_DEBUG
+	format.setOption(QSurfaceFormat::DebugContext);
+#endif
+
+	QOpenGLContext *context = new QOpenGLContext;
+	context->setFormat(format);
+	context->create();
+
+	setFormat(format);
 }
 
 void WalkmeshWidget::clear()
 {
-	walkmesh = 0;
-	camera = 0;
-	infFile = 0;
-	bgFile = 0;
-	scripts = 0;
-	field = 0;
-//	if(thread)	thread->deleteLater();
+	walkmesh = nullptr;
+	camera = nullptr;
+	infFile = nullptr;
+	bgFile = nullptr;
+	scripts = nullptr;
+	field = nullptr;
+//	if (thread)	thread->deleteLater();
 	fieldModels.clear();
-	updateGL();
+	update();
 }
 
 void WalkmeshWidget::fill(Field *field)
@@ -53,7 +69,7 @@
 	this->scripts = field->scriptsAndTexts();
 	this->field = field;
 	this->fieldModels.clear();
-	if(modelsVisible) {
+	if (modelsVisible) {
 		openModels();
 	}
 
@@ -63,23 +79,23 @@
 
 void WalkmeshWidget::openModels()
 {
-//	if(thread)	thread->deleteLater();
-	if(!this->fieldModels.isEmpty() || !field || !scripts) {
+//	if (thread)	thread->deleteLater();
+	if (!this->fieldModels.isEmpty() || !field || !scripts) {
 		return;
 	}
 	int modelCount = scripts->modelCount();
 	QList<int> modelIds;
-	for(int modelId=0 ; modelId<modelCount ; ++modelId) {
+	for (int modelId=0; modelId<modelCount; ++modelId) {
 		modelIds.append(modelId);
 	}
-//	if(field->isPC()) {
+//	if (field->isPC()) {
 //		thread = new FieldModelThread(this);
 //		thread->setField(field);
 //		connect(thread, SIGNAL(modelLoaded(Field*,FieldModelFile*,int,int,bool)), SLOT(addModel(Field*,FieldModelFile*,int)));
 //		thread->setModels(modelIds);
 //		thread->start();
 //	} else {
-		foreach(int modelId, modelIds) {
+		for (int modelId : modelIds) {
 			addModel(field, field->fieldModel(modelId), modelId);
 		}
 //	}
@@ -87,15 +103,15 @@
 
 void WalkmeshWidget::addModel(Field *field, FieldModelFile *fieldModelFile, int modelId)
 {
-	if(this->field == field) {
+	if (this->field == field) {
 		fieldModels.insert(modelId, fieldModelFile);
-		updateGL();
+		update();
 	}
 }
 
 void WalkmeshWidget::computeFov()
 {
-	if(camera && camera->isOpen()
+	if (camera && camera->isOpen()
 			&& camera->hasCamera()
 			&& _camID < camera->cameraCount()) {
 		const Camera &cam = camera->camera(_camID);
@@ -108,18 +124,21 @@
 void WalkmeshWidget::updatePerspective()
 {
 	computeFov();
-	resizeGL(width(), height());
-	updateGL();
+	resize(width(), height());
+	update();
 }
 
 void WalkmeshWidget::initializeGL()
 {
+	initializeOpenGLFunctions();
+
 	glEnable(GL_DEPTH_TEST);
 	//glEnable(GL_COLOR_MATERIAL);
 	glDepthFunc(GL_LEQUAL);
 	glDisable(GL_CULL_FACE);
 	glDisable(GL_LIGHTING);
 	glEnable(GL_BLEND);
+	glEnable(GL_TEXTURE_2D);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
@@ -141,7 +160,13 @@
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 
-	if(!walkmesh)	return;
+	if (!walkmesh)	return;
+
+#ifdef OPENGL_DEBUG
+	QOpenGLContext *ctx = QOpenGLContext::currentContext();
+	QOpenGLDebugLogger *logger = new QOpenGLDebugLogger(this);
+	logger->initialize();
+#endif
 
 	glTranslatef(xTrans, yTrans, distance);
 
@@ -149,7 +174,7 @@
 //	painter.begin(this);
 //	painter.setRenderHint(QPainter::Antialiasing);
 //	int arrowW, arrowH;
-//	if(width() < height()) {
+//	if (width() < height()) {
 //		arrowW = width() * 9 / 320;
 //		arrowH = width() * 6 / 320;
 //	} else {
@@ -164,7 +189,7 @@
 	glRotatef(yRot, 0.0, 1.0, 0.0);
 	glRotatef(zRot, 0.0, 0.0, 1.0);
 
-	/*if(bgFile) {
+	/*if (bgFile) {
 		glColor3ub(255, 255, 255);
 		QPixmap pix = bgFile->openBackground();
 		glEnable(GL_TEXTURE_2D);
@@ -194,7 +219,7 @@
 		glDisable(GL_TEXTURE_2D);
 	}*/
 
-	if(camera->isOpen() && camera->hasCamera() && _camID < camera->cameraCount()) {
+	if (camera->isOpen() && camera->hasCamera() && _camID < camera->cameraCount()) {
 		const Camera &cam = camera->camera(_camID);
 
 		double camAxisXx = cam.camera_axis[0].x/4096.0;
@@ -221,14 +246,14 @@
 		gluLookAt(tx, ty, tz, tx + camAxisZx, ty + camAxisZy, tz + camAxisZz, camAxisYx, camAxisYy, camAxisYz);
 	}
 
-	if(walkmesh->isOpen()) {
+	if (walkmesh->isOpen()) {
 
-//		if(infFile && infFile->isOpen()) {
+//		if (infFile && infFile->isOpen()) {
 //			glBegin(GL_QUADS);
 //			glColor3ub(255, 0, 0);
 
 //			float arrowW, arrowH;
-//			if(width() < height()) {
+//			if (width() < height()) {
 //				arrowW = width() * 9.0f / 320.0f;
 //				arrowH = width() * 6.0f / 320.0f;
 //			} else {
@@ -237,8 +262,8 @@
 //			}
 
 //			int gateID=0;
-//			foreach(const Exit &gate, infFile->exitLines()) {
-//				if(gate.fieldID != 0x7FFF && infFile->arrowIsDisplayed(gateID)) {
+//			for (const Exit &gate : infFile->exitLines()) {
+//				if (gate.fieldID != 0x7FFF && infFile->arrowIsDisplayed(gateID)) {
 //					Vertex_s vertex1, vertex2, vertex3;
 //					vertex1 = gate.exit_line[0];
 //					vertex2 = gate.exit_line[1];
@@ -285,7 +310,7 @@
 
 		int i=0;
 
-		foreach(const Triangle &triangle, walkmesh->triangles()) {
+		for (const Triangle &triangle : walkmesh->triangles()) {
 			const Access &access = walkmesh->access(i);
 
 			drawIdLine(i, triangle.vertices[0], triangle.vertices[1], access.a[0]);
@@ -295,20 +320,20 @@
 			++i;
 		}
 
-		if(infFile && infFile->isOpen()) {
+		if (infFile && infFile->isOpen()) {
 			glColor3ub(0xFF, 0x00, 0x00);
 //			glEnable(GL_TEXTURE_2D);
 //			GLuint texID = bindTexture(arrow);
 
 			int gateID=0;
-			foreach(const Exit &gate, infFile->exitLines()) {
-				if(gate.fieldID != 0x7FFF) {
+			for (const Exit &gate : infFile->exitLines()) {
+				if (gate.fieldID != 0x7FFF) {
 					Vertex_s vertex;
 					vertex = gate.exit_line[0];
 					glVertex3f(vertex.x/4096.0f, vertex.y/4096.0f, vertex.z/4096.0f);
 					vertex = gate.exit_line[1];
 					glVertex3f(vertex.x/4096.0f, vertex.y/4096.0f, vertex.z/4096.0f);
-					if(infFile->arrowIsDisplayed(gateID)) {
+					if (infFile->arrowIsDisplayed(gateID)) {
 //						glTexCoord2d(0.0, 1.0);
 //						glTexCoord2d(1.0, 0.0);
 					}
@@ -321,8 +346,8 @@
 
 			glColor3ub(0x00, 0xFF, 0x00);
 
-			foreach(const Trigger &trigger, infFile->triggers()) {
-				if(trigger.background_parameter != 0xFF) {
+			for (const Trigger &trigger : infFile->triggers()) {
+				if (trigger.background_parameter != 0xFF) {
 					Vertex_s vertex;
 					vertex = trigger.trigger_line[0];
 					glVertex3f(vertex.x/4096.0f, vertex.y/4096.0f, vertex.z/4096.0f);
@@ -340,7 +365,7 @@
 
 		glColor3ub(0xFF, 0x90, 0x00);
 
-		if(_selectedTriangle >= 0 && _selectedTriangle < walkmesh->triangleCount()) {
+		if (_selectedTriangle >= 0 && _selectedTriangle < walkmesh->triangleCount()) {
 			const Triangle &triangle = walkmesh->triangle(_selectedTriangle);
 			const Vertex_sr &vertex1 = triangle.vertices[0];
 			glVertex3f(vertex1.x/4096.0f, vertex1.y/4096.0f, vertex1.z/4096.0f);
@@ -350,12 +375,12 @@
 			glVertex3f(vertex3.x/4096.0f, vertex3.y/4096.0f, vertex3.z/4096.0f);
 		}
 
-		if(infFile && infFile->isOpen()) {
+		if (infFile && infFile->isOpen()) {
 			glColor3ub(0xFF, 0x00, 0x00);
 
-			if(_selectedGate >= 0 && _selectedGate < 12) {
+			if (_selectedGate >= 0 && _selectedGate < 12) {
 				const Exit &gate = infFile->exitLine(_selectedGate);
-				if(gate.fieldID != 0x7FFF) {
+				if (gate.fieldID != 0x7FFF) {
 					const Vertex_s &vertex1 = gate.exit_line[0];
 					glVertex3f(vertex1.x/4096.0f, vertex1.y/4096.0f, vertex1.z/4096.0f);
 					const Vertex_s &vertex2 = gate.exit_line[1];
@@ -365,9 +390,9 @@
 
 			glColor3ub(0x00, 0xFF, 0x00);
 
-			if(_selectedDoor >= 0 && _selectedDoor < 12) {
+			if (_selectedDoor >= 0 && _selectedDoor < 12) {
 				const Trigger &trigger = infFile->trigger(_selectedDoor);
-				if(trigger.background_parameter != 0xFF) {
+				if (trigger.background_parameter != 0xFF) {
 					const Vertex_s &vertex1 = trigger.trigger_line[0];
 					glVertex3f(vertex1.x/4096.0f, vertex1.y/4096.0f, vertex1.z/4096.0f);
 					const Vertex_s &vertex2 = trigger.trigger_line[1];
@@ -379,18 +404,18 @@
 		glEnd();
 	}
 
-	if(scripts && scripts->isOpen()) {
+	if (scripts && scripts->isOpen()) {
 		QMap<int, FF7Position *> positions;
 		scripts->linePosition(positions);
 
-		if(!positions.isEmpty()) {
+		if (!positions.isEmpty()) {
 
 			glBegin(GL_LINES);
 
 			glColor3ub(0x90, 0xFF, 0x00);
 
 			QMapIterator<int, FF7Position *> i(positions);
-			while(i.hasNext()) {
+			while (i.hasNext()) {
 				i.next();
 				FF7Position *pos = i.value();
 
@@ -404,20 +429,20 @@
 
 		}
 
-		if(modelsVisible && !fieldModels.isEmpty()) {
+		if (modelsVisible && !fieldModels.isEmpty()) {
 
 			QMultiMap<int, FF7Position> modelPositions;
 			scripts->listModelPositions(modelPositions);
 
 			QMap<int, int> modelDirection;
 			int modelID = 0;
-			foreach(GrpScript *group, scripts->grpScripts()) {
-				if(group->typeID() == GrpScript::Model) {
-					if(!group->scripts().isEmpty()) {
-						foreach(Opcode *op, group->script(0)->opcodes()) {
-							if(op->id() == Opcode::DIR) {
+			for (GrpScript *group : scripts->grpScripts()) {
+				if (group->typeID() == GrpScript::Model) {
+					if (!group->scripts().isEmpty()) {
+						for (Opcode *op : group->script(0)->opcodes()) {
+							if (op->id() == Opcode::DIR) {
 								OpcodeDIR *opDir = (OpcodeDIR *)op;
-								if(opDir->banks == 0) {
+								if (opDir->banks == 0) {
 									modelDirection.insert(modelID, opDir->direction);
 									break;
 								}
@@ -428,42 +453,42 @@
 				}
 			}
 
-			if(!modelPositions.isEmpty()) {
+			if (!modelPositions.isEmpty()) {
 				int previousModelId = -1;
 				QMapIterator<int, FF7Position> i(modelPositions);
-				while(i.hasNext()) {
+				while (i.hasNext()) {
 					i.next();
 					const int modelId = i.key();
-					if(previousModelId == modelId) {
+					if (previousModelId == modelId) {
 						continue;
 					}
 					previousModelId = modelId;
 					FF7Position position = i.value();
 
-					if(!position.hasZ && position.hasId && position.id < walkmesh->triangleCount()) {
+					if (!position.hasZ && position.hasId && position.id < walkmesh->triangleCount()) {
 						position.z = walkmesh->triangle(position.id).vertices[0].z;
-					} else if(!position.hasZ) {
+					} else if (!position.hasZ) {
 						continue;
 					}
 
 					FieldModelFile *fieldModel = fieldModels.value(modelId);
-					if(fieldModel) {
+					if (fieldModel) {
 
 						glPushMatrix();
 
 						glTranslatef(position.x/4096.0f, position.y/4096.0f, position.z/4096.0f);
 						glRotatef(270.0f, 1.0, 0.0, 0.0);
 						int direction = modelDirection.value(modelId, -1);
-						if(direction != -1) {
+						if (direction != -1) {
 							glRotatef(-360.0f * direction / 256.0f, 0.0, 1.0, 0.0);
 						}
 
 //						QList<PolyVertex> trans = fieldModel->translations(0);
-//						if(!trans.isEmpty()) {
+//						if (!trans.isEmpty()) {
 //							glTranslatef(trans.first().x/5.0f, trans.first().y/5.0f, trans.first().z/5.0f);
 //						}
 
-						FieldModel::paintModel(this, fieldModel, 0, 0, 8.0f);
+						FieldModel::paintModel(fieldModel, 0, 0, 8.0f);
 
 						glPopMatrix();
 					}
@@ -471,13 +496,20 @@
 			}
 		}
 	}
+
+#ifdef OPENGL_DEBUG
+	const QList<QOpenGLDebugMessage> messages = logger->loggedMessages();
+	for (const QOpenGLDebugMessage &message : messages) {
+		qDebug() << message;
+	}
+#endif
 }
 
 void WalkmeshWidget::drawIdLine(int triangleID, const Vertex_sr &vertex1, const Vertex_sr &vertex2, qint16 access)
 {
-	if(triangleID == _selectedTriangle) {
+	if (triangleID == _selectedTriangle) {
 		glColor3ub(0xFF, 0x90, 0x00);
-	} else if(access == -1) {
+	} else if (access == -1) {
 		glColor3ub(0x66, 0x99, 0xCC);
 	} else {
 		glColor3ub(0xFF, 0xFF, 0xFF);
@@ -491,17 +523,17 @@
 {
 	setFocus();
 	distance += event->delta() / 4096.0;
-	updateGL();
+	update();
 }
 
 void WalkmeshWidget::mousePressEvent(QMouseEvent *event)
 {
 	setFocus();
-	if(event->button() == Qt::MidButton)
+	if (event->button() == Qt::MidButton)
 	{
 		resetCamera();
 	}
-	else if(event->button() == Qt::LeftButton)
+	else if (event->button() == Qt::LeftButton)
 	{
 		moveStart = event->pos();
 	}
@@ -512,17 +544,17 @@
 	xTrans += (event->pos().x() - moveStart.x()) / 4096.0;
 	yTrans -= (event->pos().y() - moveStart.y()) / 4096.0;
 	moveStart = event->pos();
-	updateGL();
+	update();
 }
 
 void WalkmeshWidget::keyPressEvent(QKeyEvent *event)
 {
-	if(lastKeyPressed == event->key()
+	if (lastKeyPressed == event->key()
 			&& (event->key() == Qt::Key_Left
 				|| event->key() == Qt::Key_Right
 				|| event->key() == Qt::Key_Down
 				|| event->key() == Qt::Key_Up)) {
-		if(transStep > 100.0f) {
+		if (transStep > 100.0f) {
 			transStep *= 0.90f; // accelerator
 		}
 	} else {
@@ -530,23 +562,23 @@
 	}
 	lastKeyPressed = event->key();
 
-	switch(event->key())
+	switch (event->key())
 	{
 	case Qt::Key_Left:
 		xTrans += 1.0f/transStep;
-		updateGL();
+		update();
 		break;
 	case Qt::Key_Right:
 		xTrans -= 1.0f/transStep;
-		updateGL();
+		update();
 		break;
 	case Qt::Key_Down:
 		yTrans += 1.0f/transStep;
-		updateGL();
+		update();
 		break;
 	case Qt::Key_Up:
 		yTrans -= 1.0f/transStep;
-		updateGL();
+		update();
 		break;
 	default:
 		QWidget::keyPressEvent(event);
@@ -579,7 +611,7 @@
 	qNormalizeAngle(angle);
 	if (angle != xRot) {
 		xRot = angle;
-		updateGL();
+		update();
 	}
 }
 
@@ -588,7 +620,7 @@
 	qNormalizeAngle(angle);
 	if (angle != yRot) {
 		yRot = angle;
-		updateGL();
+		update();
 	}
 }
 
@@ -597,7 +629,7 @@
 	qNormalizeAngle(angle);
 	if (angle != zRot) {
 		zRot = angle;
-		updateGL();
+		update();
 	}
 }
 
@@ -611,23 +643,23 @@
 	distance = 0;
 	zRot = yRot = xRot = 0;
 	xTrans = yTrans = 0;
-	updateGL();
+	update();
 }
 
 void WalkmeshWidget::setModelsVisible(bool show)
 {
-	if(modelsVisible != show) {
+	if (modelsVisible != show) {
 		modelsVisible = show;
-		if(modelsVisible) {
+		if (modelsVisible) {
 			openModels();
 		}
-		updateGL();
+		update();
 	}
 }
 
 void WalkmeshWidget::setCurrentFieldCamera(int camID)
 {
-	if(_camID != camID) {
+	if (_camID != camID) {
 		_camID = camID;
 		updatePerspective();
 	}
@@ -635,32 +667,32 @@
 
 void WalkmeshWidget::setSelectedTriangle(int triangle)
 {
-	if(_selectedTriangle != triangle) {
+	if (_selectedTriangle != triangle) {
 		_selectedTriangle = triangle;
-		updateGL();
+		update();
 	}
 }
 
 void WalkmeshWidget::setSelectedDoor(int door)
 {
-	if(_selectedDoor != door) {
+	if (_selectedDoor != door) {
 		_selectedDoor = door;
-		updateGL();
+		update();
 	}
 }
 
 void WalkmeshWidget::setSelectedGate(int gate)
 {
-	if(_selectedGate != gate) {
+	if (_selectedGate != gate) {
 		_selectedGate = gate;
-		updateGL();
+		update();
 	}
 }
 
 void WalkmeshWidget::setSelectedArrow(int arrow)
 {
-	if(_selectedArrow != arrow) {
+	if (_selectedArrow != arrow) {
 		_selectedArrow = arrow;
-		updateGL();
+		update();
 	}
 }
diff -Nru makoureactor-1.7.2/widgets/WalkmeshWidget.h makoureactor-1.8.0/widgets/WalkmeshWidget.h
--- makoureactor-1.7.2/widgets/WalkmeshWidget.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/widgets/WalkmeshWidget.h	2020-08-08 18:46:56.000000000 +0000
@@ -19,7 +19,6 @@
 #define WALKMESHWIDGET_H
 
 #include <QtWidgets>
-#include <QGLWidget>
 #ifdef Q_OS_MAC
 #include <OpenGL/glu.h>
 #else
@@ -28,11 +27,11 @@
 #include "core/field/Field.h"
 //#include "FieldModelThread.h"
 
-class WalkmeshWidget : public QGLWidget
+class WalkmeshWidget : public QOpenGLWidget, protected QOpenGLFunctions
 {
 	Q_OBJECT
 public:
-	explicit WalkmeshWidget(QWidget *parent=0, const QGLWidget *shareWidget=0);
+	explicit WalkmeshWidget(QWidget *parent=nullptr);
 	void clear();
 	void fill(Field *field);
 	void updatePerspective();
diff -Nru makoureactor-1.7.2/Window.cpp makoureactor-1.8.0/Window.cpp
--- makoureactor-1.7.2/Window.cpp	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Window.cpp	2020-08-08 18:46:56.000000000 +0000
@@ -24,17 +24,19 @@
 #include "widgets/ImportDialog.h"
 #include "widgets/MassExportDialog.h"
 #include "widgets/MassImportDialog.h"
-#include "widgets/FontManager.h"
+#include "widgets/PsfDialog.h"
+#include "widgets/AboutDialog.h"
 #include "core/Config.h"
 #include "Data.h"
 #include "core/field/FieldArchivePC.h"
 #include "core/field/FieldArchivePS.h"
 #include "widgets/OperationsManager.h"
+#include "widgets/EmptyFieldWidget.h"
 
 Window::Window() :
-	fieldArchive(0), field(0), firstShow(true), varDialog(0),
-	_textDialog(0), _modelManager(0), _tutManager(0), _walkmeshManager(0),
-	_backgroundManager(0), _progressDialog(0)
+    fieldArchive(nullptr), field(nullptr), firstShow(true), varDialog(nullptr),
+    _textDialog(nullptr), _modelManager(nullptr), _tutManager(nullptr), _walkmeshManager(nullptr),
+    _backgroundManager(nullptr), _lgpWidget(nullptr), _progressDialog(nullptr), timer(this)
 {
 	setWindowTitle();
 	setWindowState(Qt::WindowMaximized);
@@ -54,47 +56,46 @@
 
 	QMenu *menu;
 	QAction *actionOpen, *actionFind, *action;
-	QMenuBar *menuBar = new QMenuBar(0);
+	QMenuBar *menuBar = new QMenuBar(nullptr);
 
 	/* "File" Menu */
-	menu = menuBar->addMenu(tr("&File"));
+	QMenu *fileMenu = menuBar->addMenu(tr("&File"));
 
-	actionOpen = menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DialogOpenButton), tr("&Open..."), this, SLOT(openFile()), QKeySequence("Ctrl+O"));
-	menu->addAction(tr("Open &Directory..."), this, SLOT(openDir()), QKeySequence("Shift+Ctrl+O"));
+	actionOpen = fileMenu->addAction(QApplication::style()->standardIcon(QStyle::SP_DialogOpenButton), tr("&Open..."), this, SLOT(openFile()), QKeySequence("Ctrl+O"));
+	fileMenu->addAction(tr("Open &Directory..."), this, SLOT(openDir()), QKeySequence("Shift+Ctrl+O"));
 	_recentMenu = new QMenu(tr("&Recent files"), this);
 	fillRecentMenu();
 	connect(_recentMenu, SIGNAL(triggered(QAction*)), SLOT(openRecentFile(QAction*)));
-	menu->addMenu(_recentMenu);
-	actionSave = menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton), tr("&Save"), this, SLOT(save()), QKeySequence("Ctrl+S"));
-	actionSaveAs = menu->addAction(tr("Save &As..."), this, SLOT(saveAs()), QKeySequence("Shift+Ctrl+S"));
-	actionExport = menu->addAction(tr("&Export the current field..."), this, SLOT(exporter()), QKeySequence("Ctrl+E"));
-	actionMassExport = menu->addAction(tr("&Mass Export..."), this, SLOT(massExport()), QKeySequence("Shift+Ctrl+E"));
-	actionImport = menu->addAction(tr("&Import the current field..."), this, SLOT(importer()), QKeySequence("Ctrl+I"));
-//	actionMassImport = menu->addAction(tr("Importer en m&asse..."), this, SLOT(massImport()), QKeySequence("Shift+Ctrl+I"));
-	actionArchive = menu->addAction(tr("Archive Mana&ger..."), this, SLOT(archiveManager()), QKeySequence("Ctrl+K"));
-	menu->addSeparator();
-	actionRun = menu->addAction(QIcon(":/images/ff7.png"), tr("R&un FF7"), this, SLOT(runFF7()));
+	fileMenu->addMenu(_recentMenu);
+	actionSave = fileMenu->addAction(QApplication::style()->standardIcon(QStyle::SP_DialogSaveButton), tr("&Save"), this, SLOT(save()), QKeySequence("Ctrl+S"));
+	actionSaveAs = fileMenu->addAction(tr("Save &As..."), this, SLOT(saveAs()), QKeySequence("Shift+Ctrl+S"));
+	actionExport = fileMenu->addAction(tr("&Export the current map..."), this, SLOT(exportCurrentMap()), QKeySequence("Ctrl+E"));
+	actionMassExport = fileMenu->addAction(tr("&Mass Export..."), this, SLOT(massExport()), QKeySequence("Shift+Ctrl+E"));
+	actionImport = fileMenu->addAction(tr("&Import to current map..."), this, SLOT(importToCurrentMap()), QKeySequence("Ctrl+I"));
+//	actionMassImport = fileMenu->addAction(tr("Mass &import..."), this, SLOT(massImport()), QKeySequence("Shift+Ctrl+I"));
+	actionArchive = fileMenu->addAction(tr("Archive Mana&ger..."), this, SLOT(archiveManager()), QKeySequence("Ctrl+K"));
+	fileMenu->addSeparator();
+	actionRun = fileMenu->addAction(QIcon(":/images/ff7.png"), tr("R&un FF7"), this, SLOT(runFF7()));
 	actionRun->setShortcut(Qt::Key_F8);
 	actionRun->setShortcutContext(Qt::ApplicationShortcut);
 	actionRun->setEnabled(!Data::ff7AppPath().isEmpty());
-	menu->addSeparator();
-	actionClose = menu->addAction(QApplication::style()->standardIcon(QStyle::SP_DialogCloseButton), tr("C&lose"), this, SLOT(closeFile()));
-	menu->addAction(tr("E&xit"), this, SLOT(close()), QKeySequence::Quit)->setMenuRole(QAction::QuitRole);
+	fileMenu->addSeparator();
+	actionClose = fileMenu->addAction(QApplication::style()->standardIcon(QStyle::SP_DialogCloseButton), tr("C&lose"), this, SLOT(closeFile()));
+	fileMenu->addAction(tr("E&xit"), this, SLOT(close()), QKeySequence::Quit)->setMenuRole(QAction::QuitRole);
 
 	/* "Tools" Menu */
 	menu = menuBar->addMenu(tr("T&ools"));
-	menu->addAction(tr("&Texts..."), this, SLOT(textManager()), QKeySequence("Ctrl+T"));
-	actionModels = menu->addAction(tr("Field &Models..."), this, SLOT(modelManager()), QKeySequence("Ctrl+M"));
+	QAction *actionText = menu->addAction(QIcon(":/images/text-editor.png"), tr("&Texts..."), this, SLOT(textManager()), QKeySequence("Ctrl+T"));
+	actionModels = menu->addAction(QIcon(":/images/model.png"), tr("Map &Models..."), this, SLOT(modelManager()), QKeySequence("Ctrl+M"));
 	actionEncounter = menu->addAction(tr("Encounte&rs..."), this, SLOT(encounterManager()), QKeySequence("Ctrl+N"));
 	menu->addAction(tr("Tutorials/&Sounds..."), this, SLOT(tutManager()), QKeySequence("Ctrl+Q"));
-	menu->addAction(tr("&Walkmesh..."), this, SLOT(walkmeshManager()), QKeySequence("Ctrl+W"));
+	QAction *actionWalkmesh = menu->addAction(QIcon(":/images/location.png"), tr("&Walkmesh..."), this, SLOT(walkmeshManager()), QKeySequence("Ctrl+W"));
 	menu->addAction(tr("&Background..."), this, SLOT(backgroundManager()), QKeySequence("Ctrl+B"));
 	actionMisc = menu->addAction(tr("M&iscellaneous..."), this, SLOT(miscManager()));
 	menu->addSeparator();
 	menu->addAction(tr("Variable Mana&ger..."), this, SLOT(varManager()), QKeySequence("Ctrl+G"));
 	actionFind = menu->addAction(QIcon(":/images/find.png"), tr("&Find..."), this, SLOT(searchManager()), QKeySequence::Find);
-	actionMiscOperations = menu->addAction(tr("Miscellaneous Oper&ations..."), this, SLOT(miscOperations()));
-	//menu->addAction(tr("&Police de caractères..."), this, SLOT(fontManager()), QKeySequence("Ctrl+P"));
+	actionMiscOperations = menu->addAction(tr("B&atch processing..."), this, SLOT(miscOperations()));
 
 	/* "Settings" Menu */
 	menu = menuBar->addMenu(tr("&Settings"));
@@ -113,7 +114,7 @@
 
 	menuLang->addSeparator();
 	QTranslator translator;
-	foreach(const QString &str, stringList) {
+	for (const QString &str : qAsConst(stringList)) {
 		translator.load(dir.filePath(str));
 		action = menuLang->addAction(translator.translate("Window", "English"));
 		QString lang = str.mid(14, 2);
@@ -138,31 +139,40 @@
 	toolBar->addAction(actionFind);
 	actionFind->setStatusTip(tr("Find"));
 	toolBar->addAction(actionRun);
+	toolBar->addSeparator();
+	toolBar->addAction(actionText);
+	actionText->setStatusTip(tr("Text editor"));
+	toolBar->addAction(actionModels);
+	actionModels->setStatusTip(tr("Model loader editor"));
+	toolBar->addAction(actionWalkmesh);
+	toolBar->addSeparator();
+	toolBar->addAction(actionArchive);
+	actionWalkmesh->setStatusTip(tr("Walkmesh editor"));
 	authorAction = toolBar->addWidget(toolBarRight);
 
-	fieldList = new FieldList(this);
+	_fieldList = new FieldList(this);
 
 	zoneImage = new ApercuBG();
-	if(Config::value("OpenGL", true).toBool()) {
+	if (Config::value("OpenGL", true).toBool()) {
 		fieldModel = new FieldModel();
 //		modelThread = new FieldModelThread(this);
 
 //		connect(modelThread, SIGNAL(modelLoaded(Field*,FieldModelFile*,int,int,bool)), SLOT(showModel(Field*,FieldModelFile*)));
 	} else {
-		fieldModel = 0;
+		fieldModel = nullptr;
 	}
 
 	zonePreview = new QStackedWidget(this);
 	zonePreview->addWidget(zoneImage);
-	if(fieldModel) {
+	if (fieldModel) {
 		zonePreview->addWidget(fieldModel);
 	}
 
 	QWidget *fullFieldList = new QWidget(this);
 	QVBoxLayout *fieldListLayout = new QVBoxLayout(fullFieldList);
-	// fieldListLayout->addWidget(fieldList->toolBar());
-	fieldListLayout->addWidget(fieldList, 1);
-	fieldListLayout->addWidget(fieldList->lineSearch());
+	fieldListLayout->addWidget(_fieldList->toolBar());
+	fieldListLayout->addWidget(_fieldList, 1);
+	fieldListLayout->addWidget(_fieldList->lineSearch());
 	fieldListLayout->setSpacing(2);
 	zonePreview->setContentsMargins(fieldListLayout->contentsMargins());
 
@@ -175,34 +185,56 @@
 	horizontalSplitter->restoreState(Config::value("horizontalSplitterState").toByteArray());
 	horizontalSplitter->setCollapsed(1, !Config::value("backgroundVisible", true).toBool());
 
+	_fieldStackedWidget = new QStackedWidget(this);
+	_fieldStackedWidget->setContentsMargins(QMargins());
+
 	_scriptManager = new ScriptManager(this);
+	EmptyFieldWidget *emptyFieldWidget = new EmptyFieldWidget();
+
+	_fieldStackedWidget->addWidget(_scriptManager);
+	_fieldStackedWidget->addWidget(emptyFieldWidget);
 
 	verticalSplitter = new Splitter(Qt::Horizontal, this);
 	verticalSplitter->addWidget(horizontalSplitter);
-	verticalSplitter->addWidget(_scriptManager);
+	verticalSplitter->addWidget(_fieldStackedWidget);
 	verticalSplitter->setStretchFactor(0, 3);
 	verticalSplitter->setStretchFactor(1, 9);
 	verticalSplitter->setCollapsible(1, false);
 	verticalSplitter->restoreState(Config::value("verticalSplitterState").toByteArray());
 	verticalSplitter->setCollapsed(0, !Config::value("fieldListVisible", true).toBool());
 
-	setCentralWidget(verticalSplitter);
+	_mainStackedWidget = new QStackedWidget(this);
+	_mainStackedWidget->addWidget(verticalSplitter);
+	_mainStackedWidget->setContentsMargins(QMargins());
+
+	setCentralWidget(_mainStackedWidget);
 
 	searchDialog = new Search(this);
 	menuBar->addMenu(createPopupMenu());
-	menuBar->addAction("&?", this, SLOT(about()))->setMenuRole(QAction::AboutRole);
+#ifndef Q_OS_MAC
+	menuBar->addAction(tr("&?"), this, SLOT(about()))->setMenuRole(QAction::AboutRole);
+#else
+	fileMenu->addAction(tr("&?"), this, SLOT(about()))->setMenuRole(QAction::AboutRole);
+#endif
 
 	setMenuBar(menuBar);
 
-	connect(fieldList, SIGNAL(itemSelectionChanged()), SLOT(openField()));
+	connect(_fieldList, SIGNAL(itemSelectionChanged()), SLOT(openField()));
+	connect(_fieldList, SIGNAL(changed()), SLOT(setModified()));
+	connect(_fieldList, SIGNAL(fieldDeleted()), SLOT(setFieldDeleted()));
 	connect(zoneImage, SIGNAL(clicked()), SLOT(backgroundManager()));
 	connect(searchDialog, SIGNAL(found(int,int,int,int)), SLOT(gotoOpcode(int,int,int,int)));
 	connect(searchDialog, SIGNAL(foundText(int,int,int,int)), SLOT(gotoText(int,int,int,int)));
 	connect(_scriptManager, SIGNAL(groupScriptCurrentChanged(int)), SLOT(showModel(int)));
 	connect(_scriptManager, SIGNAL(editText(int)), SLOT(textManager(int)));
 	connect(_scriptManager, SIGNAL(changed()), SLOT(setModified()));
+	connect(_scriptManager, SIGNAL(searchOpcode(int)), SLOT(searchOpcode(int)));
+	connect(emptyFieldWidget, SIGNAL(createMapClicked()), SLOT(createCurrentMap()));
+	connect(emptyFieldWidget, SIGNAL(importMapClicked()), SLOT(importToCurrentMap()));
 
-	fieldList->sortItems(Config::value("fieldListSortColumn").toInt(),
+	connect(&timer, SIGNAL(timeout()), SLOT(processEvents()));
+
+	_fieldList->sortItems(Config::value("fieldListSortColumn", 1).toInt(),
 	                     Qt::SortOrder(Config::value("fieldListSortOrder").toBool()));
 
 	restoreState(Config::value("windowState").toByteArray());
@@ -214,7 +246,7 @@
 Window::~Window()
 {
 	Config::flush();
-	if(fieldArchive) {
+	if (fieldArchive) {
 		fieldArchive->close();
 	}
 }
@@ -232,7 +264,7 @@
 
 void Window::closeEvent(QCloseEvent *event)
 {
-	if(!isEnabled() || closeFile(true) == QMessageBox::Cancel) {
+	if (!isEnabled() || closeFile(true) == QMessageBox::Cancel) {
 		event->ignore();
 	} else {
 		Config::setValue("windowState", saveState());
@@ -241,10 +273,10 @@
 		Config::setValue("verticalSplitterState", verticalSplitter->saveState());
 		Config::setValue("fieldListVisible", !verticalSplitter->isCollapsed(0));
 		Config::setValue("backgroundVisible", !horizontalSplitter->isCollapsed(1));
-		Config::setValue("fieldListSortColumn", fieldList->sortColumn());
-		Config::setValue("fieldListSortOrder", int(fieldList->header()->sortIndicatorOrder()));
+		Config::setValue("fieldListSortColumn", _fieldList->sortColumn());
+		Config::setValue("fieldListSortOrder", int(_fieldList->header()->sortIndicatorOrder()));
 		_scriptManager->saveConfig();
-		if(_walkmeshManager) {
+		if (_walkmeshManager) {
 			_walkmeshManager->saveConfig();
 		}
 		event->accept();
@@ -256,14 +288,14 @@
 	QMenu *menu = new QMenu(tr("&View"), this);
 	menu->addAction(toolBar->toggleViewAction());
 	QAction *action;
-	action = menu->addAction(tr("Field List"), this, SLOT(toggleFieldList()));
+	action = menu->addAction(tr("Map List"), this, SLOT(toggleFieldList()));
 	action->setCheckable(true);
 	action->setChecked(!verticalSplitter->isCollapsed(0));
 	action = menu->addAction(tr("Background Preview"), this, SLOT(toggleBackgroundPreview()));
 	action->setCheckable(true);
 	action->setChecked(!horizontalSplitter->isCollapsed(1));
 	menu->addSeparator();
-	foreach(QAction *action, _scriptManager->actions()) {
+	for (QAction *action : _scriptManager->actions()) {
 		menu->addAction(action);
 	}
 	return menu;
@@ -273,11 +305,11 @@
 {
 	_recentMenu->clear();
 
-	foreach(const QString &recentFile, Config::value("recentFiles").toStringList()) {
+	for (const QString &recentFile : Config::value("recentFiles").toStringList()) {
 		_recentMenu->addAction(QDir::toNativeSeparators(recentFile));
 	}
 
-	if(_recentMenu->actions().isEmpty()) {
+	if (_recentMenu->actions().isEmpty()) {
 		_recentMenu->setDisabled(true);
 	}
 }
@@ -294,13 +326,13 @@
 
 FieldArchive::Sorting Window::getFieldSorting()
 {
-	return fieldList->getFieldSorting();
+	return _fieldList->getFieldSorting();
 }
 
 void Window::jpText(bool enabled)
 {
 	Config::setValue("jp_txt", enabled);
-	if(_textDialog) {
+	if (_textDialog) {
 		_textDialog->updateText();
 	}
 	_scriptManager->fillOpcodes();
@@ -309,7 +341,7 @@
 void Window::changeLanguage(QAction *action)
 {
 	Config::setValue("lang", action->data());
-	foreach(QAction *act, menuLang->actions())
+	for (QAction *act : menuLang->actions())
 		act->setChecked(false);
 
 	action->setChecked(true);
@@ -320,7 +352,7 @@
 {
 	QString title, text;
 	QTranslator translator;
-	if(translator.load(QString("Makou_Reactor_%1")
+	if (translator.load(QString("Makou_Reactor_%1")
 	                   .arg(Config::value("lang").toString()),
 	                   qApp->applicationDirPath())) {
 		title = translator.translate("Window", "Settings changed");
@@ -334,64 +366,74 @@
 
 int Window::closeFile(bool quit)
 {
-	if(fieldList->currentItem() != NULL) {
-		Config::setValue("currentField", fieldList->currentItem()->text(0));
+	if (_fieldList->currentItem() != nullptr) {
+		Config::setValue("currentField", _fieldList->currentItem()->text(0));
 	}
 
-	if(actionSave->isEnabled() && fieldArchive != NULL) {
+	if (actionSave->isEnabled() && fieldArchive != nullptr) {
 		QString fileChangedList;
+		FieldArchiveIterator it(*fieldArchive);
+
 		int i = 0;
-		for(int j = 0 ; j < fieldArchive->size() ; ++j) {
-			Field *curField = fieldArchive->field(j, false);
-			if(curField && curField->isOpen() && curField->isModified()) {
+		while (it.hasNext()) {
+			Field *curField = it.next(false);
+			if (curField && curField->isOpen() && curField->isModified()) {
 				fileChangedList += "\n - " + curField->name();
-				if(i > 10) {
+				if (i > 10) {
 					fileChangedList += "\n...";
 					break;
 				}
 				i++;
 			}
 		}
-		if(!fileChangedList.isEmpty()) {
+
+		if (!fileChangedList.isEmpty()) {
 			fileChangedList.prepend(tr("\n\nEdited files:"));
 		}
 		int reponse = QMessageBox::warning(this, tr("Save"), tr("Would you like to save changes of %1?%2").arg(fieldArchive->io()->name()).arg(fileChangedList), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
-		if(reponse == QMessageBox::Yes) {
+		if (reponse == QMessageBox::Yes) {
 			save();
-		} else if(reponse == QMessageBox::Cancel) {
+		} else if (reponse == QMessageBox::Cancel) {
 			return reponse;
 		}
-		if(quit) {
+		if (quit) {
 			return reponse;
 		}
 	}
 
-	if(!quit) {
-		if(varDialog) {
-			varDialog->setFieldArchive(NULL);
+	if (!quit) {
+		if (varDialog) {
+			varDialog->setFieldArchive(nullptr);
+		}
+
+		if (_lgpWidget != nullptr) {
+			actionArchive->setText(tr("Archive Mana&ger..."));
+			_mainStackedWidget->removeWidget(_lgpWidget);
+			delete _lgpWidget;
+			_lgpWidget = nullptr;
 		}
 
-		if(fieldArchive != NULL) {
+		if (fieldArchive != nullptr) {
 			delete fieldArchive;
-			fieldArchive = NULL;
+			fieldArchive = nullptr;
 		}
-		field = NULL;
+		field = nullptr;
 
-		fieldList->blockSignals(true);
-		fieldList->clear();
-		fieldList->setEnabled(false);
-		fieldList->blockSignals(false);
+		_fieldList->blockSignals(true);
+		_fieldList->clear();
+		_fieldList->setEnabled(false);
+		_fieldList->blockSignals(false);
 
 		disableEditors();
 		_scriptManager->removeCopiedReferences();
-		if(_modelManager) {
+		if (_modelManager) {
 			_modelManager->close();
 			_modelManager->deleteLater();
-			_modelManager = 0;
+			_modelManager = nullptr;
 		}
 		setWindowModified(false);
 		setWindowTitle();
-		searchDialog->setFieldArchive(NULL);
+		searchDialog->setFieldArchive(nullptr);
 
 		actionSave->setEnabled(false);
 		actionSaveAs->setEnabled(false);
@@ -407,6 +449,8 @@
 		actionMiscOperations->setEnabled(false);
 	}
 
+	timer.stop();
+
 	return QMessageBox::Yes;
 }
 
@@ -417,37 +461,39 @@
 
 void Window::openFile(const QString &path)
 {
+	timer.stop();
+
 	QString filePath;
 
-	if(path.isEmpty()) {
+	if (path.isEmpty()) {
 		filePath = Config::value("open_path").toString();
-		if(filePath.isEmpty()) {
+		if (filePath.isEmpty()) {
 			filePath = Data::ff7DataPath();
-			if(!filePath.isEmpty())
+			if (!filePath.isEmpty())
 				filePath.append("/field");
 		}
 		QStringList filter;
 		filter.append(tr("Compatible Files (*.lgp *.DAT *.bin *.iso *.img)"));
 		filter.append(tr("Lgp Files (*.lgp)"));
 		filter.append(tr("DAT File (*.DAT)"));
-		filter.append(tr("PC Field File (*)"));
+		filter.append(tr("PC field File (*)"));
 		filter.append(tr("Disc Image (*.bin *.iso *.img)"));
 
 		QString selectedFilter = filter.value(Config::value("open_path_selected_filter").toInt(), filter.first());
 
 		filePath = QFileDialog::getOpenFileName(this, tr("Open a file"), filePath, filter.join(";;"), &selectedFilter);
-		if(filePath.isNull()) {
+		if (filePath.isNull()) {
 			return;
 		}
 
 		int index = filePath.lastIndexOf('/');
-		if(index == -1)	index = filePath.size();
+		if (index == -1)	index = filePath.size();
 		Config::setValue("open_path", filePath.left(index));
 		Config::setValue("open_path_selected_filter", filter.indexOf(selectedFilter));
 		QStringList recentFiles = Config::value("recentFiles").toStringList();
-		if(!recentFiles.contains(filePath)) {
+		if (!recentFiles.contains(filePath)) {
 			recentFiles.prepend(filePath);
-			if(recentFiles.size() > 20) {
+			if (recentFiles.size() > 20) {
 				recentFiles.removeLast();
 			}
 			Config::setValue("recentFiles", recentFiles);
@@ -461,14 +507,14 @@
 	FieldArchiveIO::Type type;
 	QString ext = filePath.mid(filePath.lastIndexOf('.') + 1).toLower();
 
-	if(ext == "iso" || ext == "bin" || ext == "img") {
+	if (ext == "iso" || ext == "bin" || ext == "img") {
 		isPS = true;
 		type = FieldArchiveIO::Iso;
 	} else {
-		if(ext == "dat") {
+		if (ext == "dat") {
 			isPS = true;
 			type = FieldArchiveIO::File;
-		} else if(ext == "lgp") {
+		} else if (ext == "lgp") {
 			isPS = false;
 			type = FieldArchiveIO::Lgp;
 		} else {
@@ -485,7 +531,7 @@
 	QString filePath = QFileDialog::getExistingDirectory(this,
 														  tr("Select a folder containing the Final Fantasy VII field files"),
 														  Config::value("open_dir_path").toString());
-	if(filePath.isNull())	{
+	if (filePath.isNull())	{
 		return;
 	}
 
@@ -500,7 +546,7 @@
 	                *pcButton = question.addButton(tr("PC"), QMessageBox::AcceptRole);
 	question.addButton(QMessageBox::Cancel);
 	question.exec();
-	if(question.clickedButton() != psButton
+	if (question.clickedButton() != psButton
 			&& question.clickedButton() != pcButton) {
 		return;
 	}
@@ -515,8 +561,14 @@
 
 void Window::setObserverMaximum(unsigned int max)
 {
-	taskBarButton->setMaximum(max);
-	progressDialog()->setMaximum(max);
+	taskBarButton->setMaximum(int(max));
+	progressDialog()->setMaximum(int(max));
+}
+
+bool Window::observerRetry(const QString &message)
+{
+	return QMessageBox::Retry == QMessageBox::question(this, tr("Error"), message,
+	                                                   QMessageBox::Retry | QMessageBox::Cancel, QMessageBox::Retry);
 }
 
 void Window::setObserverValue(int value)
@@ -531,6 +583,7 @@
 {
 	setObserverValue(0);
 	taskBarButton->setState(QTaskBarButton::Normal);
+	timer.start(100);
 	progressDialog()->setLabelText(message);
 	progressDialog()->setCancelButtonText(canBeCanceled ? tr("Cancel") : tr("Stop"));
 	progressDialog()->show();
@@ -539,15 +592,21 @@
 void Window::hideProgression()
 {
 	taskBarButton->setState(QTaskBarButton::Invisible);
+	timer.stop();
 	progressDialog()->hide();
 	progressDialog()->reset();
 }
 
+void Window::processEvents() const
+{
+	QCoreApplication::processEvents();
+}
+
 void Window::open(const QString &filePath, FieldArchiveIO::Type type, bool isPS)
 {
 	closeFile();
 
-	if(isPS) {
+	if (isPS) {
 		fieldArchive = new FieldArchivePS(filePath, type);
 	} else {
 		fieldArchive = new FieldArchivePC(filePath, type);
@@ -562,13 +621,13 @@
 	hideProgression();
 
 	QString out;
-	switch(error)
+	switch (error)
 	{
 	case FieldArchiveIO::Ok:
 	case FieldArchiveIO::Aborted:
 		break;
 	case FieldArchiveIO::FieldNotFound:
-		if(fieldArchive->io()->type() == FieldArchiveIO::Lgp) {
+		if (fieldArchive->io()->type() == FieldArchiveIO::Lgp) {
 			actionArchive->setEnabled(true);
 			setWindowTitle();
 			archiveManager();
@@ -587,13 +646,13 @@
 		out = tr("Can not create temporary file");
 		break;
 	case FieldArchiveIO::ErrorRemoving:
-		out = tr("Unable to remove the file");
+		out = tr("Unable to remove the file, check write permissions.");
 		break;
 	case FieldArchiveIO::ErrorRenaming:
-		out = tr("Failed to rename file.");
+		out = tr("Failed to rename the file, check write permissions.");
 		break;
 	case FieldArchiveIO::ErrorCopying:
-		out = tr("Failed to copy file");
+		out = tr("Failed to copy the file, check write permissions.");
 		break;
 	case FieldArchiveIO::Invalid:
 		out = tr("Invalid file");
@@ -602,53 +661,52 @@
 		out = tr("This error should not appear, thank you for reporting it");
 		break;
 	}
-	if(!out.isEmpty()) {
+	if (!out.isEmpty()) {
 		QMessageBox::warning(this, tr("Error"), out);
 		fieldArchive->close();
 		return;
 	}
 
-	fieldList->fill(fieldArchive);
-	fieldList->setEnabled(true);
+	_fieldList->fill(fieldArchive);
 	zonePreview->setEnabled(true);
 
 	// Select memorized entry
 	QString previousSessionField = Config::value("currentField").toString();
-	if(!previousSessionField.isEmpty()) {
-		QList<QTreeWidgetItem *> items = fieldList->findItems(previousSessionField, Qt::MatchExactly);
-		if(!items.isEmpty()) {
-			fieldList->setCurrentItem(items.first());
+	if (!previousSessionField.isEmpty()) {
+		QList<QTreeWidgetItem *> items = _fieldList->findItems(previousSessionField, Qt::MatchExactly);
+		if (!items.isEmpty()) {
+			_fieldList->setCurrentItem(items.first());
 		}
 	}
 	// Select first entry
-	if(!fieldList->currentItem() && fieldList->topLevelItemCount() > 0) {
-		fieldList->setCurrentItem(fieldList->topLevelItem(0));
+	if (!_fieldList->currentItem() && _fieldList->topLevelItemCount() > 0) {
+		_fieldList->setCurrentItem(_fieldList->topLevelItem(0));
 	}
 
-	fieldList->setFocus();
+	_fieldList->setFocus();
 
-	if(fieldArchive->size() > 0) {
-		if(varDialog)	varDialog->setFieldArchive(fieldArchive);
+	if (fieldArchive->size() > 0) {
+		if (varDialog)	varDialog->setFieldArchive(fieldArchive);
 		searchDialog->setFieldArchive(fieldArchive);
 		actionEncounter->setEnabled(true);
 		actionMisc->setEnabled(true);
 		actionMiscOperations->setEnabled(true);
-		actionExport->setEnabled(true);
 		actionMassExport->setEnabled(true);
 //		actionMassImport->setEnabled(true);
 		actionImport->setEnabled(true);
 		actionModels->setEnabled(true);
 	}
-	if(fieldArchive->io()->type() == FieldArchiveIO::Lgp) {
+	if (fieldArchive->io()->type() == FieldArchiveIO::Lgp) {
 		actionArchive->setEnabled(true);
 	}
 	actionSaveAs->setEnabled(true);
 	actionClose->setEnabled(true);
 
 #ifdef DEBUG_FUNCTIONS
+	//fieldArchive->printScriptsDirs("final_parody_scripts");
 	//FieldArchivePC otherArch("", FieldArchiveIO::Lgp);
 	//fieldArchive->compareTexts(&otherArch);
-	//fieldArchive->searchBackgroundZ();
+	//fieldArchive->printBackgroundTiles(true, false);
 	/* const QStringList &fieldNames = Data::field_names;
 	QStringList fieldNamesPC = fieldNames;
 	Data::toPCMaplist(fieldNamesPC);
@@ -673,7 +731,8 @@
 			}
 		}
 	} */
-	//fieldArchive->printTexts("field-texts.txt");
+	//fieldArchive->printTextsDir("field-texts", true);
+	//fieldArchive->printTexts("field-texts.txt", true);
 	//fieldArchive->printAkaos("field-akaos.txt");
 	//fieldArchive->printModelLoaders("field-model-loaders-generic.txt");
 	//fieldArchive->printModelLoaders("field-model-loaders.txt", false);
@@ -685,27 +744,27 @@
 void Window::setWindowTitle()
 {
 	QString windowTitle;
-	if(fieldArchive) {
-		QList<QTreeWidgetItem *> selectedItems = fieldList->selectedItems();
+	if (fieldArchive) {
+		QList<QTreeWidgetItem *> selectedItems = _fieldList->selectedItems();
 		QString current;
-		if(!selectedItems.isEmpty()) {
+		if (!selectedItems.isEmpty()) {
 			current = selectedItems.first()->text(0);
 		}
 
-		if(!fieldArchive->io()->hasName()) { // [*][current - ]PROG_NAME
+		if (!fieldArchive->io()->hasName()) { // [*][current - ]PROG_NAME
 			windowTitle = "[*]";
 
-			if(!current.isEmpty()) {
+			if (!current.isEmpty()) {
 				 windowTitle.append(current).append(" - ");
 			}
 		} else { // [current ](*archive) - PROG_NAME
-			if(!current.isEmpty()) {
+			if (!current.isEmpty()) {
 				 windowTitle.append(current).append(" (");
 			}
 
 			windowTitle.append("[*]").append(fieldArchive->io()->name());
 
-			if(!current.isEmpty()) {
+			if (!current.isEmpty()) {
 				 windowTitle.append(")");
 			}
 
@@ -716,17 +775,12 @@
 	QWidget::setWindowTitle(windowTitle.append(PROG_FULLNAME));
 }
 
-int Window::currentFieldId() const
-{
-	return fieldList->currentFieldId();
-}
-
 void Window::disableEditors()
 {
 	zoneImage->clear();
-	if(fieldModel) {
+	if (fieldModel) {
 		fieldModel->clear();
-//		if(fieldArchive && fieldArchive->io()->isPC()) {
+//		if (fieldArchive && fieldArchive->io()->isPC()) {
 //			modelThread->cancel();
 //			modelThread->wait();
 //		}
@@ -738,23 +792,23 @@
 	_scriptManager->setEnabled(false);
 
 	authorAction->setVisible(false);
-	if(_textDialog) {
+	if (_textDialog) {
 		_textDialog->clear();
 		_textDialog->setEnabled(false);
 	}
-	if(_modelManager) {
+	if (_modelManager) {
 		_modelManager->clear();
 		_modelManager->setEnabled(false);
 	}
-	if(_tutManager) {
+	if (_tutManager) {
 		_tutManager->clear();
 		_tutManager->setEnabled(false);
 	}
-	if(_walkmeshManager) {
+	if (_walkmeshManager) {
 		_walkmeshManager->clear();
 		_walkmeshManager->setEnabled(false);
 	}
-	if(_backgroundManager) {
+	if (_backgroundManager) {
 		_backgroundManager->clear();
 		_backgroundManager->setEnabled(false);
 	}
@@ -762,72 +816,80 @@
 
 void Window::openField(bool reload)
 {
-	if(!fieldArchive) {
+	_fieldStackedWidget->setCurrentIndex(0);
+	actionExport->setEnabled(false);
+
+	if (!fieldArchive) {
 		return;
 	}
 
-	int fieldId = currentFieldId();
-	if(fieldId < 0) {
+	int mapId = _fieldList->currentMapId();
+	if (mapId < 0) {
 		disableEditors();
 		return;
 	}
-	fieldList->scrollToItem(fieldList->selectedItems().first());
+	_fieldList->scrollToItem(_fieldList->selectedItems().first());
 
 //	Data::currentCharNames.clear();
-	Data::currentHrcNames = 0;
-	Data::currentAnimNames = 0;
+	Data::currentHrcNames = nullptr;
+	Data::currentAnimNames = nullptr;
 
 	setWindowTitle();
 
-//	if(fieldModel && fieldArchive->io()->isPC()) {
+//	if (fieldModel && fieldArchive->io()->isPC()) {
 //		modelThread->cancel();
 //		modelThread->wait();
 
-//		if(_walkmeshManager)	_walkmeshManager->clear();
+//		if (_walkmeshManager)	_walkmeshManager->clear();
 //	}
 
-	if(field) {
+	if (field) {
 		BackgroundFile *bgFile = field->background(false);
-		if(!bgFile->isModified()) {
+		if (!bgFile->isModified()) {
 			bgFile->clear();
 			bgFile->close();
 		}
 	}
 
 	// Get and set field
-	field = fieldArchive->field(fieldId, true, true);
-	if(!field) {
+	field = fieldArchive->field(quint32(mapId), true, true);
+	if (!field) {
+		if (fieldArchive->isPC()) {
+			_fieldStackedWidget->setCurrentIndex(1);
+		}
 		disableEditors();
 		return;
 	}
 
-	if(fieldModel) {
+	actionExport->setEnabled(true);
+
+	if (fieldModel) {
 		fieldModel->clear();
-		//if(fieldArchive->io()->isPC()) {
+		//if (fieldArchive->io()->isPC()) {
 		//	modelThread->setField(field);
 		//}
 	}
-	if(_textDialog && (reload || _textDialog->isVisible())) {
+	if (_textDialog && (reload || _textDialog->isVisible())) {
 		_textDialog->setField(field, reload);
 		_textDialog->setEnabled(true);
 	}
-	if(_modelManager && (reload || _modelManager->isVisible())) {
+	if (_modelManager && (reload || _modelManager->isVisible())) {
 		_modelManager->fill(field, reload);
 		_modelManager->setEnabled(true);
 	}
-	if(_tutManager && (reload || _tutManager->isVisible())) {
-		TutFilePC *tutPC = NULL;
-		if(fieldArchive->isPC()) {
+	if (_tutManager && (reload || _tutManager->isVisible())) {
+		TutFilePC *tutPC = nullptr;
+		if (fieldArchive->isPC()) {
 			tutPC = static_cast<FieldArchivePC *>(fieldArchive)->tut(field->name());
 		}
 		_tutManager->fill(field, tutPC, reload);
 		_tutManager->setEnabled(true);
 	}
-	if(_walkmeshManager && (reload || _walkmeshManager->isVisible())) {
+	if (_walkmeshManager && (reload || _walkmeshManager->isVisible())) {
 		_walkmeshManager->fill(field, reload);
 		_walkmeshManager->setEnabled(true);
 	}
-	if(_backgroundManager && (reload || _backgroundManager->isVisible())) {
+	if (_backgroundManager && (reload || _backgroundManager->isVisible())) {
 		_backgroundManager->fill(field, reload);
 		_backgroundManager->setEnabled(true);
 	}
@@ -857,11 +919,11 @@
 
 void Window::showModel(int grpScriptID)
 {
-	if(grpScriptID >= 0) {
-		int modelID = field->scriptsAndTexts()->modelID(grpScriptID);
+	if (grpScriptID >= 0) {
+		int modelID = field->scriptsAndTexts()->modelID(quint8(grpScriptID));
 		Data::currentModelID = modelID;
-		if(fieldModel && modelID > -1) {
-			// if(fieldArchive->io()->isPC()) {
+		if (fieldModel && modelID > -1) {
+			// if (fieldArchive->io()->isPC()) {
 			//	modelThread->cancel();
 			//	modelThread->wait();
 			//	modelThread->setModel(modelID);
@@ -877,7 +939,7 @@
 
 void Window::showModel(Field *field, FieldModelFile *fieldModelFile)
 {
-	if(fieldModel && this->field == field) {
+	if (fieldModel && this->field == field) {
 		fieldModel->setFieldModelFile(fieldModelFile);
 	}
 	zonePreview->setCurrentIndex(int(fieldModel && fieldModelFile->isValid()));
@@ -885,72 +947,88 @@
 
 void Window::setModified(bool enabled)
 {
-	if(field != NULL)		field->setModified(enabled);
+	if (field != nullptr)		field->setModified(enabled);
 	actionSave->setEnabled(enabled);
 	setWindowModified(enabled);
 
-	int size=fieldList->topLevelItemCount();
-	for(int i=0 ; i<size ; ++i) {
-		QTreeWidgetItem *item = fieldList->topLevelItem(i);
-		int fieldId = item->data(0, Qt::UserRole).toInt();
-		if(fieldId >= 0) {
-			Field *curField = fieldArchive->field(fieldId, false);
-			if(curField && curField->isOpen()) {
-				if(enabled && curField->isModified()) {
-					item->setForeground(0, QColor(0xd1,0x1d,0x1d));
-				} else if(!enabled && item->foreground(0).color() == QColor(0xd1,0x1d,0x1d)) {
-					item->setForeground(0, QColor(0x1d,0xd1,0x1d));
+	QColor red = Data::color(Data::ColorRedForeground),
+	       green = Data::color(Data::ColorGreenForeground);
+	int size=_fieldList->topLevelItemCount();
+	for (int i=0; i<size; ++i) {
+		QTreeWidgetItem *item = _fieldList->topLevelItem(i);
+		int mapId = item->data(0, Qt::UserRole).toInt();
+		if (mapId >= 0) {
+			Field *curField = fieldArchive->field(quint32(mapId), false);
+			if (curField) {
+				if (enabled && curField->isModified()) {
+					item->setForeground(0, red);
+				} else if (!enabled && item->foreground(0).color() == red) {
+					item->setForeground(0, green);
 				}
 			}
 		}
 	}
 }
 
+void Window::setFieldDeleted()
+{
+	field = nullptr;
+	actionSave->setEnabled(true);
+	setWindowModified(true);
+
+	openField();
+}
+
 void Window::save() { saveAs(true); }
 
 void Window::saveAs(bool currentPath)
 {
-	if(!fieldArchive) return;
+	if (!fieldArchive) {
+		return;
+	}
 
-	int fieldID, groupID, scriptID, opcodeID;
+	int mapID, groupID, scriptID, opcodeID;
 	QString errorStr;
 
 	setEnabled(false);
-	bool compiled = fieldArchive->compileScripts(fieldID, groupID, scriptID, opcodeID, errorStr);
+	bool compiled = fieldArchive->compileScripts(mapID, groupID, scriptID, opcodeID, errorStr);
 	setEnabled(true);
 
-	if(!compiled) {
+	if (!compiled) {
 		QMessageBox::warning(this, tr("Compilation Error"), tr("Error Compiling Scripts:\n"
-																   "scene %1 (%2), group %3 (%4), script %5, line %6: %7")
-							 .arg(fieldArchive->field(fieldID)->name())
-							 .arg(fieldID)
-							 .arg(fieldArchive->field(fieldID)->scriptsAndTexts()->grpScript(groupID)->name())
-							 .arg(groupID).arg(scriptID)
-							 .arg(opcodeID+1).arg(errorStr));
-		gotoOpcode(fieldID, groupID, scriptID, opcodeID);
+		                                                       "scene %1 (%2), group %3 (%4), script %5, line %6: %7")
+		                     .arg(fieldArchive->field(quint32(mapID))->name())
+		                     .arg(mapID)
+		                     .arg(fieldArchive->field(quint32(mapID))->scriptsAndTexts()->grpScript(groupID)->name())
+		                     .arg(groupID).arg(scriptID)
+		                     .arg(opcodeID+1).arg(errorStr));
+		gotoOpcode(mapID, groupID, scriptID, opcodeID);
 		_scriptManager->opcodeList()->setErrorLine(opcodeID);
 		return;
 	}
 
 	QString path;
-	if(!currentPath)
-	{
-		if(fieldArchive->io()->type() == FieldArchiveIO::Dir) {
+	if (!currentPath) {
+		if (fieldArchive->io()->type() == FieldArchiveIO::Dir) {
 			path = QFileDialog::getExistingDirectory(this, tr("Save Directory As"), fieldArchive->io()->path());
-			if(path.isNull())		return;
+			if (path.isNull()) {
+				return;
+			}
 		} else {
 			QString filter;
-			if(fieldArchive->io()->type() == FieldArchiveIO::Lgp) {
+			if (fieldArchive->io()->type() == FieldArchiveIO::Lgp) {
 				filter = tr("Lgp File (*.lgp)");
-			} else if(fieldArchive->io()->type() == FieldArchiveIO::File) {
+			} else if (fieldArchive->io()->type() == FieldArchiveIO::File) {
 				filter = tr("DAT File (*.DAT)");
-			} else if(fieldArchive->io()->type() == FieldArchiveIO::Iso) {
+			} else if (fieldArchive->io()->type() == FieldArchiveIO::Iso) {
 				filter = tr("Iso File (*.iso *.bin *.img)");
 			} else {
 				return;
 			}
 			path = QFileDialog::getSaveFileName(this, tr("Save As"), fieldArchive->io()->path(), filter);
-			if(path.isNull())		return;
+			if (path.isNull()) {
+				return;
+			}
 		}
 	}
 
@@ -963,8 +1041,7 @@
 
 	hideProgression();
 	QString out;
-	switch(error)
-	{
+	switch (error) {
 	case FieldArchiveIO::Ok:
 		setModified(false);
 		setWindowTitle();
@@ -972,7 +1049,7 @@
 	case FieldArchiveIO::Aborted:
 		break;
 	case FieldArchiveIO::FieldNotFound:
-		out = tr("Nothing found!");
+		out = tr("No maps found");
 		break;
 	case FieldArchiveIO::ErrorOpening:
 		out = tr("The file is inaccessible");
@@ -996,18 +1073,24 @@
 		out = tr("This feature is not complete");
 		break;
 	}
-	if(!out.isEmpty())	QMessageBox::warning(this, tr("Error"), out);
+	if (!out.isEmpty()) {
+		QMessageBox::warning(this, tr("Error"), out);
+	}
 }
 
-bool Window::gotoField(int fieldID)
+bool Window::gotoField(int mapID)
 {
-	int i, size=fieldList->topLevelItemCount();
-	for(i=0 ; i<size ; ++i) {
-		QTreeWidgetItem *item = fieldList->topLevelItem(i);
-		if(item->data(0, Qt::UserRole).toInt() == fieldID) {
+	if (_fieldList->currentMapId() == mapID) {
+		return true;
+	}
+
+	int i, size=_fieldList->topLevelItemCount();
+	for (i=0; i<size; ++i) {
+		QTreeWidgetItem *item = _fieldList->topLevelItem(i);
+		if (item->data(0, Qt::UserRole).toInt() == mapID) {
 			blockSignals(true);
-			fieldList->setCurrentItem(item);
-			fieldList->scrollToItem(item);
+			_fieldList->setCurrentItem(item);
+			_fieldList->scrollToItem(item);
 			blockSignals(false);
 			return true;
 		}
@@ -1015,38 +1098,38 @@
 	return false;
 }
 
-void Window::gotoOpcode(int fieldID, int grpScriptID, int scriptID, int opcodeID)
+void Window::gotoOpcode(int mapID, int grpScriptID, int scriptID, int opcodeID)
 {
-	if(gotoField(fieldID)) {
+	if (gotoField(mapID)) {
 		_scriptManager->blockSignals(true);
 		_scriptManager->gotoOpcode(grpScriptID, scriptID, opcodeID);
 		_scriptManager->blockSignals(false);
 	}
 }
 
-void Window::gotoText(int fieldID, int textID, int from, int size)
+void Window::gotoText(int mapID, int textID, int from, int size)
 {
-	if(_textDialog) {
+	if (_textDialog) {
 		_textDialog->blockSignals(true);
 	}
-	if(gotoField(fieldID)) {
+	if (gotoField(mapID)) {
 		textManager(textID, from, size, false); // show texts dialog
 	}
-	if(_textDialog) {
+	if (_textDialog) {
 		_textDialog->blockSignals(false);
 	}
 }
 
 /* void Window::notifyFileChanged(const QString &path)
 {
-	if(!QFile::exists(path)) {
+	if (!QFile::exists(path)) {
 		QMessageBox::warning(this, tr("Fichier supprimé"), tr("Le fichier '%1' a été supprimé par un programme externe !").arg(path));
 	}
 	else
 	{
 		int reponse = QMessageBox::warning(this, tr("Fichier modifié"), tr("Le fichier '%1' a été modifié par un programme externe.\nVoulez-vous recharger ce fichier ?").arg(path)
 			, QMessageBox::Yes | QMessageBox::No);
-		if(reponse == QMessageBox::Yes) {
+		if (reponse == QMessageBox::Yes) {
 			open(path);
 		}
 	}
@@ -1054,93 +1137,111 @@
 
 void Window::notifyDirectoryChanged(const QString &path)
 {
-	if(!QFile::exists(path)) {
+	if (!QFile::exists(path)) {
 		QMessageBox::warning(this, tr("Dossier supprimé"), tr("Le dossier '%1' a été supprimé par un programme externe !").arg(path));
 	}
 	else
 	{
 		int reponse = QMessageBox::warning(this, tr("Dossier modifié"), tr("Le dossier '%1' a été modifié par un programme externe.\nVoulez-vous recharger ce dossier ?").arg(path)
 			, QMessageBox::Yes | QMessageBox::No);
-		if(reponse == QMessageBox::Yes) {
+		if (reponse == QMessageBox::Yes) {
 			open(path, true);
 		}
 	}
 } */
 
-void Window::exporter()
+void Window::exportCurrentMap()
 {
-	if(!field || !fieldArchive) return;
+	if (!field || !fieldArchive) return;
 
 	int index;
 	QString types, name, selectedFilter,
-			fieldLzs = tr("PC Field (*)"),
-			dat = tr("DAT File (*.DAT)"),
-			fieldDec = tr("Uncompressed PC Field (*)");
+			fieldLzs = tr("PC Field Map (*)"),
+			dat = tr("Data DAT File (*.DAT)"),
+			mim = tr("Textures MIM File (*.MIM)"),
+			fieldDec = tr("Uncompressed PC Field Map (*)");
 
-	name = fieldList->selectedItems().first()->text(0);
+	name = _fieldList->selectedItems().first()->text(0);
 
-	if(fieldArchive->io()->isPC()) {
+	if (fieldArchive->io()->isPC()) {
 		types = fieldLzs+";;"+fieldDec;
 	} else {
-		types = dat;
+		types = dat+";;"+mim;
 		name = name.toUpper();
 	}
 
 	QString path = Config::value("exportPath").toString().isEmpty() ? fieldArchive->io()->directory() : Config::value("exportPath").toString()+"/";
 	path = QFileDialog::getSaveFileName(this, tr("Export the current file"), path+name, types, &selectedFilter);
-	if(path.isNull())		return;
-	qint8 error=4;
+	if (path.isNull())		return;
+	int error = 4;
 	bool compressed = selectedFilter != fieldDec;
 	
 	if (field->isModified()) {
 		error = field->save(path, compressed);
 	} else {
-		error = fieldArchive->io()->exportFieldData(field, QString(), path, !compressed);
+		QString extension;
+		if (selectedFilter == dat) {
+			extension = "DAT";
+		} else if (selectedFilter == mim) {
+			extension = "MIM";
+		}
+		error = fieldArchive->io()->exportFieldData(field, extension, path, !compressed);
 	}
 	
 	QString out;
-	switch(error)
-	{
+	switch (error) {
 	case 0:
 		index = path.lastIndexOf('/');
 		Config::setValue("exportPath", index == -1 ? path : path.left(index));
 		break;
-	case 1:	out = tr("Lgp archive is inaccessible");break;
+	case 1:	out = tr("Archive is inaccessible");break;
 	case 2:	out = tr("Error reopening file");break;
 	case 3:	out = tr("Unable to create the new file");break;
 	case 4:	out = tr("Not yet implemented!");break;
 	}
-	if(!out.isEmpty())	QMessageBox::warning(this, tr("Error"), out);
+	if (!out.isEmpty())	QMessageBox::warning(this, tr("Error"), out);
 }
 
 void Window::massExport()
 {
-	if(!fieldArchive) return;
+	if (!fieldArchive) return;
 
 	MassExportDialog *massExportDialog = new MassExportDialog(this);
-	massExportDialog->fill(fieldArchive, currentFieldId());
-	if(massExportDialog->exec() == QDialog::Accepted) {
+	massExportDialog->fill(fieldArchive, _fieldList->currentMapId());
+	if (massExportDialog->exec() == QDialog::Accepted) {
 		QList<int> selectedFields = massExportDialog->selectedFields();
-		if(!selectedFields.isEmpty()) {
+		if (!selectedFields.isEmpty()) {
 			QMap<FieldArchive::ExportType, QString> toExport;
 
 			showProgression(tr("Export..."), false);
 
-			if(massExportDialog->exportModule(MassExportDialog::Fields)) {
+			if (massExportDialog->exportModule(MassExportDialog::Fields)) {
 				toExport.insert(FieldArchive::Fields, massExportDialog->moduleFormat(MassExportDialog::Fields));
 			}
-			if(massExportDialog->exportModule(MassExportDialog::Backgrounds)) {
+			if (massExportDialog->exportModule(MassExportDialog::Backgrounds)) {
 				toExport.insert(FieldArchive::Backgrounds, massExportDialog->moduleFormat(MassExportDialog::Backgrounds));
 			}
-			if(massExportDialog->exportModule(MassExportDialog::Akaos)) {
+			if (massExportDialog->exportModule(MassExportDialog::Akaos)) {
 				toExport.insert(FieldArchive::Akaos, massExportDialog->moduleFormat(MassExportDialog::Akaos));
 			}
-			if(massExportDialog->exportModule(MassExportDialog::Texts)) {
+			if (massExportDialog->exportModule(MassExportDialog::Texts)) {
 				toExport.insert(FieldArchive::Texts, massExportDialog->moduleFormat(MassExportDialog::Texts));
 			}
 
-			if(!fieldArchive->exportation(selectedFields, massExportDialog->directory(),
-									  massExportDialog->overwrite(), toExport)
+			PsfTags tags;
+
+			if (toExport.value(FieldArchive::Akaos) == "minipsf") {
+				PsfDialog psfDialog(this);
+				psfDialog.setNoTitle(true);
+				if (psfDialog.exec() == QDialog::Rejected) {
+					return;
+				}
+
+				tags = psfDialog.tags();
+			}
+
+			if (!fieldArchive->exportation(selectedFields, massExportDialog->directory(),
+									  massExportDialog->overwrite(), toExport, &tags)
 					&& !observerWasCanceled()) {
 				QMessageBox::warning(this, tr("Error"), tr("An error occured when exporting"));
 			}
@@ -1152,22 +1253,22 @@
 
 void Window::massImport()
 {
-	if(!fieldArchive) return;
+	if (!fieldArchive) return;
 
 	MassImportDialog *massImportDialog = new MassImportDialog(this);
-	massImportDialog->fill(fieldArchive, currentFieldId());
-	if(massImportDialog->exec() == QDialog::Accepted) {
+	massImportDialog->fill(fieldArchive, _fieldList->currentMapId());
+	if (massImportDialog->exec() == QDialog::Accepted) {
 		QList<int> selectedFields = massImportDialog->selectedFields();
-		if(!selectedFields.isEmpty()) {
+		if (!selectedFields.isEmpty()) {
 			QMap<Field::FieldSection, QString> toImport;
 
 			showProgression(tr("Import..."), false);
 
-			if(massImportDialog->importModule(MassImportDialog::Texts)) {
+			if (massImportDialog->importModule(MassImportDialog::Texts)) {
 				toImport.insert(Field::Scripts, massImportDialog->moduleFormat(MassImportDialog::Texts));
 			}
 
-			if(!fieldArchive->importation(selectedFields, massImportDialog->directory(),
+			if (!fieldArchive->importation(selectedFields, massImportDialog->directory(),
 									  toImport)
 					&& !observerWasCanceled()) {
 				QMessageBox::warning(this, tr("Error"), tr("An error occurred when importing"));
@@ -1178,55 +1279,60 @@
 	}
 }
 
-void Window::importer()
+void Window::importToCurrentMap()
 {
-	if(!field) return;
+	int mapId = _fieldList->currentMapId();
+	if (mapId < 0) {
+		return;
+	}
+
+	Field *field = fieldArchive->field(quint32(mapId), false);
+	if (nullptr == field) {
+		return;
+	}
+
+	if (!field->isOpen()) {
+		field->initEmpty();
+	}
 
 	int index;
-	QString name, selectedFilter;
+	QString name, selectedFilter,
+	    pc = tr("PC Field Map (*)"),
+	    dat = tr("DAT File (*.DAT)"),
+	    decPc = tr("Uncompressed PC Field Map (*)"),
+	    decDat = tr("Uncompressed DAT File (*)");
 	QStringList filter;
-	filter << tr("DAT File (*.DAT)")
-		   << tr("PC Field (*)")
-		   << tr("Uncompressed DAT File (*)")
-		   << tr("Uncompressed PC Field (*)");
+	filter << pc << dat << decPc << decDat;
 
-	name = fieldList->selectedItems().first()->text(0);
-	if(fieldArchive->io()->isPS())
+	name = _fieldList->selectedItems().first()->text(0);
+	if (fieldArchive->io()->isPS())
 		name = name.toUpper();
 
 	QString path = Config::value("importPath").toString().isEmpty() ? fieldArchive->io()->directory() : Config::value("importPath").toString()+"/";
 	path = QFileDialog::getOpenFileName(this, tr("Import a file"), path+name, filter.join(";;"), &selectedFilter);
-	if(path.isNull())		return;
+	if (path.isNull())		return;
 
-	bool isDat = selectedFilter == filter.at(0) || selectedFilter == filter.at(2);
-	bool isCompressed = selectedFilter == filter.at(0) || selectedFilter == filter.at(1);
+	bool isDat = selectedFilter == dat || selectedFilter == decDat;
+	bool isCompressed = selectedFilter == pc || selectedFilter == decPc;
 
 	ImportDialog dialog((isDat && fieldArchive->io()->isPS())
 						|| (!isDat && fieldArchive->io()->isPC()),
 						isDat, path, this);
-	if(dialog.exec() != QDialog::Accepted) {
+	if (dialog.exec() != QDialog::Accepted) {
 		return;
 	}
 
 	Field::FieldSections parts = dialog.parts();
-	if(parts == 0) {
+	if (parts == 0) {
 		return;
 	}
 
-	if(parts.testFlag(Field::Background)) {
-		QMessageBox::StandardButton button = QMessageBox::warning(this, tr("Warning"), tr("The background importation algorithm give bad results in-game, you have been warned!")
-				, QMessageBox::Ok | QMessageBox::Cancel);
-		if(button != QMessageBox::Ok) {
-			return;
-		}
-	}
-
-	QFile addDevice(dialog.additionalPath());
+	QFile bsxDevice(dialog.bsxPath()), mimDevice(dialog.mimPath());
 	
-	qint8 error = field->importer(path, isDat, isCompressed, parts, &addDevice);
+	qint8 error = field->importer(path, isDat, isCompressed, parts, &bsxDevice, &mimDevice);
 
 	QString out;
-	switch(error)
+	switch (error)
 	{
 	case 0:
 		setModified();
@@ -1237,12 +1343,12 @@
 	case 1:	out = tr("Error reopening file");	break;
 	case 2:	out = tr("Invalid file");				break;
 	}
-	if(!out.isEmpty())	QMessageBox::warning(this, tr("Error"), out);
+	if (!out.isEmpty())	QMessageBox::warning(this, tr("Error"), out);
 }
 
 void Window::varManager()
 {
-	if(!varDialog) {
+	if (!varDialog) {
 		varDialog = new VarManager(fieldArchive, this);
 	}
 	varDialog->show();
@@ -1264,7 +1370,7 @@
 	FF7Exe = "\"" % FF7Exe % "\"";
 #endif
 
-	if(!QProcess::startDetached(FF7Exe, args, FF7ExeDir)) {
+	if (!QProcess::startDetached(FF7Exe, args, FF7ExeDir)) {
 		QMessageBox::warning(this, tr("Error"), tr("Final Fantasy VII couldn't be launched\n%1")
 							 .arg(QDir::toNativeSeparators(FF7Exe)));
 	}
@@ -1272,9 +1378,9 @@
 
 void Window::searchManager()
 {
-	if(_textDialog && _textDialog->isVisible()) {
+	if (_textDialog && _textDialog->isVisible()) {
 		QString selectedText = _textDialog->selectedText();
-		if(!selectedText.isEmpty()) {
+		if (!selectedText.isEmpty()) {
 			searchDialog->setText(selectedText);
 		}
 	}
@@ -1286,16 +1392,38 @@
 	searchDialog->raise();
 }
 
+void Window::searchOpcode(int opcodeID)
+{
+	searchManager();
+	searchDialog->setOpcode(opcodeID, true);
+}
+
+void Window::createCurrentMap()
+{
+	int mapId = _fieldList->currentMapId();
+
+	if (mapId < 0 || fieldArchive == nullptr) {
+		return;
+	}
+
+	Field *field = fieldArchive->field(quint32(mapId), false);
+	if (field != nullptr) {
+		field->initEmpty();
+		openField(true);
+		setModified(true);
+	}
+}
+
 void Window::textManager(int textID, int from, int size, bool activate)
 {
-	if(!_textDialog) {
+	if (!_textDialog) {
 		_textDialog = new TextManager(this);
 		connect(_textDialog, SIGNAL(modified()), SLOT(setModified()));
-		connect(_textDialog, SIGNAL(modified()), SLOT(setModified()));
+		connect(_textDialog, SIGNAL(opcodeModified(int,int,int)), _scriptManager, SLOT(refreshOpcode(int,int,int)));
 		connect(_scriptManager, SIGNAL(changed()), _textDialog, SLOT(updateFromScripts()));
 	}
 
-	if(field && field->scriptsAndTexts()->isOpen()) {
+	if (field && field->scriptsAndTexts()->isOpen()) {
 		_textDialog->setField(field);
 		_textDialog->setEnabled(true);
 	} else {
@@ -1303,31 +1431,31 @@
 		_textDialog->setEnabled(false);
 	}
 	_textDialog->show();
-	if(activate) {
+	if (activate) {
 		_textDialog->activateWindow();
 	} else {
 		searchDialog->raise();
 	}
-	if(textID >= 0) {
+	if (textID >= 0) {
 		_textDialog->gotoText(textID, from, size);
 	}
 }
 
 void Window::modelManager()
 {
-	if(!_modelManager) {
-		if(!field)	return;
-		if(field->isPC()) {
-			_modelManager = new ModelManagerPC(fieldModel, this);
+	if (!_modelManager) {
+		if (!field)	return;
+		if (field->isPC()) {
+			_modelManager = new ModelManagerPC(this);
 		} else {
-			_modelManager = new ModelManagerPS(fieldModel, this);
+			_modelManager = new ModelManagerPS(this);
 		}
 		connect(_modelManager, SIGNAL(modified()), SLOT(setModified()));
 	}
 
-	if(field) {
+	if (field) {
 //		zonePreview->setCurrentIndex(0);
-//		if(fieldModel) {
+//		if (fieldModel) {
 //			fieldModel->clear();
 //		}
 
@@ -1335,7 +1463,7 @@
 		_modelManager->setEnabled(true);
 
 //		bool modelLoaded = false;
-//		if(fieldModel && Data::currentModelID != -1) {
+//		if (fieldModel && Data::currentModelID != -1) {
 //			modelLoaded = fieldModel->load(field, Data::currentModelID);
 //		}
 //		zonePreview->setCurrentIndex((int)modelLoaded);
@@ -1349,13 +1477,13 @@
 
 void Window::encounterManager()
 {
-	if(field) {
+	if (field) {
 		EncounterFile *encounter = field->encounter();
-		if(encounter->isOpen()) {
+		if (encounter->isOpen()) {
 			EncounterWidget dialog(encounter, this);
-			if(dialog.exec()==QDialog::Accepted)
+			if (dialog.exec()==QDialog::Accepted)
 			{
-				if(encounter->isModified())
+				if (encounter->isModified())
 					setModified();
 			}
 		} else {
@@ -1366,14 +1494,14 @@
 
 void Window::tutManager()
 {
-	if(!_tutManager) {
+	if (!_tutManager) {
 		_tutManager = new TutWidget(this);
 		connect(_tutManager, SIGNAL(modified()), SLOT(setModified()));
 	}
 
-	if(field && field->tutosAndSounds()->isOpen()) {
-		TutFilePC *tutPC = NULL;
-		if(fieldArchive->isPC()) {
+	if (field && field->tutosAndSounds()->isOpen()) {
+		TutFilePC *tutPC = nullptr;
+		if (fieldArchive->isPC()) {
 			tutPC = static_cast<FieldArchivePC *>(fieldArchive)->tut(field->name());
 		}
 		_tutManager->fill(field, tutPC);
@@ -1388,12 +1516,12 @@
 
 void Window::walkmeshManager()
 {
-	if(!_walkmeshManager) {
+	if (!_walkmeshManager) {
 		_walkmeshManager = new WalkmeshManager(this);
 		connect(_walkmeshManager, SIGNAL(modified()), SLOT(setModified()));
 	}
 
-	if(field) {
+	if (field) {
 		_walkmeshManager->fill(field);
 		_walkmeshManager->setEnabled(true);
 	} else {
@@ -1406,13 +1534,13 @@
 
 void Window::backgroundManager()
 {
-	if(!_backgroundManager) {
+	if (!_backgroundManager) {
 		_backgroundManager = new BGDialog(this);
 		connect(_backgroundManager, SIGNAL(modified()), SLOT(setModified()));
 		connect(_backgroundManager, SIGNAL(modified()), zoneImage, SLOT(drawBackground()));
 	}
 
-	if(field) {
+	if (field) {
 		_backgroundManager->fill(field);
 		_backgroundManager->setEnabled(true);
 	} else {
@@ -1425,13 +1553,13 @@
 
 void Window::miscManager()
 {
-	if(field) {
+	if (field) {
 		InfFile *inf = field->inf();
-		if(inf->isOpen()) {
+		if (inf->isOpen()) {
 			MiscWidget dialog(inf, field, this);
-			if(dialog.exec()==QDialog::Accepted)
+			if (dialog.exec()==QDialog::Accepted)
 			{
-				if(inf->isModified() || field->isModified()) {
+				if (inf->isModified() || field->isModified()) {
 					setModified();
 					authorLbl->setText(tr("Author: %1").arg(field->scriptsAndTexts()->author()));
 				}
@@ -1444,61 +1572,72 @@
 
 void Window::archiveManager()
 {
-	if(fieldArchive && fieldArchive->io()->type() == FieldArchiveIO::Lgp) {
-		LgpDialog dialog(static_cast<Lgp *>(fieldArchive->io()->device()), this);
-		connect(&dialog, SIGNAL(modified()), SLOT(setModified()));
-		dialog.exec();
+	if (_lgpWidget != nullptr && _mainStackedWidget->currentWidget() == _lgpWidget) {
+		actionArchive->setText(tr("Archive Mana&ger..."));
+		_mainStackedWidget->setCurrentIndex(0); // Back to standard view
+	} else if (fieldArchive && fieldArchive->io()->type() == FieldArchiveIO::Lgp) {
+		actionArchive->setText(tr("Go back to field map editor..."));
+		if (_lgpWidget == nullptr) {
+			_lgpWidget = new LgpWidget(static_cast<Lgp *>(fieldArchive->io()->device()), this);
+			connect(_lgpWidget, SIGNAL(modified()), SLOT(setModified()));
+			_mainStackedWidget->addWidget(_lgpWidget);
+		}
+		_mainStackedWidget->setCurrentWidget(_lgpWidget);
 	}
 }
 
 void Window::miscOperations()
 {
-	if(!fieldArchive) {
+	if (!fieldArchive) {
 		return;
 	}
 
 	OperationsManager dialog(fieldArchive->isPC(), this);
-	if(dialog.exec() == QDialog::Accepted) {
+	if (dialog.exec() == QDialog::Accepted) {
 		OperationsManager::Operations operations = dialog.selectedOperations();
 
 		showProgression(tr("Applying..."), false);
 
-		if(operations.testFlag(OperationsManager::CleanUnusedTexts)) {
+		if (operations.testFlag(OperationsManager::CleanUnusedTexts)) {
 			fieldArchive->cleanTexts();
 		}
-		if(!observerWasCanceled() && operations.testFlag(OperationsManager::RemoveTexts)) {
-			fieldArchive->removeTexts();
-		}
-		if(!observerWasCanceled() && operations.testFlag(OperationsManager::RemoveBattles)) {
-			fieldArchive->removeBattles();
-		}
-		if(!observerWasCanceled() && fieldArchive->isPC() && operations.testFlag(OperationsManager::CleanModelLoaderPC)) {
-			static_cast<FieldArchivePC *>(fieldArchive)->cleanModelLoader();
-		}
-		if(!observerWasCanceled() && fieldArchive->isPC() && operations.testFlag(OperationsManager::RemoveUnusedSectionPC)) {
-			static_cast<FieldArchivePC *>(fieldArchive)->removeUnusedSections();
+		if (!observerWasCanceled()) {
+			if (operations.testFlag(OperationsManager::AutosizeTextWindows)) {
+				fieldArchive->autosizeTextWindows();
+			}
+			if (operations.testFlag(OperationsManager::RemoveTexts)) {
+				fieldArchive->removeTexts();
+			}
+			if (operations.testFlag(OperationsManager::RemoveBattles)) {
+				fieldArchive->removeBattles();
+			}
+			if (fieldArchive->isPC()) {
+				if (operations.testFlag(OperationsManager::CleanModelLoaderPC)) {
+					static_cast<FieldArchivePC *>(fieldArchive)->cleanModelLoader();
+				}
+				if (operations.testFlag(OperationsManager::RemoveUnusedSectionPC)) {
+					static_cast<FieldArchivePC *>(fieldArchive)->removeUnusedSections();
+				}
+				if (operations.testFlag(OperationsManager::RepairBackgroundsPC)) {
+					static_cast<FieldArchivePC *>(fieldArchive)->repairBackgroundsPC();
+				}
+			}
 		}
 
 		hideProgression();
 
-		if(fieldArchive->isModified()) {
+		if (fieldArchive->isModified()) {
 			setModified();
 		}
 	}
 }
 
-void Window::fontManager()
-{
-	FontManager dialog(this);
-	dialog.exec();
-}
-
 void Window::config()
 {
 	ConfigWindow configWindow(this);
-	if(configWindow.exec() == QDialog::Accepted) {
+	if (configWindow.exec() == QDialog::Accepted) {
 		actionJp_txt->setChecked(Config::value("jp_txt", false).toBool());
-		if(_textDialog) {
+		if (_textDialog) {
 			_textDialog->updateText();
 		}
 		actionRun->setEnabled(!Data::ff7AppPath().isEmpty());
@@ -1508,41 +1647,6 @@
 
 void Window::about()
 {
-	QDialog about(this, Qt::Dialog | Qt::CustomizeWindowHint);
-	about.setFixedSize(200, 270);
-
-	QFont font;
-	font.setPointSize(12);
-
-	QLabel image(&about);
-	image.setScaledContents(true);
-	image.setPixmap(QPixmap(":/images/reactor.png"));
-	image.move(82, about.height() - 150);
-	
-	QLabel desc1(PROG_FULLNAME, &about);
-	desc1.setFont(font);
-	desc1.setFixedWidth(about.width());
-	desc1.setAlignment(Qt::AlignHCenter);
-
-	font.setPointSize(8);
-
-	QLabel desc2(tr("By myst6re<br/><a href=\"https://github.com/myst6re/makoureactor/\">github.com/myst6re/makoureactor</a><br/><br/>Thanks to:<ul style=\"margin:0\"><li>Squall78</li><li>Synergy Blades</li><li>Akari</li><li>Asa</li><li>Aali</li></ul>"), &about);
-	desc2.setTextInteractionFlags(Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard);
-	desc2.setTextFormat(Qt::RichText);
-	desc2.setOpenExternalLinks(true);
-	desc2.move(9, 40);
-	desc2.setFont(font);
-
-	QPushButton button(tr("Close"), &about);
-	button.move(8, about.height()-8-button.sizeHint().height());
-	connect(&button, SIGNAL(released()), &about, SLOT(close()));
-
-	QLabel desc4(QString("Qt %1").arg(QT_VERSION_STR), &about);
-	QPalette pal = desc4.palette();
-	pal.setColor(QPalette::WindowText, QColor(0xAA,0xAA,0xAA));
-	desc4.setPalette(pal);
-	desc4.move(9, about.height()-16-desc4.sizeHint().height()-button.sizeHint().height());
-	desc4.setFont(font);
-
+	AboutDialog about(this);
 	about.exec();
 }
diff -Nru makoureactor-1.7.2/Window.h makoureactor-1.8.0/Window.h
--- makoureactor-1.7.2/Window.h	2016-11-12 20:46:36.000000000 +0000
+++ makoureactor-1.8.0/Window.h	2020-08-08 18:46:56.000000000 +0000
@@ -33,7 +33,7 @@
 #include "widgets/TutWidget.h"
 #include "widgets/WalkmeshManager.h"
 #include "widgets/QTaskBarButton.h"
-#include "widgets/LgpDialog.h"
+#include "widgets/LgpWidget.h"
 #include "widgets/Splitter.h"
 //#include "FieldModelThread.h"
 
@@ -50,8 +50,11 @@
 	bool observerWasCanceled() const;
 	void setObserverMaximum(unsigned int max);
 	void setObserverValue(int value);
+	bool observerRetry(const QString &message);
 
-	int currentFieldId() const;
+	inline FieldList *fieldList() const {
+		return _fieldList;
+	}
 	inline TextManager *textWidget() const {
 		return _textDialog;
 	}
@@ -64,22 +67,23 @@
 	void openDir();
 
 	void setModified(bool enabled=true);
+	void setFieldDeleted();
 	void saveAs(bool currentPath=false);
 	void save();
 	int closeFile(bool quit=false);
 
-	bool gotoField(int fieldID);
-	void gotoOpcode(int fieldID, int grpScriptID, int scriptID, int opcodeID);
-	void gotoText(int fieldID, int textID, int from, int size);
+	bool gotoField(int mapID);
+	void gotoOpcode(int mapID, int grpScriptID, int scriptID, int opcodeID);
+	void gotoText(int mapID, int textID, int from, int size);
 
 	void jpText(bool);
 
 	//	void notifyFileChanged(const QString &path);
 	//	void notifyDirectoryChanged(const QString &path);
-	void exporter();
+	void exportCurrentMap();
 	void massExport();
 	void massImport();
-	void importer();
+	void importToCurrentMap();
 	void varManager();
 	void runFF7();
 	void textManager(int textID=-1, int from=0, int size=0, bool activate=true);
@@ -92,7 +96,6 @@
 	void searchManager();
 	void archiveManager();
 	void miscOperations();
-	void fontManager();
 	void about();
 private slots:
 	void openRecentFile(QAction *action);
@@ -104,6 +107,9 @@
 	void toggleFieldList();
 	void toggleBackgroundPreview();
 	void config();
+	void searchOpcode(int opcodeID);
+	void createCurrentMap();
+	void processEvents() const;
 private:
 	void setWindowTitle();
 	void restartNow();
@@ -113,7 +119,7 @@
 	void fillRecentMenu();
 
 	QLineEdit *lineSearch;
-	FieldList *fieldList;
+	FieldList *_fieldList;
 	QStackedWidget *zonePreview;
 	ApercuBG *zoneImage;
 	FieldModel *fieldModel;
@@ -143,10 +149,14 @@
 	WalkmeshManager *_walkmeshManager;
 	BGDialog *_backgroundManager;
 
+	QStackedWidget *_mainStackedWidget, *_fieldStackedWidget;
+	LgpWidget *_lgpWidget;
+
 	QTaskBarButton *taskBarButton;
 	QProgressDialog *_progressDialog;
 	QAction *authorAction;
 	QLabel *authorLbl;
+	QTimer timer;
 
 //	FieldModelThread *modelThread;
 protected: