From bc5e750e50fae126bb23e7d00f6bf5110417c17d Mon Sep 17 00:00:00 2001
From: Kronos2308 <36446521+Kronos2308@users.noreply.github.com>
Date: Tue, 21 Jan 2020 16:22:34 +0000
Subject: [PATCH 1/2] remove mods from nfpemu.c for easy update in future

---
 source/AmiigoUI.cpp | 2 +-
 source/main.cpp     | 1 +
 source/nfpemu.c     | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/AmiigoUI.cpp b/source/AmiigoUI.cpp
index 9b587d1..2c9db64 100644
--- a/source/AmiigoUI.cpp
+++ b/source/AmiigoUI.cpp
@@ -285,7 +285,7 @@ void AmiigoUI::DrawHeader()
 void AmiigoUI::DrawFooter()
 {
 	//Get info about the current status
-	NfpEmuEmulationStatus CurrentStatus;
+	NfpEmuEmulationStatus CurrentStatus = (NfpEmuEmulationStatus)3;
 	nfpemuGetStatus(&CurrentStatus);
 	//Draw the footer
 	int FooterYOffset = *Height - FooterHeight;
diff --git a/source/main.cpp b/source/main.cpp
index 5963f37..52c3cf6 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -61,6 +61,7 @@ int main(int argc, char *argv[])
 
 	TTF_Init(); //Init the font
 	plInitialize(); //Init needed for shared font
+	if (nfpemuIsAccessible())
 	nfpemuInitialize(); //Init nfp ipc
 	
 	//Give MainUI access to vars
diff --git a/source/nfpemu.c b/source/nfpemu.c
index 2ee0a64..02fd06d 100644
--- a/source/nfpemu.c
+++ b/source/nfpemu.c
@@ -18,9 +18,7 @@ Result nfpemuInitialize()
 {
     atomicIncrement64(&g_refCnt);
     if(serviceIsActive(&g_nfpEmuSrv)) return 0;
-	if (nfpemuIsAccessible())
     return smGetService(&g_nfpEmuSrv, "nfp:emu");
-	return 0;
 }
 
 void nfpemuExit()
@@ -279,7 +277,6 @@ Result nfpemuMoveToNextAmiibo()
 
 Result nfpemuGetStatus(NfpEmuEmulationStatus *out)
 {
-	*out = 3;
     IpcCommand c;
     ipcInitialize(&c);
     struct {

From 3fdc0a3f484e2a3adad33efe7e5ff3b351385f74 Mon Sep 17 00:00:00 2001
From: Kronos2308 <36446521+Kronos2308@users.noreply.github.com>
Date: Tue, 21 Jan 2020 17:20:14 +0000
Subject: [PATCH 2/2] color scheme

---
 source/UI.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/UI.cpp b/source/UI.cpp
index 5b72c9f..abd4863 100644
--- a/source/UI.cpp
+++ b/source/UI.cpp
@@ -83,12 +83,12 @@ void ScrollList::DrawList()
 	for(int i = 0; i < ListLength; i++)
 	{
 		//Set the background color
-		if(IsActive) SDL_SetRenderDrawColor(renderer, 96, 204, 204, 255);
-		else SDL_SetRenderDrawColor(renderer, 96, 204, 204, 255);
+		if(IsActive) SDL_SetRenderDrawColor(renderer, 136, 254, 254, 255);
+		else SDL_SetRenderDrawColor(renderer, 0, 178, 212, 255);
 		//Check if this is the highlighted file
 		if(i == CursorIndex && IsActive)
 		{
-			SDL_SetRenderDrawColor(renderer, 136, 254, 254, 255);
+			SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
 			//Cyan 50
 			//if(IsActive) SDL_SetRenderDrawColor(renderer, 224, 247, 250, 255);
 			//else SDL_SetRenderDrawColor(renderer, 232, 234, 246, 255); //Indigo