From 1d4245e582a1c21346f3a8227cd5582bf4a15bbb Mon Sep 17 00:00:00 2001
From: TuxSH <tuxsh@sfr.fr>
Date: Thu, 18 May 2017 01:24:35 +0200
Subject: [PATCH] Set 0x18..0x1F only on O3DS

---
 source/firm.c | 9 ---------
 source/fs.c   | 1 +
 source/main.c | 6 +-----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/source/firm.c b/source/firm.c
index 3ae04b9..59c415d 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -124,9 +124,6 @@ u32 patchNativeFirm(u32 firmVersion, FirmwareSource nandType, u32 emuHeader, boo
         kernel9Loader((Arm9Bin *)arm9Section);
         firm->arm9Entry = (u8 *)0x801B01C;
     }
-
-    if(!ISN3DS)
-        kernel9Loader(NULL); //Just set the N3DS 9.6+ keys even on O3DS
     
     //Find the Process9 .code location, size and memory address
     u32 process9Size,
@@ -227,8 +224,6 @@ u32 patchTwlFirm(u32 firmVersion, bool doUnitinfoPatch)
         kernel9Loader((Arm9Bin *)arm9Section);
         firm->arm9Entry = (u8 *)0x801301C;
     }
-    else
-        kernel9Loader(NULL); //Just set the keys
 
     //Find the Process9 .code location, size and memory address
     u32 process9Size,
@@ -262,8 +257,6 @@ u32 patchAgbFirm(bool doUnitinfoPatch)
         kernel9Loader((Arm9Bin *)arm9Section);
         firm->arm9Entry = (u8 *)0x801301C;
     }
-    else
-        kernel9Loader(NULL); //Just set the keys
 
     //Find the Process9 .code location, size and memory address
     u32 process9Size,
@@ -292,8 +285,6 @@ u32 patch1x2xNativeAndSafeFirm(bool enableExceptionHandlers)
         kernel9Loader((Arm9Bin *)arm9Section);
         firm->arm9Entry = (u8 *)0x801B01C;
     }
-    else
-        kernel9Loader(NULL); //Just set the keys
 
     //Find the Process9 .code location, size and memory address
     u32 process9Size,
diff --git a/source/fs.c b/source/fs.c
index df7973e..8fc5652 100644
--- a/source/fs.c
+++ b/source/fs.c
@@ -163,6 +163,7 @@ void loadPayload(u32 pressed, const char *payloadPath)
 
     memcpy(loaderAddress, loader_bin, loader_bin_size);
 
+    if(ISN3DS) kernel9Loader(NULL);
     backupAndRestoreShaHash(true);
     initScreens();
 
diff --git a/source/main.c b/source/main.c
index 5e6ab25..acb84d8 100644
--- a/source/main.c
+++ b/source/main.c
@@ -158,11 +158,7 @@ void main(void)
         pressed = HID_PAD;
     }
     else if(((pressed & SINGLE_PAYLOAD_BUTTONS) && !(pressed & (BUTTON_L1 | BUTTON_R1 | BUTTON_A))) ||
-            ((pressed & L_PAYLOAD_BUTTONS) && (pressed & BUTTON_L1)))
-    {
-        kernel9Loader(NULL);
-        loadPayload(pressed, NULL);
-    }
+            ((pressed & L_PAYLOAD_BUTTONS) && (pressed & BUTTON_L1))) loadPayload(pressed, NULL);
 
     if(splashMode == 2) loadSplash();