diff --git a/Makefile b/Makefile
index 4442373..5536a4a 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -fpermissive -std=gnu++17
ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-LIBS := -lcurl -lmbedtls -lmbedx509 -lmbedcrypto -larchive -lbz2 -llzma -lz -lcitro2d -lcitro3d -lctru -lm -lstdc++
+LIBS := -lcitro2d -lcitro3d -lctru -lstdc++
#---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing
diff --git a/assets/gfx/logo_UniversalCore.png b/assets/gfx/logo_UniversalCore.png
deleted file mode 100644
index 2c46bae..0000000
Binary files a/assets/gfx/logo_UniversalCore.png and /dev/null differ
diff --git a/assets/gfx/logo_horiHD.png b/assets/gfx/logo_horiHD.png
deleted file mode 100644
index 2b4ae72..0000000
Binary files a/assets/gfx/logo_horiHD.png and /dev/null differ
diff --git a/assets/gfx/logo_rocketrobz.png b/assets/gfx/logo_rocketrobz.png
deleted file mode 100644
index 57b4e30..0000000
Binary files a/assets/gfx/logo_rocketrobz.png and /dev/null differ
diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s
index d3f8a35..8f47d43 100644
--- a/assets/gfx/sprites.t3s
+++ b/assets/gfx/sprites.t3s
@@ -21,6 +21,3 @@ twinkle_1.png
twinkle_2.png
twinkle_3.png
twlm_logo.png
-logo_horiHD.png
-logo_rocketrobz.png
-logo_UniversalCore.png
diff --git a/include/animation.hpp b/include/animation.hpp
deleted file mode 100644
index 1a4824c..0000000
--- a/include/animation.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* This file is part of Universal-Updater
-* Copyright (C) 2019-2020 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see .
-*
-* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-* * Requiring preservation of specified reasonable legal notices or
-* author attributions in that material or in the Appropriate Legal
-* Notices displayed by works containing it.
-* * Prohibiting misrepresentation of the origin of that material,
-* or requiring that modified versions of such material be marked in
-* reasonable ways as different from the original version.
-*/
-
-#ifndef ANIMATION_HPP
-#define ANIMATION_HPP
-
-#include <3ds.h>
-#include
-
-namespace Animation {
- // Progressbar.
- void DrawProgressBar(float currentProgress, float totalProgress);
-}
-
-#endif
\ No newline at end of file
diff --git a/include/download.hpp b/include/download.hpp
deleted file mode 100755
index c1139ee..0000000
--- a/include/download.hpp
+++ /dev/null
@@ -1,152 +0,0 @@
-#pragma once
-
-#include "common.hpp"
-
-#define APP_TITLE "TWLMenu Updater"
-
-enum DownloadError {
- DL_ERROR_NONE = 0,
- DL_ERROR_WRITEFILE,
- DL_ERROR_ALLOC,
- DL_ERROR_STATUSCODE,
- DL_ERROR_GIT,
-};
-
-struct ThemeEntry {
- std::string downloadUrl;
- std::string name;
- std::string path;
- std::string sdPath;
-};
-
-// Prompts the user to sign in to GitHub to get past the rate limit
-bool promtUsernamePassword(void);
-
-// Loads saved username / password for GitHub API
-void loadUsernamePassword(void);
-
-// Saves the username / password for GitHub API
-void saveUsernamePassword(void);
-
-Result downloadToFile(std::string url, std::string path);
-Result downloadFromRelease(std::string url, std::string asset, std::string path);
-
-/**
- * Check Wi-Fi status.
- * @return True if Wi-Fi is connected; false if not.
- */
-bool checkWifiStatus(void);
-
-/**
- * Display "Please connect to Wi-Fi" for 2s.
- */
-void notConnectedMsg(void);
-
-/**
- * Get info from the GitHub API about a Release.
- * repo is where to get from. (Ex. "DS-Homebrew/TWiLightMenu")
- * item is that to get from the API. (Ex. "tag_name")
- * @return the string from the API.
- */
-std::string getLatestRelease(std::string repo, std::string item, bool retrying = false);
-
-/**
- * Get info from the GitHub API about a Commit.
- * repo is where to get from. (Ex. "DS-Homebrew/TWiLightMenu")
- * item is that to get from the API. (Ex. "sha")
- * @return the string from the API.
- */
-std::vector getRecentCommits(std::string repo, std::string item, bool retrying = false);
-
-/**
- * Get info from the GitHub API about a Commit.
- * repo is where to get from. (Ex. "DS-Homebrew/TWiLightMenu")
- * array is the array the item is in. (Ex. "commit")
- * item is that to get from the API. (Ex. "message")
- * @return the string from the API.
- */
-std::vector getRecentCommitsArray(std::string repo, std::string array, std::string item, bool retrying = false);
-
-/**
- * Get a GitHub directory's contents with the GitHub API.
- * repo is where to get from. (Ex. "DS-Homebrew/twlmenu-extras")
- * path is the path within the repo (Ex. "contents/_nds/TWiLightMenu/dsimenu/themes")
- * @return the string from the API.
- */
-std::vector getThemeList(std::string repo, std::string path, bool retrying = false);
-
-/**
- * Show the latest release's name and message.
- * repo is where to get from. (Ex. "DS-Homebrew/TWiLightMenu")
- * drawMessageText is whether to show the Cancel/Update text at the bottom
- */
-bool showReleaseInfo(std::string repo, bool drawMessageText);
-
-/**
- * Show the latest commit's name and message.
- * repo is where to get from. (Ex. "TWlBot/Builds")
- * title is what the commit title needs to start with (Ex. "TWiLightMenu")
- * drawMessageText is whether to show the Cancel/Update text at the bottom
- */
-std::string chooseCommit(std::string repo, std::string title, bool showExitText);
-
-/**
- * Prepare text for showing a release/commit message.
- * text is the text you want to show.
- */
-void setMessageText(const std::string &text);
-
-/**
- * Draw text prepared by setMessageText.
- * position is which line start on.
- */
-void drawMessageText(int position, bool drawMessageText);
-
-/**
- * Check for updates.
- */
-void checkForUpdates(void);
-
-/**
- * Update nds-bootstrap to the latest build.
- * commit is the TWlBot commit, leave blank for release
- */
-void updateBootstrap(std::string commit);
-
-/**
- * Update TWiLight Menu++ to the latest build.
- * commit is the TWlBot commit, leave blank for release
- */
-void updateTWiLight(std::string commit);
-
-/**
- * Update TWiLight Menu++ to the latest Nightly Lite build.
- * commit is the TWlBot commit. Leave blank for latest Nightly.
- */
-void updateTWiLightLite(std::string commit);
-
-/**
- * Update the TWiLight Menu++ Updater to the latest build.
- * commit is the TWlBot commit, leave blank for release
- */
-void updateSelf(std::string commit);
-
-/**
- * Update DeadSkullzJr's cheat DB to the latest version.
- */
-void updateCheats(void);
-
-/**
- * Display a menu to choose to download boxart or themes.
- */
-void downloadExtras(void);
-
-/**
- * Download boxart from gametdb for all roms found on SD.
- */
-void downloadBoxart(void);
-
-/**
- * Download themes from DS-Homebrew/twlmenu-extras.
- */
-void downloadThemes(void);
diff --git a/include/fileBrowse.hpp b/include/fileBrowse.hpp
deleted file mode 100644
index a2f3242..0000000
--- a/include/fileBrowse.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef FILE_BROWSE_HPP
-#define FILE_BROWSE_HPP
-
-#include
-#include
-#include
-
-using namespace std;
-
-struct DirEntry {
- string name;
- bool isDirectory;
- char tid[5];
- off_t size;
-};
-
-typedef struct {
- char gameTitle[12]; //!< 12 characters for the game title.
- char gameCode[4]; //!< 4 characters for the game code.
-} sNDSHeadertitlecodeonly;
-
-void findNdsFiles(vector& dirContents);
-
-void getDirectoryContents (vector& dirContents);
-
-#endif //FILE_BROWSE_HPP
diff --git a/include/msg.hpp b/include/msg.hpp
deleted file mode 100644
index 7dac55d..0000000
--- a/include/msg.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef MSG_HPP
-#define MSG_HPP
-
-#include
-
-namespace Msg
-{
- void DisplayMsg(std::string text);
- bool promptMsg(std::string promptMsg);
-}
-
-#endif
\ No newline at end of file
diff --git a/include/screens/rocketRobz.hpp b/include/screens/rocketRobz.hpp
deleted file mode 100644
index fcdd4bb..0000000
--- a/include/screens/rocketRobz.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _TWLM_UPDATER_ROCKETROBZ_HPP
-#define _TWLM_UPDATER_ROCKETROBZ_HPP
-
-#include "common.hpp"
-
-class RocketRobz : public Screen {
-public:
- void Draw(void) const override;
- void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
-private:
- //bool musicPlayed = false;
- const char* presentedText = "Presented in";
- const char* yearText = "2017-2020 RocketRobz";
-};
-
-#endif
\ No newline at end of file
diff --git a/include/screens/updaterScreen.hpp b/include/screens/updaterScreen.hpp
index 3fe6f95..424fe3e 100644
--- a/include/screens/updaterScreen.hpp
+++ b/include/screens/updaterScreen.hpp
@@ -12,42 +12,6 @@ class UpdaterScreen : public Screen
void Draw(void) const override;
void Logic(u32 hDown, u32 hHeld, touchPosition touch) override;
UpdaterScreen();
-
-private:
- void checkUpdates();
- bool buttonShading = false;
- bool setOption = false;
- bool showMessage = false;
- int menuSelection = 0;
-
- const std::array button_titles2 = {
- "Release",
- "Nightly",
- "Release",
- "Nightly",
- "Release",
- "Nightly",
- "Cheats",
- "Extras",
- };
-
- const std::array title_spacing = {
- 6,
- 10,
- 6,
- 10,
- 6,
- 10,
- 10,
- 17,
- };
-
- const std::array row_titles2 = {
- "TWL Menu++",
- "nds-bootstrap",
- "Updater",
- "Downloads",
- };
};
#endif
\ No newline at end of file
diff --git a/include/utils/cia.h b/include/utils/cia.h
deleted file mode 100644
index 39816f8..0000000
--- a/include/utils/cia.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "common.hpp"
-
-Result installCia(const char * ciaPath);
diff --git a/include/utils/cia.hpp b/include/utils/cia.hpp
deleted file mode 100644
index f1da4be..0000000
--- a/include/utils/cia.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef CIA_HPP
-#define CIA_HPP
-
-#include "common.hpp"
-
-#include <3ds.h>
-
-Result CIA_LaunchTitle(u64 titleId, FS_MediaType mediaType);
-Result deletePrevious(u64 titleid, FS_MediaType media);
-Result installCia(const char * ciaPath, bool updateSelf);
-
-#endif
\ No newline at end of file
diff --git a/include/utils/common.hpp b/include/utils/common.hpp
index 1f5c9bd..a27ae53 100755
--- a/include/utils/common.hpp
+++ b/include/utils/common.hpp
@@ -11,8 +11,6 @@ extern "C" {
#include
#include
-#include "file.h"
-
#ifdef __cplusplus
}
@@ -20,17 +18,10 @@ extern "C" {
#include
#include
#include
-#include
-#include
#include "gfx.hpp"
#include "gui.hpp"
-#include "json.hpp"
-#include "msg.hpp"
#include "screenCommon.hpp"
-#include "stringutils.hpp"
-
-using json = nlohmann::json;
#endif
diff --git a/include/utils/dumpdsp.h b/include/utils/dumpdsp.h
deleted file mode 100644
index f18ba39..0000000
--- a/include/utils/dumpdsp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef DUMPDSP_H
-#define DUMPDSP_H
-
-void dumpDsp(void);
-
-#endif /* DUMPDSP_H */
diff --git a/include/utils/extract.hpp b/include/utils/extract.hpp
deleted file mode 100644
index 2c6e76c..0000000
--- a/include/utils/extract.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "common.hpp"
-
-enum ExtractError {
- EXTRACT_ERROR_NONE = 0,
- EXTRACT_ERROR_ARCHIVE,
- EXTRACT_ERROR_ALLOC,
- EXTRACT_ERROR_FIND,
- EXTRACT_ERROR_READFILE,
- EXTRACT_ERROR_OPENFILE,
- EXTRACT_ERROR_WRITEFILE,
-};
-
-Result extractArchive(std::string archivePath, std::string wantedFile, std::string outputPath);
diff --git a/include/utils/file.h b/include/utils/file.h
deleted file mode 100755
index e8a10af..0000000
--- a/include/utils/file.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "common.hpp"
-
-Result makeDirs(const char * path);
-Result openFile(Handle* fileHandle, const char * path, bool write);
-Result deleteFile(const char * path);
-Result removeDir(const char * path);
-Result removeDirRecursive(const char * path);
\ No newline at end of file
diff --git a/include/utils/formatting.hpp b/include/utils/formatting.hpp
deleted file mode 100644
index a21a61e..0000000
--- a/include/utils/formatting.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-* This file is part of Universal-Updater
-* Copyright (C) 2019-2020 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see .
-*
-* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
-* * Requiring preservation of specified reasonable legal notices or
-* author attributions in that material or in the Appropriate Legal
-* Notices displayed by works containing it.
-* * Prohibiting misrepresentation of the origin of that material,
-* or requiring that modified versions of such material be marked in
-* reasonable ways as different from the original version.
-*/
-
-#ifndef FORMATTING_HPP
-#define FORMATTING_HPP
-
-#include
-
-std::string formatBytes(int bytes);
-
-#endif
\ No newline at end of file
diff --git a/include/utils/inifile.h b/include/utils/inifile.h
deleted file mode 100644
index 4cddf6c..0000000
--- a/include/utils/inifile.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- inifile.h
- Copyright (C) 2007 Acekard, www.acekard.com
- Copyright (C) 2007-2009 somebody
- Copyright (C) 2009-2010 yellow wood goblin
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-*/
-
-#ifndef _INIFILE_H_
-#define _INIFILE_H_
-
-#include
-#include
-#include