From 0c92dc05da9136946d0742e659b4ef019a369630 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 20 Apr 2020 13:28:56 -0400 Subject: [PATCH] Save metatile attributes label in new order for FRLG --- src/core/tileset.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/core/tileset.cpp b/src/core/tileset.cpp index 9b305e15..450458b8 100644 --- a/src/core/tileset.cpp +++ b/src/core/tileset.cpp @@ -2,6 +2,7 @@ #include "metatile.h" #include "project.h" #include "log.h" +#include "config.h" #include #include @@ -115,8 +116,13 @@ bool Tileset::appendToHeaders(QString headerFile, QString friendlyName){ dataString.append(QString("\t.4byte gTilesetTiles_%1\n").arg(friendlyName)); dataString.append(QString("\t.4byte gTilesetPalettes_%1\n").arg(friendlyName)); dataString.append(QString("\t.4byte gMetatiles_%1\n").arg(friendlyName)); - dataString.append(QString("\t.4byte gMetatileAttributes_%1\n").arg(friendlyName)); - dataString.append("\t.4byte NULL\n"); + if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) { + dataString.append("\t.4byte NULL\n"); + dataString.append(QString("\t.4byte gMetatileAttributes_%1\n").arg(friendlyName)); + } else { + dataString.append(QString("\t.4byte gMetatileAttributes_%1\n").arg(friendlyName)); + dataString.append("\t.4byte NULL\n"); + } file.write(dataString.toUtf8()); file.flush(); file.close();