diff --git a/Makefile b/Makefile index 0584366..e49d7b1 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,8 @@ LIBRARY_DIRS := $(PORTLIBS) $(CTRULIB) LIBRARIES := citro3d ctru png z m VERSION_MAJOR := 2 -VERSION_MINOR := 7 -VERSION_MICRO := 3 +VERSION_MINOR := 8 +VERSION_MICRO := 0 diff --git a/resources/Nasalization.ttf b/resources/Nasalization.ttf new file mode 100644 index 0000000..b6ddf03 Binary files /dev/null and b/resources/Nasalization.ttf differ diff --git a/romfs/ntr.n3ds.bin b/romfs/ntr.n3ds.bin index 58e43f4..c33c27f 100644 Binary files a/romfs/ntr.n3ds.bin and b/romfs/ntr.n3ds.bin differ diff --git a/romfs/ntr.o3ds.bin b/romfs/ntr.o3ds.bin index f7a4249..91c9d4a 100644 Binary files a/romfs/ntr.o3ds.bin and b/romfs/ntr.o3ds.bin differ diff --git a/romfs/sprites/Thumbs.db b/romfs/sprites/Thumbs.db deleted file mode 100644 index 9726995..0000000 Binary files a/romfs/sprites/Thumbs.db and /dev/null differ diff --git a/romfs/sprites/textSprites/35Version.png b/romfs/sprites/textSprites/35Version.png new file mode 100644 index 0000000..3d189cf Binary files /dev/null and b/romfs/sprites/textSprites/35Version.png differ diff --git a/source/config.c b/source/config.c index c713f9b..00124f6 100644 --- a/source/config.c +++ b/source/config.c @@ -107,7 +107,7 @@ void resetConfig(void) strJoin(path, config->binariesPath + 5, "ntr_3_3.bin"); remove(path); memset(path, 0, 0x100); - strJoin(path, config->binariesPath + 5, "ntr_3_4.bin"); + strJoin(path, config->binariesPath + 5, "ntr_3_5.bin"); remove(path); exit: @@ -146,7 +146,7 @@ void configInit(void) if (!saveConfig()) newAppTop(DEFAULT_COLOR, 0, "A problem occured while saving the settings."); if (g_bnConfig.isMode3) - g_bnConfig.versionToLaunch = V34; + g_bnConfig.versionToLaunch = V35; } else { @@ -162,14 +162,13 @@ void configInit(void) if (g_bnConfig.isMode3) { - bnConfig->versionToLaunch = V34; - config->flags = LV34; + bnConfig->versionToLaunch = V35; } else { if (config->flags & LV32) bnConfig->versionToLaunch = V32; else if (config->flags & LV33) bnConfig->versionToLaunch = V33; - else if (config->flags & LV34) bnConfig->versionToLaunch = V34; + else if (config->flags & LV35) bnConfig->versionToLaunch = V35; } error: return; @@ -187,7 +186,7 @@ void configExit(void) { if (version == V32) flags = LV32; else if (version == V33) flags = LV33; - else if (version == V34) flags = LV34; + else if (version == V35) flags = LV35; else flags = 0; config->flags = flags; } diff --git a/source/config.h b/source/config.h index 53bbbb7..627bc1c 100644 --- a/source/config.h +++ b/source/config.h @@ -9,7 +9,7 @@ (((major)<<24)|((minor)<<16)|((revision)<<8)) #endif -#define CURRENT_CONFIG_VERSION SYSTEM_VERSION(1, 0, 6) +#define CURRENT_CONFIG_VERSION SYSTEM_VERSION(1, 0, 7) #define SECONDS_IN_WEEK 604800 #define SECONDS_IN_DAY 86400 @@ -20,7 +20,7 @@ enum { LV32 = BIT(0), LV33 = BIT(1), - LV34 = BIT(2), + LV35 = BIT(2), CUSTOM_PLUGIN_PATH = BIT(3) }configFlags; diff --git a/source/firstLaunchMenu.c b/source/firstLaunchMenu.c index 8e3d692..1c013da 100644 --- a/source/firstLaunchMenu.c +++ b/source/firstLaunchMenu.c @@ -369,28 +369,28 @@ static void setFiles(void) newAppTop(COLOR_LIMEGREEN, SKINNY, "Setting up 3.3... Done."); updateUI(); - newAppTop(COLOR_BLANK, SKINNY, "Setting up 3.4..."); + newAppTop(COLOR_BLANK, SKINNY, "Setting up 3.5..."); updateUI(); - ret = loadAndPatch(V34); + ret = loadAndPatch(V35); if (!bnConfig->isDebug) removeAppTop(); if (ret) - newAppTop(COLOR_SALMON, SKINNY, "Setting up 3.4... Error."); + newAppTop(COLOR_SALMON, SKINNY, "Setting up 3.5... Error."); else - newAppTop(COLOR_LIMEGREEN, SKINNY, "Setting up 3.4... Done."); + newAppTop(COLOR_LIMEGREEN, SKINNY, "Setting up 3.5... Done."); updateUI(); if (!bnConfig->isNew3DS) { - newAppTop(COLOR_BLANK, SKINNY, "Setting up 3.4 unpatched..."); + newAppTop(COLOR_BLANK, SKINNY, "Setting up 3.5 unpatched..."); updateUI(); - ret = loadAndPatch(V34); + ret = loadAndPatch(V35); if (!bnConfig->isDebug) removeAppTop(); if (ret) - newAppTop(COLOR_SALMON, SKINNY, "Setting up 3.4 unpatched... Error."); + newAppTop(COLOR_SALMON, SKINNY, "Setting up 3.5 unpatched... Error."); else - newAppTop(COLOR_LIMEGREEN, SKINNY, "Setting up 3.4... Done."); + newAppTop(COLOR_LIMEGREEN, SKINNY, "Setting up 3.5... Done."); updateUI(); } diff --git a/source/kernel.c b/source/kernel.c index 694ee8b..15c6557 100644 --- a/source/kernel.c +++ b/source/kernel.c @@ -89,10 +89,10 @@ dbgKernelCacheInterface cacheInterface_NEW112 = dbgKernelCacheInterface cacheInterface_NEW113 = { //for new 3ds 11.3 - (void*)0XFFF27400, - (void*)0XFFF1E15C, - (void*)0XFFF1DE04, - (void*)0XFFF20498 + (void*)0xFFF27400, + (void*)0xFFF1E15C, + (void*)0xFFF1DE04, + (void*)0xFFF20498 }; dbgKernelCacheInterface cacheInterface_NEW114 = diff --git a/source/main.h b/source/main.h index 97ca93c..3df0f83 100644 --- a/source/main.h +++ b/source/main.h @@ -109,7 +109,7 @@ typedef enum version_e { V32 = 0, V33 = 1, - V34 = 2, + V35 = 2, } version_t; /* diff --git a/source/mainMenu.c b/source/mainMenu.c index 6294868..3f420db 100644 --- a/source/mainMenu.c +++ b/source/mainMenu.c @@ -8,7 +8,7 @@ extern bootNtrConfig_t *bnConfig; static button_t *V32Button; static button_t *V33Button; -static button_t *V34Button; +static button_t *V35Button; static sprite_t *desiredVersionSprite; static sprite_t *tinyButtonBGSprite; static sprite_t *pressExitSprite; @@ -18,7 +18,7 @@ void selectVersion(u32 mode) { V32Button->disable(V32Button); V33Button->disable(V33Button); - V34Button->disable(V34Button); + V35Button->disable(V35Button); userTouch = true; switch(mode) { @@ -29,7 +29,7 @@ void selectVersion(u32 mode) bnConfig->versionToLaunch = V33; break; case 3: - bnConfig->versionToLaunch = V34; + bnConfig->versionToLaunch = V35; break; default: break; @@ -53,15 +53,15 @@ void initMainMenu(void) V32Button = newButton(11.0f, 35.0f, selectVersion, 1, tinyButtonBGSprite, sprite); newSpriteFromPNG(&sprite, "romfs:/sprites/textSprites/33Version.png"); V33Button = newButton(11.0f, 94.0f, selectVersion, 2, tinyButtonBGSprite, sprite); - newSpriteFromPNG(&sprite, "romfs:/sprites/textSprites/34Version.png"); - V34Button = newButton(11.0f, 152.0f, selectVersion, 3, tinyButtonBGSprite, sprite); + newSpriteFromPNG(&sprite, "romfs:/sprites/textSprites/35Version.png"); + V35Button = newButton(11.0f, 152.0f, selectVersion, 3, tinyButtonBGSprite, sprite); V32Button->show(V32Button); V33Button->show(V33Button); - V34Button->show(V34Button); + V35Button->show(V35Button); addBottomObject(V32Button); addBottomObject(V33Button); - addBottomObject(V34Button); + addBottomObject(V35Button); } newSpriteFromPNG(&pressExitSprite, "romfs:/sprites/textSprites/pressBExit.png"); @@ -78,7 +78,7 @@ void exitMainMenu(void) { destroyButton(V32Button); destroyButton(V33Button); - destroyButton(V34Button); + destroyButton(V35Button); deleteSprite(tinyButtonBGSprite); deleteSprite(desiredVersionSprite); } @@ -91,7 +91,7 @@ static const char * versionString[] = { "3.2", "3.3", - "3.4" + "3.5" }; int mainMenu(void) diff --git a/source/ntr_launcher.c b/source/ntr_launcher.c index c4c63c3..fcc161b 100644 --- a/source/ntr_launcher.c +++ b/source/ntr_launcher.c @@ -60,8 +60,8 @@ u32 loadNTRBin(void) { "ntr_3_2.bin", "ntr_3_3.bin", - "ntr_3_4.bin", - "ntr_3_4u.bin" + "ntr_3_5.bin", + "ntr_3_5u.bin" }; if (bnConfig->versionToLaunch == V32) @@ -71,7 +71,7 @@ u32 loadNTRBin(void) else strJoin(path, bnConfig->config->binariesPath + 5, ntrVersionStrings[bnConfig->versionToLaunch]); - if (bnConfig->versionToLaunch == V34) + if (bnConfig->versionToLaunch == V35) { strJoin(ntrConfig->path, bnConfig->config->binariesPath + 5, ntrVersionStrings[bnConfig->versionToLaunch]); #if EXTENDEDMODE diff --git a/source/pathPatcher.c b/source/pathPatcher.c index e08ba32..3083a00 100644 --- a/source/pathPatcher.c +++ b/source/pathPatcher.c @@ -63,8 +63,8 @@ static const char *outNtrVersionStrings[4] = { "ntr_3_2.bin", "ntr_3_3.bin", - "ntr_3_4.bin", - "ntr_3_4u.bin" + "ntr_3_5.bin", + "ntr_3_5u.bin" }; static void patchBinary(u8 *mem, int size) @@ -136,7 +136,7 @@ Result loadAndPatch(version_t version) binPath = bnConfig->config->binariesPath; plgPath = bnConfig->config->pluginPath; - if (version == V34 && isNew3DS) + if (version == V35 && isNew3DS) strJoin(inPath, "romfs:/", ntrVersionStrings[version + 1]); else strJoin(inPath, "romfs:/", ntrVersionStrings[version]); @@ -149,13 +149,13 @@ Result loadAndPatch(version_t version) { strJoin(fixedPath[PLUGIN], plgPath, fixedName[PLUGIN]); - if (version != V34 || !unpatched) + if (version != V35 || !unpatched) { strJoin(outPath, binPath, outNtrVersionStrings[version]); strJoin(fixedPath[BINARY], binPath, outNtrVersionStrings[version]); strJoin(fixedPath[DEBUG], binPath, outNtrVersionStrings[version]); } - else if (version == V34 && unpatched) + else if (version == V35 && unpatched) { strJoin(outPath, binPath, outNtrVersionStrings[3]); strJoin(fixedPath[BINARY], binPath, outNtrVersionStrings[3]); @@ -194,7 +194,7 @@ Result loadAndPatch(version_t version) fclose(ntr); free(mem); - if (version == V34) + if (version == V35) unpatched++; return(0);