From f2ae83b33e0aca957ae7ff83f427b3457af2f321 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 19 Apr 2020 18:11:45 -0400 Subject: [PATCH] Use metatile attributes path from header --- src/project.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/project.cpp b/src/project.cpp index 0c7c9651..ca6b46c5 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -1099,8 +1099,12 @@ Tileset* Project::loadTileset(QString label, Tileset *tileset) { tileset->tiles_label = values->value(3); tileset->palettes_label = values->value(4); tileset->metatiles_label = values->value(5); - tileset->metatile_attrs_label = values->value(6); - tileset->callback_label = values->value(7); + if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) { + tileset->metatile_attrs_label = values->value(7); + } else { + tileset->metatile_attrs_label = values->value(6); + tileset->callback_label = values->value(7); + } loadTilesetAssets(tileset);