Update to v1.1.13.

DarkMatterCore · Feb 25, 2021 · ecae221 · ecae221
1 parent 0d3dd50
commit ecae221
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 164 deletions.
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 
 VERSION_MAJOR := 1
 VERSION_MINOR := 1
-VERSION_MICRO := 12
+VERSION_MICRO := 13
 
 APP_TITLE	:=	nxdumptool
 APP_AUTHOR	:=	DarkMatterCore

diff --git a/README.md b/README.md
@@ -73,6 +73,13 @@ Thanks to
 Changelog
 --------------
 
+**v1.1.13:**
+
+* Fixed compatibility with latest libnx release.
+* Now using the `AtmosphereHasService` SM API extension to check if a service is running. More than a year and a half has passed since this feature was introduced in Atmosphère, and it is now part of both SX OS and ReiNX, so it's a justified change. Fixes issues related to sysmodules and SM port exhaustion.
+
+This is only a bugfix release. I don't expect to release any new versions until the rewrite is finished - the only exception being fixing some kind of feature-breaking bug. Please understand.
+
 **v1.1.12:**
 
 * Fixed RomFS dumping/browsing support for games with base Program NCAs without a RomFS section (e.g. Fortnite, World of Tanks Blitz, etc.). Big thanks to [bigkahuna666](https://github.com/bigkahuna666) for reporting the issue and providing with testing.

diff --git a/source/dumper.c b/source/dumper.c
@@ -2795,24 +2795,24 @@ int dumpNintendoSubmissionPackageBatch(batchOptions *batchDumpCfg)
             uiUpdateStatusMsg();
             uiRefreshDisplay();
 
-            hidScanInput();
+            scanPads();
 
-            keysDown = hidKeysAllDown(CONTROLLER_P1_AUTO);
-            keysHeld = hidKeysAllHeld(CONTROLLER_P1_AUTO);
+            keysDown = getButtonsDown();
+            keysHeld = getButtonsHeld();
 
-            if ((keysDown && !(keysDown & KEY_TOUCH)) || (keysHeld && !(keysHeld & KEY_TOUCH))) break;
+            if (keysDown || keysHeld) break;
         }
 
         // Exit
-        if (keysDown & KEY_PLUS)
+        if (keysDown & HidNpadButton_Plus)
         {
             ret = -2;
             proceed = false;
             break;
         }
 
         // Start batch dump process
-        if (keysDown & KEY_A)
+        if (keysDown & HidNpadButton_A)
         {
             // Check if we have at least a single enabled entry
             for(i = 0; i < totalTitleCount; i++)
@@ -2830,29 +2830,29 @@ int dumpNintendoSubmissionPackageBatch(batchOptions *batchDumpCfg)
         }
 
         // Cancel batch dump process
-        if (keysDown & KEY_B)
+        if (keysDown & HidNpadButton_B)
         {
             proceed = false;
             break;
         }
 
         // Toggle selected entry
-        if (keysDown & KEY_Y) batchEntries[selectedSummaryEntry].enabled ^= 0x01;
+        if (keysDown & HidNpadButton_Y) batchEntries[selectedSummaryEntry].enabled ^= 0x01;
 
         // Disable all entries
-        if (keysDown & KEY_L)
+        if (keysDown & HidNpadButton_L)
         {
             for(i = 0; i < totalTitleCount; i++) batchEntries[i].enabled = false;
         }
 
         // Enable all entries
-        if (keysDown & KEY_R)
+        if (keysDown & HidNpadButton_R)
         {
             for(i = 0; i < totalTitleCount; i++) batchEntries[i].enabled = true;
         }
 
         // Change page (left)
-        if ((keysDown & KEY_ZL) && totalTitleCount > maxSummaryFileCount)
+        if ((keysDown & HidNpadButton_ZL) && totalTitleCount > maxSummaryFileCount)
         {
             if (summaryPage > 0)
             {
@@ -2862,7 +2862,7 @@ int dumpNintendoSubmissionPackageBatch(batchOptions *batchDumpCfg)
         }
 
         // Change page (right)
-        if ((keysDown & KEY_ZR) && totalTitleCount > maxSummaryFileCount)
+        if ((keysDown & HidNpadButton_ZR) && totalTitleCount > maxSummaryFileCount)
         {
             if (((summaryPage + 1) * maxSummaryFileCount) < totalTitleCount)
             {
@@ -2872,13 +2872,13 @@ int dumpNintendoSubmissionPackageBatch(batchOptions *batchDumpCfg)
         }
 
         // Go up
-        if ((keysDown & KEY_DUP) || (keysDown & KEY_LSTICK_UP) || (keysHeld & KEY_RSTICK_UP))
+        if ((keysDown & HidNpadButton_Up) || (keysDown & HidNpadButton_StickLUp) || (keysHeld & HidNpadButton_StickRUp))
         {
             if (selectedSummaryEntry > (summaryPage * maxSummaryFileCount))
             {
                 selectedSummaryEntry--;
             } else {
-                if ((keysDown & KEY_DUP) || (keysDown & KEY_LSTICK_UP))
+                if ((keysDown & HidNpadButton_Up) || (keysDown & HidNpadButton_StickLUp))
                 {
                     if (((summaryPage + 1) * maxSummaryFileCount) < totalTitleCount)
                     {
@@ -2891,13 +2891,13 @@ int dumpNintendoSubmissionPackageBatch(batchOptions *batchDumpCfg)
         }
 
         // Go down
-        if ((keysDown & KEY_DDOWN) || (keysDown & KEY_LSTICK_DOWN) || (keysHeld & KEY_RSTICK_DOWN))
+        if ((keysDown & HidNpadButton_Down) || (keysDown & HidNpadButton_StickLDown) || (keysHeld & HidNpadButton_StickRDown))
         {
             if (((((summaryPage + 1) * maxSummaryFileCount) < totalTitleCount) && selectedSummaryEntry < (((summaryPage + 1) * maxSummaryFileCount) - 1)) || ((((summaryPage + 1) * maxSummaryFileCount) >= totalTitleCount) && selectedSummaryEntry < (totalTitleCount - 1)))
             {
                 selectedSummaryEntry++;
             } else {
-                if ((keysDown & KEY_DDOWN) || (keysDown & KEY_LSTICK_DOWN))
+                if ((keysDown & HidNpadButton_Down) || (keysDown & HidNpadButton_StickLDown))
                 {
                     selectedSummaryEntry = (summaryPage * maxSummaryFileCount);
                 }