New icon

Makefile

@@ -11,7 +11,7 @@ AS := arm-none-eabi-as
 LD := arm-none-eabi-ld
 OC := arm-none-eabi-objcopy
 
-name := AuReiNand
+name := Luma3DS
 version := $(shell git describe --abbrev=0 --tags)
 
 dir_source := source
@@ -27,7 +27,7 @@ dir_out := out
 ASFLAGS := -mcpu=arm946e-s
 CFLAGS := -Wall -Wextra -MMD -MP -marm $(ASFLAGS) -fno-builtin -fshort-wchar -std=c11 -Wno-main -O2 -flto -ffast-math
 LDFLAGS := -nostartfiles
-FLAGS := name=$(name).dat dir_out=$(abspath $(dir_out)) ICON=$(abspath icon.png) APP_DESCRIPTION="Noob-friendly 3DS CFW." APP_AUTHOR="Reisyukaku/Aurora Wright" --no-print-directory
+FLAGS := name=$(name).dat dir_out=$(abspath $(dir_out)) ICON=$(abspath icon.png) APP_DESCRIPTION="Noob-friendly 3DS CFW." APP_AUTHOR="Aurora Wright" --no-print-directory
 
 objects = $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
           $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
@@ -48,10 +48,7 @@ a9lh: $(dir_out)/arm9loaderhax.bin
 ninjhax: $(dir_out)/3ds/$(name)
 
 .PHONY: release
-release: $(dir_out)/$(name).zip
+release: $(dir_out)/$(name)$(version).7z
-
-.PHONY: pathchanger
-pathchanger: $(dir_out)/pathchanger
 
 .PHONY: clean
 clean:
@@ -63,10 +60,7 @@ clean:
 	@rm -rf $(dir_out) $(dir_build)
 
 $(dir_out):
-	@mkdir -p "$(dir_out)/aurei/payloads"
+	@mkdir -p "$(dir_out)/luma/payloads"
-
-$(dir_out)/pathchanger: $(dir_out)
-	@cc pathchanger/pathchanger.c -o out/pathchanger
 
 $(dir_out)/$(name).dat: $(dir_build)/main.bin $(dir_out)
 	@$(MAKE) $(FLAGS) -C $(dir_mset) launcher
@@ -80,8 +74,8 @@ $(dir_out)/3ds/$(name): $(dir_out)
 	@$(MAKE) $(FLAGS) -C $(dir_ninjhax)
 	@mv $(dir_out)/$(name).3dsx $(dir_out)/$(name).smdh $@
 
-$(dir_out)/$(name).zip: launcher a9lh ninjhax
+$(dir_out)/$(name)$(version).7z: launcher a9lh ninjhax
-	@cd "$(@D)" && zip -9 -r $(name) *
+	@7z a -mx $@ ./$(@D)/*
 
 $(dir_build)/main.bin: $(dir_build)/main.elf
 	$(OC) -S -O binary $< $@

README.md

@@ -1,5 +1,5 @@
-# AuReiNand
+# Luma3DS
-*A modification of the ReiNand custom firmware*
+*Noob-proof (N)3DS "Custom Firmware"*
 
 **Compiling:**
 
@@ -9,8 +9,8 @@ You can find the compiled files in the 'out' folder.
 
 **Setup / Usage / Features:**
 
-See https://github.com/AuroraWright/AuReiNand/wiki
+See https://github.com/AuroraWright/Luma3DS/wiki
 
 **Credits:**
  
-See https://github.com/AuroraWright/AuReiNand/wiki/Credits
+See https://github.com/AuroraWright/Luma3DS/wiki/Credits

injector/source/patcher.c

@@ -123,7 +123,7 @@ static u32 loadConfig(void)
     if(!config)
     {
         IFile file;
-        if(R_SUCCEEDED(fileOpen(&file, ARCHIVE_SDMC, "/aurei/config.bin", FS_OPEN_READ)))
+        if(R_SUCCEEDED(fileOpen(&file, ARCHIVE_SDMC, "/luma/config.bin", FS_OPEN_READ)))
         {
             u64 total;
             if(R_SUCCEEDED(IFile_Read(&file, &total, &config, 4))) config |= 1 << 4;
@@ -136,12 +136,12 @@ static u32 loadConfig(void)
 
 static int loadTitleLocaleConfig(u64 progId, u8 *regionId, u8 *languageId)
 {
-    /* Here we look for "/aurei/locales/[u64 titleID in hex, uppercase].txt"
+    /* Here we look for "/luma/locales/[u64 titleID in hex, uppercase].txt"
        If it exists it should contain, for example, "EUR IT" */
 
-    char path[] = "/aurei/locales/0000000000000000.txt";
+    char path[] = "/luma/locales/0000000000000000.txt";
 
-    u32 i = 30;
+    u32 i = 29;
 
     while(progId > 0)
     {

loader/source/main.c

@@ -7,7 +7,7 @@
 
 static u32 loadPayload(const char *pattern)
 {
-    char path[30] = "/aurei/payloads";
+    char path[30] = "/luma/payloads";
 
     DIR dir;
     FILINFO info;
@@ -19,11 +19,11 @@ static u32 loadPayload(const char *pattern)
     if(result != FR_OK || !info.fname[0])
         return 0;
 
-    path[15] = '/';
+    path[14] = '/';
     u32 i;
     for(i = 0; info.fname[i]; i++)
-        path[16 + i] = info.fname[i];
+        path[15 + i] = info.fname[i];
-    path[16 + i] = '\0';
+    path[15 + i] = '\0';
 
     FIL payload;
     unsigned int br;

loader/source/types.h

@@ -1,9 +1,3 @@
-/*
-*   types.h
-*       by Reisyukaku
-*   Copyright (c) 2015 All Rights Reserved
-*/
-
 #pragma once
 
 #include <stdint.h>

patches/reboot.s

@@ -80,7 +80,7 @@ fopen: .ascii "OPEN"
 .pool
 bin_fname:     .dcw "sdmc:/arm9loaderhax.bin"
 	       .word 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-dat_fname:     .dcw "sdmc:/AuReiNand.dat"
+dat_fname:     .dcw "sdmc:/Luma3DS.dat"
 	       .word 0
 
 .align 4

pathchanger/pathchanger.c

@@ -43,7 +43,7 @@ static int fsize(FILE *fp)
 static void error(FILE *payload, const char *message)
 {
     fclose(payload);
-    printf("%s, are you sure you're using an AuReiNand payload?\n", message);
+    printf("%s, are you sure you're using a Luma3DS payload?\n", message);
     exit(0);
 }
 
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 {
     if(argc == 1)
     {
-        printf("Usage: %s <AuReiNand payload path>\n", argv[0]);
+        printf("Usage: %s <Luma3DS payload path>\n", argv[0]);
         exit(0);
     }
 

screeninit/source/types.h

@@ -1,9 +1,3 @@
-/*
-*   types.h
-*       by Reisyukaku
-*   Copyright (c) 2015 All Rights Reserved
-*/
-
 #pragma once
 
 #include <stdint.h>

source/buttons.h

@@ -1,7 +1,5 @@
 /*
 *   buttons.h
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/config.c

@@ -1,7 +1,5 @@
 /*
 *   config.c
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "config.h"

source/config.h

@@ -1,7 +1,5 @@
 /*
 *   config.h
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/crypto.c

@@ -1,9 +1,7 @@
 /*
 *   crypto.c
-*       by Reisyukaku / Aurora Wright
-*   Crypto libs from http://github.com/b1l1s/ctr
 *
-*   Copyright (c) 2016 All Rights Reserved
+*   Crypto libs from http://github.com/b1l1s/ctr
 */
 
 #include "crypto.h"
@@ -386,7 +384,7 @@ void arm9Loader(u8 *arm9Section, u32 mode)
     //Set >=9.6 KeyXs
     if(mode)
     {
-        u8 keyData[] = {0xDD, 0xDA, 0xA4, 0xC6, 0x2C, 0xC4, 0x50, 0xE9, 0xDA, 0xB6, 0x9B, 0x0D, 0x9D, 0x2A, 0x21, 0x98};
+        u8 keyData[0x10] = {0xDD, 0xDA, 0xA4, 0xC6, 0x2C, 0xC4, 0x50, 0xE9, 0xDA, 0xB6, 0x9B, 0x0D, 0x9D, 0x2A, 0x21, 0x98};
         u8 decKey[0x10];
 
         //Set keys 0x19..0x1F keyXs

source/crypto.h

@@ -1,9 +1,7 @@
 /*
 *   crypto.h
-*       by Reisyukaku / Aurora Wright
-*   Crypto libs from http://github.com/b1l1s/ctr
 *
-*   Copyright (c) 2016 All Rights Reserved
+*   Crypto libs from http://github.com/b1l1s/ctr
 */
 
 #pragma once

source/draw.c

@@ -1,9 +1,7 @@
 /*
 *   draw.c
-*       by Reisyukaku / Aurora Wright
-*   Code to print to the screen by mid-kid @CakesFW
 *
-*   Copyright (c) 2016 All Rights Reserved
+*   Code to print to the screen by mid-kid @CakesFW
 */
 
 #include "draw.h"
@@ -41,8 +39,8 @@ void loadSplash(void)
     initScreens();
 
     //Don't delay boot if no splash image is on the SD
-    if(fileRead(fb->top_left, "/aurei/splash.bin", 0x46500) +
+    if(fileRead(fb->top_left, "/luma/splash.bin", 0x46500) +
-       fileRead(fb->bottom, "/aurei/splashbottom.bin", 0x38400))
+       fileRead(fb->bottom, "/luma/splashbottom.bin", 0x38400))
     {
         u64 i = 0x1400000;
         while(--i) __asm("mov r0, r0"); //Less Ghetto sleep func

source/draw.h

@@ -1,9 +1,7 @@
 /*
 *   draw.h
-*       by Reisyukaku / Aurora Wright
-*   Code to print to the screen by mid-kid @CakesFW
 *
-*   Copyright (c) 2016 All Rights Reserved
+*   Code to print to the screen by mid-kid @CakesFW
 */
 
 #pragma once

source/emunand.c

@@ -1,7 +1,5 @@
 /*
 *   emunand.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "emunand.h"

source/emunand.h

@@ -1,7 +1,5 @@
 /*
 *   emunand.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/firm.c

@@ -1,7 +1,5 @@
 /*
 *   firm.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "firm.h"
@@ -44,7 +42,7 @@ void main(void)
     mountFs();
 
     //Attempt to read the configuration file
-    const char configPath[] = "/aurei/config.bin";
+    const char configPath[] = "/luma/config.bin";
     if(fileRead(&config, configPath, 4)) needConfig = 1;
     else
     {
@@ -81,9 +79,6 @@ void main(void)
         //Get pressed buttons
         u32 pressed = HID_PAD;
 
-        //Determine if we need to autoboot sysNAND
-        u32 autoBootSys = CONFIG(0);
-
         //Determine if A9LH is installed and the user has an updated sysNAND
         if(a9lhBoot || CONFIG(2))
         {
@@ -143,6 +138,9 @@ void main(void)
             //If screens are inited or the corresponding option is set, load splash screen
             if(PDN_GPU_CNT != 1 || CONFIG(8)) loadSplash();
 
+            //Determine if we need to autoboot sysNAND
+            u32 autoBootSys = CONFIG(0);
+
             //Determine if we need to boot an emuNAND or sysNAND
             nandType = (pressed & BUTTON_L1) ? autoBootSys : ((pressed & BUTTON_R1) ? updatedSys : !autoBootSys);
 
@@ -194,24 +192,10 @@ static inline void loadFirm(u32 firmType, u32 externalFirm)
 {
     section = firm->section;
 
-    u32 firmSize;
+    /* If the conditions to load the external FIRM aren't met, or reading fails, or the FIRM
-
+       doesn't match the console, load it from CTRNAND */
-    if(externalFirm)
+    if(!externalFirm || !fileRead(firm, "/luma/firmware.bin", 0) ||
-    {
+       (((u32)section[2].address >> 8) & 0xFF) != (console ? 0x60 : 0x68))
-        const char path[] = "/aurei/firmware.bin";
-        firmSize = fileSize(path);
-
-        if(firmSize)
-        {
-            fileRead(firm, path, firmSize);
-
-            //Check that the loaded FIRM matches the console
-            if((((u32)section[2].address >> 8) & 0xFF) != (console ? 0x60 : 0x68)) firmSize = 0;
-        }
-    }
-    else firmSize = 0;
-
-    if(!firmSize)
     {
         const char *firmFolders[3][2] = {{ "00000002", "20000002" },
                                          { "00000102", "20000102" },
@@ -383,7 +367,8 @@ static inline void patchTwlAgbFirm(u32 firmType)
 
     /* Calculate the amount of patches to apply. Only count the boot screen patch for AGB_FIRM
        if the matching option was enabled (keep it as last) */
-    u32 numPatches = firmType == 1 ? (sizeof(twlPatches) / sizeof(patchData)) : (sizeof(agbPatches) / sizeof(patchData) - !CONFIG(7));
+    u32 numPatches = firmType == 1 ? (sizeof(twlPatches) / sizeof(patchData)) :
+                                     (sizeof(agbPatches) / sizeof(patchData) - !CONFIG(7));
     const patchData *patches = firmType == 1 ? twlPatches : agbPatches;
 
     //Patch

source/firm.h

@@ -1,7 +1,5 @@
 /*
 *   firm.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/fs.c

@@ -1,7 +1,5 @@
 /*
 *   fs.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "fs.h"
@@ -51,25 +49,12 @@ u32 fileWrite(const void *buffer, const char *path, u32 size)
     return fr ? 0 : 1;
 }
 
-u32 fileSize(const char *path)
-{
-    FIL fp;
-    u32 size = 0;
-
-    if(f_open(&fp, path, FA_READ) == FR_OK)
-        size = f_size(&fp);
-
-    f_close(&fp);
-
-    return size;
-}
-
 u32 defPayloadExists(void)
 {
     DIR dir;
     FILINFO info;
 
-    FRESULT result = f_findfirst(&dir, &info, "/aurei/payloads", "def_*.bin");
+    FRESULT result = f_findfirst(&dir, &info, "/luma/payloads", "def_*.bin");
 
     f_closedir(&dir);
 
@@ -89,11 +74,8 @@ void firmRead(void *dest, const char *firmFolder)
     u32 id = 0;
 
     //Parse the target directory
-    while(f_readdir(&dir, &info) == FR_OK)
+    while(f_readdir(&dir, &info) == FR_OK && info.fname[0])
     {
-        //We've parsed the whole folder
-        if(!info.fname[0]) break;
-
         //Not a cxi
         if(info.altname[9] != 'A') continue;
 

source/fs.h

@@ -1,7 +1,5 @@
 /*
 *   fs.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once
@@ -11,6 +9,5 @@
 u32 mountFs(void);
 u32 fileRead(void *dest, const char *path, u32 size);
 u32 fileWrite(const void *buffer, const char *path, u32 size);
-u32 fileSize(const char *path);
 u32 defPayloadExists(void);
 void firmRead(void *dest, const char *firmFolder);

source/loader.c

@@ -1,7 +1,5 @@
 /*
 *   loader.c
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "loader.h"

source/loader.h

@@ -1,7 +1,5 @@
 /*
 *   loader.h
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/memory.c

@@ -1,7 +1,5 @@
 /*
 *   memory.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 *
 *   Quick Search algorithm adapted from http://igm.univ-mlv.fr/~lecroq/string/node19.html#SECTION00190
 */

source/memory.h

@@ -1,7 +1,5 @@
 /*
 *   memory.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 *
 *   Quick Search algorithm adapted from http://igm.univ-mlv.fr/~lecroq/string/node19.html#SECTION00190
 */

source/patches.c

@@ -1,7 +1,5 @@
 /*
 *   patches.c
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "patches.h"

source/patches.h

@@ -1,7 +1,5 @@
 /*
 *   patches.h
-*       by Reisyukaku / Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/screeninit.c

@@ -1,10 +1,8 @@
 /*
 *   screeninit.c
-*       by Aurora Wright
+*
 *   Screen init code by dark_samus, bil1s, Normmatt, delebile and others.
 *   Screen deinit code by tiniVi.
-*
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "screeninit.h"

source/screeninit.h

@@ -1,10 +1,8 @@
 /*
 *   screeninit.h
-*       by Aurora Wright
+*
 *   Screen init code by dark_samus, bil1s, Normmatt, delebile and others.
 *   Screen deinit code by tiniVi.
-*
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once

source/types.h

@@ -1,7 +1,5 @@
 /*
 *   types.h
-*       by Reisyukaku
-*   Copyright (c) 2015 All Rights Reserved
 */
 
 #pragma once

source/utils.c

@@ -1,7 +1,5 @@
 /*
 *   utils.c
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #include "utils.h"

source/utils.h

@@ -1,7 +1,5 @@
 /*
 *   utils.h
-*       by Aurora Wright
-*   Copyright (c) 2016 All Rights Reserved
 */
 
 #pragma once