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/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 diff --git a/source/main.cpp b/source/main.cpp index 9d33848..59b0f4f 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 {