From 09ce5b59138424cb5155244dd051864d33660c55 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 24 Oct 2022 08:03:51 -0400 Subject: [PATCH] Drop path_ from path config options --- docsrc/manual/project-files.rst | 4 ++-- include/config.h | 4 ++-- src/config.cpp | 4 ++-- src/project.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docsrc/manual/project-files.rst b/docsrc/manual/project-files.rst index 0540716f..78a899dc 100644 --- a/docsrc/manual/project-files.rst +++ b/docsrc/manual/project-files.rst @@ -57,7 +57,7 @@ For example if you wanted to rename ``include/constants/items.h`` to ``headers/d include/constants/metatile_labels.h, yes, yes, ``constants_metatile_labels``, include/constants/metatile_behaviors.h, yes, no, ``constants_metatile_behaviors``, include/fieldmap.h, yes, no, ``constants_fieldmap``, reads tileset related constants - src/event_object_movement.c, yes, no, ``path_initial_facing_table``, reads ``gInitialMovementTypeFacingDirections`` - src/pokemon_icon.c, yes, no, ``path_pokemon_icon_table``, reads files in ``gMonIconTable`` + src/event_object_movement.c, yes, no, ``initial_facing_table``, reads ``gInitialMovementTypeFacingDirections`` + src/pokemon_icon.c, yes, no, ``pokemon_icon_table``, reads files in ``gMonIconTable`` diff --git a/include/config.h b/include/config.h index 3206e034..f7ff9a9d 100644 --- a/include/config.h +++ b/include/config.h @@ -183,8 +183,8 @@ enum ProjectFilePath { constants_metatile_labels, constants_metatile_behaviors, constants_fieldmap, - path_initial_facing_table, - path_pokemon_icon_table, + initial_facing_table, + pokemon_icon_table, }; class ProjectConfig: public KeyValueConfigBase diff --git a/src/config.cpp b/src/config.cpp index 335329eb..a9ce994e 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -59,8 +59,8 @@ const QMap> defaultPaths = { {ProjectFilePath::constants_metatile_labels, { "constants_metatile_labels", "include/constants/metatile_labels.h"}}, {ProjectFilePath::constants_metatile_behaviors, { "constants_metatile_behaviors", "include/constants/metatile_behaviors.h"}}, {ProjectFilePath::constants_fieldmap, { "constants_fieldmap", "include/fieldmap.h"}}, - {ProjectFilePath::path_pokemon_icon_table, { "path_pokemon_icon_table", "src/pokemon_icon.c"}}, - {ProjectFilePath::path_initial_facing_table, { "path_initial_facing_table", "src/event_object_movement.c"}}, + {ProjectFilePath::pokemon_icon_table, { "pokemon_icon_table", "src/pokemon_icon.c"}}, + {ProjectFilePath::initial_facing_table, { "initial_facing_table", "src/event_object_movement.c"}}, }; ProjectFilePath reverseDefaultPaths(QString str) { diff --git a/src/project.cpp b/src/project.cpp index a09ceaaa..1ae57898 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -2166,7 +2166,7 @@ bool Project::readMovementTypes() { } bool Project::readInitialFacingDirections() { - QString filename = projectConfig.getFilePath(ProjectFilePath::path_initial_facing_table); + QString filename = projectConfig.getFilePath(ProjectFilePath::initial_facing_table); fileWatcher.addPath(root + "/" + filename); facingDirections = parser.readNamedIndexCArray(filename, "gInitialMovementTypeFacingDirections"); if (facingDirections.isEmpty()) { @@ -2507,7 +2507,7 @@ bool Project::readEventGraphics() { bool Project::readSpeciesIconPaths() { speciesToIconPath.clear(); - QString srcfilename = projectConfig.getFilePath(ProjectFilePath::path_pokemon_icon_table); + QString srcfilename = projectConfig.getFilePath(ProjectFilePath::pokemon_icon_table); QString incfilename = projectConfig.getFilePath(ProjectFilePath::data_pokemon_gfx); fileWatcher.addPath(root + "/" + srcfilename); fileWatcher.addPath(root + "/" + incfilename);