Add ETA, remove fork, custom USB comms...

.gitignore

@@ -0,0 +1,16 @@
+build/
+Build/
+Output/
+*.nso
+*.nro
+*.nsp
+*.elf
+keys.dat
+hacbrewpack_backup/
+hacbrewpack_nca/
+hacbrewpack_nsp/
+hacbrewpack_temp/
+.vscode/
+.vs/
+bin/
+obj/

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "Plutonium"]
 	path = Plutonium
 	url = https://github.com/XorTroll/Plutonium
-[submodule "libnx"]
-	path = libnx
-	url = https://github.com/XorTroll/libnx

Forwarder/Include/Forwarder.hpp

@@ -8,8 +8,8 @@
 
 static std::vector<std::string> GoldleafPaths =
 {
-    "switch/Goldleaf.nro",
     "switch/Goldleaf/Goldleaf.nro",
+    "switch/Goldleaf.nro",
 };
 
 inline std::string GetGoldleaf()
@@ -36,11 +36,4 @@ inline void FatalError(std::string Err, std::string MoreInfo)
     std::cout << std::endl << "FATAL - An error ocurred attempting to " << Err << "." << std::endl << MoreInfo;
     consoleUpdate(NULL);
     while(true);
-}
-
-inline void ForwarderProcess(std::string Arg)
-{
-    std::string gnro = GetGoldleaf();
-    if(gnro.empty()) FatalError("find Goldleaf NRO", "Place it on '/switch' folder.");
-    targetNro(gnro.c_str(), (gnro + " " + Arg).c_str());
 }

Forwarder/Source/Main.cpp

@@ -3,6 +3,6 @@
 int main()
 {
     std::string gnro = GetGoldleaf();
-    if(gnro.empty()) FatalError("find Goldleaf NRO", "Place it on '/switch' folder.");
+    if(gnro.empty()) FatalError("find Goldleaf NRO", "Place it on 'sd:/switch' (or 'sd:/switch/Goldleaf') folder.");
     targetNro(gnro.c_str(), gnro.c_str());
 }

Forwarder/Source/hbl-Trampoline.s

@@ -21,8 +21,7 @@ nroEntrypointTrampoline:
 
     // Save retval
     adrp x1, g_lastRet
-    add  x1, x1, #:lo12:g_lastRet
-    str  x0, [x1]
+    str  w0, [x1, #:lo12:g_lastRet]
 
     // Reset stack pointer and load next NRO.
     adrp x8, __stack_top