Mirrors/Checkpoint
2
0
Fork 0
mirror of https://github.com/BernardoGiordano/Checkpoint synced 2024-11-25 02:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into ftp

Browse source
This commit is contained in:
Bernardo Giordano 2019-07-04 23:11:30 +02:00 committed by GitHub
commit b64702d030
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
3ds/source/title.cpp
View file

@ -375,6 +375,10 @@ u32 Title::extdataId(void)
return 0x12DC; // Fire Emblem If JP
case 0x001B5100:
return 0x1B50; // Pokémon Ultramoon
// TODO: need confirmation for this
// case 0x001C5100:
// case 0x001C5300:
// return 0x0BD3; // Etrian Odyssey V: Beyond the Myth
}
return low >> 8;

30
switch/include/colors.hpp
View file

@ -29,22 +29,22 @@
#include "SDLHelper.hpp"
extern const SDL_Color COLOR_WHITE;
extern const SDL_Color COLOR_BLACK;
extern const SDL_Color COLOR_BLUE;
extern const SDL_Color COLOR_GREEN;
extern const SDL_Color COLOR_RED;
extern const SDL_Color COLOR_GOLD;
extern const SDL_Color COLOR_OVERLAY;
extern const SDL_Color COLOR_WHITEMASK;
extern const SDL_Color COLOR_NULL;
inline const SDL_Color COLOR_WHITE = FC_MakeColor(255, 255, 255, 255);
inline const SDL_Color COLOR_BLACK = FC_MakeColor(0, 0, 0, 255);
inline const SDL_Color COLOR_BLUE = FC_MakeColor(29, 50, 243, 255);
inline const SDL_Color COLOR_GREEN = FC_MakeColor(0, 254, 197, 255);
inline const SDL_Color COLOR_RED = FC_MakeColor(255, 81, 48, 255);
inline const SDL_Color COLOR_GOLD = FC_MakeColor(255, 215, 0, 255);
inline const SDL_Color COLOR_OVERLAY = FC_MakeColor(0, 0, 0, 160);
inline const SDL_Color COLOR_WHITEMASK = FC_MakeColor(255, 255, 255, 80);
inline const SDL_Color COLOR_NULL = FC_MakeColor(0, 0, 0, 0);
extern const SDL_Color COLOR_GREY_BG;
extern const SDL_Color COLOR_GREY_DARKER;
extern const SDL_Color COLOR_GREY_DARK;
extern const SDL_Color COLOR_GREY_MEDIUM;
extern const SDL_Color COLOR_GREY_LIGHT;
extern const SDL_Color COLOR_HIGHBLUE;
inline const SDL_Color COLOR_GREY_BG = FC_MakeColor(51, 51, 51, 255);
inline const SDL_Color COLOR_GREY_DARKER = FC_MakeColor(70, 70, 70, 255);
inline const SDL_Color COLOR_GREY_DARK = FC_MakeColor(79, 79, 79, 255);
inline const SDL_Color COLOR_GREY_MEDIUM = FC_MakeColor(94, 94, 94, 255);
inline const SDL_Color COLOR_GREY_LIGHT = FC_MakeColor(138, 138, 138, 255);
inline const SDL_Color COLOR_HIGHBLUE = FC_MakeColor(48, 65, 106, 255);
struct Theme {
SDL_Color c0;

15
switch/include/main.hpp
View file

@ -33,14 +33,13 @@
#include <memory>
#include <switch.h>
extern bool g_backupScrollEnabled;
extern float g_currentTime;
extern u128 g_currentUId;
extern bool g_notificationLedAvailable;
extern bool g_ftpAvailable;
extern std::shared_ptr<Screen> g_screen;
extern std::string g_selectedCheatKey;
extern std::vector<std::string> g_selectedCheatCodes;
inline float g_currentTime = 0;
inline u128 g_currentUId = 0;
inline bool g_backupScrollEnabled = 0;
inline bool g_notificationLedAvailable = false;
inline std::shared_ptr<Screen> g_screen = nullptr;
inline std::string g_selectedCheatKey;
inline std::vector<std::string> g_selectedCheatCodes;
inline bool g_shouldExitNetworkLoop = false;
#endif

3
switch/source/cheatmanager.cpp
View file

@ -26,9 +26,6 @@
#include "cheatmanager.hpp"
std::string g_selectedCheatKey;
std::vector<std::string> g_selectedCheatCodes;
CheatManager::CheatManager(void)
{
mCheats = nullptr;

17
switch/source/colors.cpp
View file

@ -26,23 +26,6 @@
#include "colors.hpp"
const SDL_Color COLOR_WHITE = FC_MakeColor(255, 255, 255, 255);
const SDL_Color COLOR_BLACK = FC_MakeColor(0, 0, 0, 255);
const SDL_Color COLOR_BLUE = FC_MakeColor(29, 50, 243, 255);
const SDL_Color COLOR_GREEN = FC_MakeColor(0, 254, 197, 255);
const SDL_Color COLOR_RED = FC_MakeColor(255, 81, 48, 255);
const SDL_Color COLOR_GOLD = FC_MakeColor(255, 215, 0, 255);
const SDL_Color COLOR_OVERLAY = FC_MakeColor(0, 0, 0, 160);
const SDL_Color COLOR_WHITEMASK = FC_MakeColor(255, 255, 255, 80);
const SDL_Color COLOR_NULL = FC_MakeColor(0, 0, 0, 0);
const SDL_Color COLOR_GREY_BG = FC_MakeColor(51, 51, 51, 255);
const SDL_Color COLOR_GREY_DARKER = FC_MakeColor(70, 70, 70, 255);
const SDL_Color COLOR_GREY_DARK = FC_MakeColor(79, 79, 79, 255);
const SDL_Color COLOR_GREY_MEDIUM = FC_MakeColor(94, 94, 94, 255);
const SDL_Color COLOR_GREY_LIGHT = FC_MakeColor(138, 138, 138, 255);
const SDL_Color COLOR_HIGHBLUE = FC_MakeColor(48, 65, 106, 255);
static const struct Theme defaultTheme = {
COLOR_BLACK, // c0
COLOR_GREY_BG, // c1