From 0419fc4e304663ad2028e8f4fa0226e14dd6be39 Mon Sep 17 00:00:00 2001 From: Aurora Wright Date: Sun, 20 Aug 2017 16:13:57 +0200 Subject: [PATCH] Reinstate ntrboot display in config --- source/config.c | 2 +- source/main.c | 4 ++-- source/types.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/config.c b/source/config.c index 7f31590..6cf4516 100644 --- a/source/config.c +++ b/source/config.c @@ -239,7 +239,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode) initScreens(); - drawString(true, 10, 10, COLOR_TITLE, CONFIG_TITLE); + drawFormattedString(true, 10, 10, COLOR_TITLE, "%s%s", CONFIG_TITLE, isNtrcardBoot ? " (ntrboot)" : ""); drawString(true, 10, 10 + SPACING_Y, COLOR_TITLE, "Press A to select, START to save"); //Character to display a selected option diff --git a/source/main.c b/source/main.c index c96e8bb..8499b29 100644 --- a/source/main.c +++ b/source/main.c @@ -43,13 +43,13 @@ extern ConfigurationStatus needConfig; extern FirmwareSource firmSource; bool isFirmlaunch = false, - isSdMode; + isSdMode, + isNtrcardBoot; u16 launchedPath[41]; void main(int argc, char **argv, u32 magicWord) { bool isFirmProtEnabled, - isNtrcardBoot, isSafeMode = false, isNoForceFlagSet = false; FirmwareType firmType; diff --git a/source/types.h b/source/types.h index 8a1d8e2..f3ec2e7 100644 --- a/source/types.h +++ b/source/types.h @@ -115,7 +115,8 @@ typedef enum FirmwareType } FirmwareType; extern bool isFirmlaunch, - isSdMode; + isSdMode, + isNtrcardBoot; extern u16 launchedFirmTidLow[8]; extern u16 launchedPath[41];