From 2be5a24262ca2219bb2cc711e6439b75573d53bd Mon Sep 17 00:00:00 2001
From: Aurora <davidone92@katamail.com>
Date: Tue, 22 Nov 2016 23:04:15 +0100
Subject: [PATCH] Move magic to the payload again

---
 source/installer.c | 17 ++++++++++-------
 source/installer.h |  2 ++
 source/start.s     |  7 +++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/source/installer.c b/source/installer.c
index 271fbd9..5b0e50d 100755
--- a/source/installer.c
+++ b/source/installer.c
@@ -57,7 +57,6 @@ static const u8 sectorHashRetail[SHA_256_HASH_SIZE] = {
     0xF2, 0x38, 0x14, 0x58, 0x10, 0x83, 0x56, 0x4F, 0x0D, 0x5A, 0xDB, 0x29, 0x12, 0xD8, 0xA9, 0x84
 };
 
-static vu32 *otplessOffset = (vu32 *)0x80FD0FC;
 u32 posY;
 
 static void drawTitle(void)
@@ -70,7 +69,7 @@ static void drawTitle(void)
 
 void main(void)
 {
-    bool isOtpless = ISA9LH && otplessOffset[0] == 0xEAFE4AA3 && otplessOffset[1] == 0xDEADCAFE;
+    bool isOtpless = ISA9LH && *(vu32 *)0x80FD0FC == 0xEAFE4AA3 && magic == 0xDEADCAFE;
 
     if(!isOtpless) drawTitle();
 
@@ -205,8 +204,13 @@ static inline void installer(bool isOtpless)
             shutdown(1, "Error: firm1.bin is invalid or corrupted");
     }
 
-    if(!ISA9LH && ISN3DS && !ISDEVUNIT && !fileWrite((void *)0x23F00000, "arm9loaderhax.bin", 0x10000))
-        shutdown(1, "Error: couldn't write arm9loaderhax.bin");
+    if(!ISA9LH && ISN3DS && !ISDEVUNIT)
+    {
+        magic = 0xDEADCAFE;
+
+        if(!fileWrite((void *)0x23F00000, "arm9loaderhax.bin", 0x10000))
+            shutdown(1, "Error: couldn't write arm9loaderhax.bin");
+    }
 
     if(!isOtpless)
     {
@@ -267,7 +271,7 @@ static inline void installer(bool isOtpless)
     if(!isOtpless) writeFirm((u8 *)FIRM0_OFFSET, false, FIRM0_SIZE);
     else
     {
-        otplessOffset[0] = otplessOffset[1] = 0;
+        *(vu32 *)0x80FD0FC = 0;
         sdmmc_sdcard_init(true, false);
         mountFs(true);
         fileDelete("arm9loaderhax.bin");
@@ -276,8 +280,7 @@ static inline void installer(bool isOtpless)
 
     if(!ISA9LH && ISN3DS && !ISDEVUNIT)
     {
-        otplessOffset[0] = 0xEAFE4AA3;
-        otplessOffset[1] = 0xDEADCAFE;
+        *(vu32 *)0x80FD0FC = 0xEAFE4AA3;
 
         mcuReboot();
     }
diff --git a/source/installer.h b/source/installer.h
index 55527f5..5c0f3e5 100644
--- a/source/installer.h
+++ b/source/installer.h
@@ -18,6 +18,8 @@
 #define MAX_STAGE1_SIZE   0x1E70
 #define MAX_STAGE2_SIZE   0x89A00
 
+extern u32 magic;
+
 extern const u8 key2s[5][AES_BLOCK_SIZE],
                 devKey2s[2][AES_BLOCK_SIZE];
 
diff --git a/source/start.s b/source/start.s
index d545d4d..c108bc6 100644
--- a/source/start.s
+++ b/source/start.s
@@ -24,6 +24,13 @@
 .align 4
 .global _start
 _start:
+    b start
+
+.global magic
+magic:
+    .word 0
+
+start:
     @ Disable interrupts
     mrs r0, cpsr
     orr r0, #0x1C0