diff --git a/include/utils/common.hpp b/include/utils/common.hpp index b598a45..f4204ef 100644 --- a/include/utils/common.hpp +++ b/include/utils/common.hpp @@ -58,7 +58,7 @@ using json = nlohmann::json; extern char * arg0; -#define WORKING_DIR "/" +#define WORKING_DIR "/" #define SCRIPTS_PATH "sdmc:/3ds/Universal-Updater/scripts/" // The Scripts will be here. -#define MUSIC_PATH "sdmc:/3ds/Universal-Updater/Music.wav" // Default Music File / Path. -#define SCRIPT_VERSION 2 \ No newline at end of file +#define MUSIC_PATH "sdmc:/3ds/Universal-Updater/Music.wav" // Default Music File / Path. +#define SCRIPT_VERSION 3 \ No newline at end of file diff --git a/source/screens/ftpScreen.cpp b/source/screens/ftpScreen.cpp index 2fc8789..7985802 100644 --- a/source/screens/ftpScreen.cpp +++ b/source/screens/ftpScreen.cpp @@ -55,7 +55,7 @@ void FTPScreen::Draw(void) const Gui::clearTextBufs(); C3D_FrameBegin(C3D_FRAME_SYNCDRAW); Gui::DrawTop(); - Gui::DrawString((400-Gui::GetStringWidth(0.8f, Lang::get("FTP_MODE")))/2, 0, 0.8f, Config::TxtColor, Lang::get("FTP_MODE"), 400); + Gui::DrawString((400-Gui::GetStringWidth(0.7f, Lang::get("FTP_MODE")))/2, 0, 0.7f, Config::TxtColor, Lang::get("FTP_MODE"), 400); Gui::DrawBottom(); Gui::DrawArrow(0, 218, 0, 1); ret = ACU_GetWifiStatus(&wifiStatus); @@ -76,7 +76,7 @@ void FTPScreen::Draw(void) const } Gui::DrawStringCentered(0, 60, 0.48, Config::TxtColor, buf, 320); - Gui::DrawStringCentered(0, 220, 0.48f, Config::TxtColor, Lang::get("B_FTP_EXIT"), 320); + Gui::DrawStringCentered(0, 222, 0.48f, Config::TxtColor, Lang::get("B_FTP_EXIT"), 320); Gui::clearTextBufs(); C3D_FrameEnd(0); diff --git a/source/screens/mainMenu.cpp b/source/screens/mainMenu.cpp index b95cb87..2ed985a 100644 --- a/source/screens/mainMenu.cpp +++ b/source/screens/mainMenu.cpp @@ -50,8 +50,8 @@ bool isTesting = false; void MainMenu::Draw(void) const { Gui::DrawTop(); - Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, "Universal-Updater", 400); - Gui::DrawString(397-Gui::GetStringWidth(0.5f, V_STRING), 237-Gui::GetStringHeight(0.5f, V_STRING), 0.5f, Config::TxtColor, V_STRING); + Gui::DrawStringCentered(0, 0, 0.7f, Config::TxtColor, "Universal-Updater", 400); + Gui::DrawString(397-Gui::GetStringWidth(0.5f, V_STRING), 239-Gui::GetStringHeight(0.5f, V_STRING), 0.5f, Config::TxtColor, V_STRING); if (fadealpha > 0) Gui::Draw_Rect(0, 0, 400, 240, C2D_Color32(0, 0, 0, fadealpha)); // Fade in out effect Gui::DrawBottom(); Gui::DrawArrow(0, 218, 0, 1); diff --git a/source/screens/scriptBrowse.cpp b/source/screens/scriptBrowse.cpp index 2878828..31489d1 100644 --- a/source/screens/scriptBrowse.cpp +++ b/source/screens/scriptBrowse.cpp @@ -114,16 +114,16 @@ void ScriptBrowse::Draw(void) const { revision += " / "; revision += std::to_string(int64_t(infoJson[selection]["revision"])); - Gui::DrawString(397-Gui::GetStringWidth(0.6f, revision), 237-Gui::GetStringHeight(0.6f, revision), 0.6f, Config::TxtColor, revision); - Gui::DrawStringCentered(0, 0, 0.8f, Config::TxtColor, std::string(infoJson[selection]["title"]), 400); + Gui::DrawString(397-Gui::GetStringWidth(0.6f, revision), 239-Gui::GetStringHeight(0.6f, revision), 0.6f, Config::TxtColor, revision); + Gui::DrawStringCentered(0, 0, 0.7f, Config::TxtColor, std::string(infoJson[selection]["title"]), 400); Gui::DrawStringCentered(0, 120, 0.6f, Config::TxtColor, std::string(infoJson[selection]["shortDesc"]), 400); if(infoJson[selection]["curRevision"] < infoJson[selection]["revision"]) { - Gui::DrawStringCentered(0, 217, 0.7f, Config::TxtColor, Lang::get("OUTDATED_SCRIPT"), 400); + Gui::DrawStringCentered(0, 219, 0.7f, Config::TxtColor, Lang::get("OUTDATED_SCRIPT"), 400); } else if(infoJson[selection]["curRevision"] == infoJson[selection]["revision"]) { - Gui::DrawStringCentered(0, 217, 0.7f, Config::TxtColor, Lang::get("UP-TO-DATE"), 400); + Gui::DrawStringCentered(0, 219, 0.7f, Config::TxtColor, Lang::get("UP-TO-DATE"), 400); } else if(infoJson[selection]["curRevision"] > infoJson[selection]["revision"]) { - Gui::DrawStringCentered(0, 217, 0.7f, Config::TxtColor, Lang::get("FUTURE_SCRIPT"), 400); + Gui::DrawStringCentered(0, 219, 0.7f, Config::TxtColor, Lang::get("FUTURE_SCRIPT"), 400); } Gui::DrawBottom(); Gui::DrawArrow(295, -1); @@ -134,7 +134,7 @@ void ScriptBrowse::Draw(void) const { Gui::spriteBlend(sprites_view_idx, arrowPos[4].x, arrowPos[4].y); //Gui::spriteBlend(sprites_search_idx, arrowPos[5].x, arrowPos[5].y); - Gui::DrawStringCentered(-23, 3, 0.6f, Config::TxtColor, std::to_string(selection + 1) + " / " + maxScripts); + Gui::DrawStringCentered(-23, 1, 0.6f, Config::TxtColor, std::to_string(selection + 1) + " / " + maxScripts); if (Config::viewMode == 0) { for(int i=0;i 54 + i * 25 && touch.px < 54 + i * 25+16 && touch.py > 5 && touch.py < 5+16) { + if(touch.px > 54 + i * 25 && touch.px < 54 + i * 25+16 && touch.py > 2 && touch.py < 2+16) { colorMode = i; } } diff --git a/source/screens/tinyDB.cpp b/source/screens/tinyDB.cpp index 521d0f5..8304721 100644 --- a/source/screens/tinyDB.cpp +++ b/source/screens/tinyDB.cpp @@ -92,9 +92,9 @@ void TinyDB::Draw(void) const { Gui::DrawStringCentered(0, 125, 0.6f, Config::TxtColor, Lang::get("RELEASE_ID") + std::string(tinyDBJson[selectedOption]["info"]["releaseId"]), 400); Gui::DrawStringCentered(0, 155, 0.6f, Config::TxtColor, Lang::get("TITLE_ID") + std::string(tinyDBJson[selectedOption]["info"]["titleid"]), 400); Gui::DrawStringCentered(0, 185, 0.6f, Config::TxtColor, Lang::get("FILE_SIZE") + formatBytes(int64_t(tinyDBJson[selectedOption]["info"]["fileSize"])), 400); - Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, "TinyDB", 400); + Gui::DrawStringCentered(0, 0, 0.7f, Config::TxtColor, "TinyDB", 400); std::string entryAmount = std::to_string(selection+1) + " / " + std::to_string(tinyDBList.size()); - Gui::DrawString(397-Gui::GetStringWidth(0.6f, entryAmount), 237-Gui::GetStringHeight(0.6f, entryAmount), 0.6f, Config::TxtColor, entryAmount); + Gui::DrawString(397-Gui::GetStringWidth(0.6f, entryAmount), 239-Gui::GetStringHeight(0.6f, entryAmount), 0.6f, Config::TxtColor, entryAmount); Gui::setDraw(bottom);