diff --git a/Makefile b/Makefile index a0f778b..7912323 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION_MAJOR := 1 VERSION_MINOR := 0 -VERSION_REVISION := 2 +VERSION_REVISION := 3 all: mkdir -p plugin/build diff --git a/app/Makefile b/app/Makefile index fb66e71..2d02014 100644 --- a/app/Makefile +++ b/app/Makefile @@ -26,7 +26,7 @@ LIBRARIES := ctru VERSION_MAJOR := 1 VERSION_MINOR := 0 -VERSION_MICRO := 2 +VERSION_MICRO := 3 BUILD_FLAGS := -march=armv6k -mtune=mpcore -mfloat-abi=hard BUILD_FLAGS_CC := -g -Wall -Wno-strict-aliasing -O3 -mword-relocations \ diff --git a/plugin/Makefile b/plugin/Makefile index 08d476b..cdcd4ac 100644 --- a/plugin/Makefile +++ b/plugin/Makefile @@ -16,7 +16,7 @@ SOURCES := ArticProtocol/sources sources sources/CTRPluginFramework VERSION_MAJOR := 1 VERSION_MINOR := 0 -VERSION_REVISION := 2 +VERSION_REVISION := 3 SERVER_PORT := 5543 IP := 19 diff --git a/plugin/sources/ArticFunctions.cpp b/plugin/sources/ArticFunctions.cpp index 370bc33..2b68ab6 100644 --- a/plugin/sources/ArticFunctions.cpp +++ b/plugin/sources/ArticFunctions.cpp @@ -15,7 +15,7 @@ extern "C" { } extern bool isControllerMode; -constexpr u32 INITIAL_SETUP_APP_VERSION = 1; +constexpr u32 INITIAL_SETUP_APP_VERSION = 2; enum class HandleType { FILE, @@ -619,12 +619,23 @@ namespace ArticFunctions { strcpy(file_name, files[type]); char* end = file_name + strlen(files[type]); - if (type == 0 || type == 1) { + if (type == 0) { + // Check for region changed file first + *end = 'C'; + } else if (type == 1) { *end = 'A'; } FSPXI_File file; res = FSPXI_OpenFile(fspxiHandle, &file, archive, fsMakePath(PATH_ASCII, file_name), FS_OPEN_READ, 0); + if (type == 0) { + if (R_SUCCEEDED(res)) { + logger.Info("NOTE: This console is region changed,\n some functionality may not work properly."); + } else { + *end = 'A'; + res = FSPXI_OpenFile(fspxiHandle, &file, archive, fsMakePath(PATH_ASCII, file_name), FS_OPEN_READ, 0); + } + } if (R_FAILED(res)) { *end = 'B'; res = FSPXI_OpenFile(fspxiHandle, &file, archive, fsMakePath(PATH_ASCII, file_name), FS_OPEN_READ, 0);