Update

Dev-branch-only-options-and-features.md

@@ -1,28 +0,0 @@
-The `developer` branch of Luma3DS has its own unique options and features which are extremely useful for developers.
-
-![Config menu](https://raw.githubusercontent.com/wiki/AuroraWright/Luma3DS/images/config_menu_dev.png)
-
-## Options:
-
-- **Developer features**:
- - **ErrDisp**: patches ErrDisp to display debugging information on the top screen
- - **UNITINFO**: patches the value of CFG_UNITINFO sent to the ARM11 on boot to make applications believe they are running on a developer unit. This makes ErrDisp display debugging information and allows you to run certain system software for development units, but also prevents using the eShop, amiibo, etc.
- - **None**: doesn't apply either patch; also disables the NATIVE_FIRM exception handlers (see below)
-
----
-
-- **Patch SVC/service/archive/ARM9 access**: disables SVC, service, archive and exHeader ARM9 access checks (the service and archive patches don't work on New 3DS FIRMs between 9.3 and 10.4)
-
-## Exception handlers
-
-Exception handlers give invaluable information when debugging crashes (reads/writes at invalid addresses, execution at invalid indresses, undefined instructions, etc.).
-
-Luma3DS handle CPU exceptions for itself, chainloaded arm9 payloads, and NATIVE_FIRM too. For NATIVE_FIRM, it handles `svcBreak` and kernel panics as well.
-
-To parse a crash dump produced by Luma3DS, use [this parser script](https://raw.githubusercontent.com/AuroraWright/Luma3DS/master/exceptions/exception_dump_parser.py).
-
-## Other exclusive features:
-
-- **External firmware loading**: if present in the `luma` folder, one of: `firmware.bin`, `firmware_twl.bin`, `firmware_agb`  and `firmware_safe.bin` (depending on the firmware being launched) will be used of the one stored in CTRNAND.
-
-- **External module loading**: loads standalone system modules located in `/luma/sysmodules` (except for SAFE_FIRM and NATIVE_FIRM versions older than 3.x)

Options-and-usage.md

@@ -2,15 +2,24 @@ If you are booting Luma3DS for the first time, you will be greeted with the conf
 If you want to open the configuration menu again, simply hold the **SELECT** button.
 If the configuration file is incompatible with the current version, it will be automatically discarded.
 
-![Config menu](https://raw.githubusercontent.com/wiki/AuroraWright/Luma3DS/images/config_menu_master.png)
+![Config menu](https://raw.githubusercontent.com/wiki/AuroraWright/Luma3DS/images/config_menu.png)
 
 ## Options:
 
+- **Default EmuNAND**: Makes the selected EmuNAND the default. 
+ - You can override this setting on boot by holding down a button on the **directional pad**, **Up**, **Right**, **Down**, **Left** for EmuNANDs 1, 2, 3 and 4 respectively. If `Autoboot SysNAND` is deactivated and you have a matching directional pad payload to use with the chainloader (refer to the Other features and notes page), also hold **A** to override the EmuNAND.
+
+---
+
 - **Screen brightness**: Change the screen brightness for Luma3DS and payloads. The brightness is updated "in real time".
 
 ---
 
-- **PIN lock**: This enables you to set a button combination (using A, B, X and Y and the directional pad) that will be asked each time you'll boot your 3DS or Luma3DS. Set this to "Off" to delete the existing PIN. You can choose the amount of digits between 4, 6 and 8. You will be allowed to change the PIN (can be skipped by pressing **START**) when quitting the configuration menu.
+- **Splash**: Toggle the **splash screen** (refer to the [Other features and notes](https://github.com/AuroraWright/Luma3DS/wiki/Other-features-and-notes) page) and choose if displaying it before launching payloads (this is intended for splash screens that display button hints) or afterwards.
+
+---
+
+- **PIN lock**: This enables you to set a button combination (using A, B, X and Y and the directional pad) that will be asked each time you'll boot your 3DS or Luma3DS. Set this to "Off" to delete the existing PIN. You can choose the amount of digits between 4, 6 and 8. You will be allowed to change the PIN (can be skipped by pressing **START**) when quitting the configuration menu. A message can be displayed on the bottom screen when the PIN is being asked by placing a text file named `pinmessage.txt` in `luma` (with 800 characters maximum).
 
 ---
 
@@ -22,6 +31,13 @@ If the configuration file is incompatible with the current version, it will be a
 
 ---
 
+- **Developer features**:
+ - **ErrDisp**: patches ErrDisp to display debugging information on the top screen
+ - **UNITINFO**: patches the value of CFG_UNITINFO sent to the ARM11 on boot to make applications believe they are running on a developer unit. This makes ErrDisp display debugging information and allows you to run certain system software for development units, but also prevents using the eShop, amiibo, etc.
+ - **None**: doesn't apply either patch; also disables the exception handlers (see below)
+
+---
+
 - **Autoboot SysNAND**: Determines if you want to boot **SysNAND** or **EmuNAND** by when **holding no buttons** on Luma3DS boot). 
  - If the option is **on**, **holding L** boots **the default EmuNAND**.
  - If the option is **off**, **holding L** boots **SysNAND**.
@@ -29,44 +45,63 @@ If the configuration file is incompatible with the current version, it will be a
 ---
 
 - **Use SysNAND FIRM if booting with R (A9LH)**: 
- - **On**: uses the **FIRM from SysNAND** to boot EmuNAND **with R** (You can't boot 10.x with 9.x NATIVE_FIRM). Also applies a patch allowing access to the eShop on all system versions on **EmuNAND**.
- - **Off**: uses the **FIRM from EmuNAND** to boot SysNAND **with R** (You can't boot 10.x with 9.x NATIVE_FIRM).Also applies a patch allowing access to the eShop on all system versions on **SysNAND**.
+ - **On**: uses the **FIRM from SysNAND** to boot EmuNAND **with R** (You can't boot 10.x with 9.x NATIVE_FIRM).
+ - **Off**: uses the **FIRM from the default EmuNAND** to boot SysNAND **with R** (You can't boot 10.x with 9.x NATIVE_FIRM). You can override the EmuNAND to take the FIRM from on boot by holding down a button on the **directional pad**, **Up**, **Right**, **Down**, **Left** for EmuNANDs 1, 2, 3 and 4 respectively.
 
 ---
 
-- **Use second EmuNAND as default**: Makes the **second EmuNAND** the default. **This has no effect if there's no second EmuNAND.**
- - If the option is **on**, holding down **B** will boot the first EmuNAND.
- - If the options is **off**, holding down **B** will boot the second EmuNAND.
+- **Enable FIRMs and modules loading from SD**: If the option is **on**:
+ - If present in the `luma` folder, one of `firmware.bin`, `firmware_twl.bin`, `firmware_agb` and `firmware_safe.bin` (depending on the firmware being launched) will be used instead of the one stored in CTRNAND. If using NUS-encrypted FIRMs, a matching **cetk** file for each FIRM is needed a matching cetk file for each encrypted FIRM is needed (`/luma/cetk`, `/luma/cetk_twl`, `/luma/cetk_agb`, `/luma/cetk_safe` respectively).
+ - If present in the `/luma/sysmodules` folder, standalone system modules will be loaded instead of the ones built-in to FIRM (not supported for SAFE_FIRM and NATIVE_FIRM versions older than 3.x).
 
 ---
 
-- **Enable region/language emulation**: Enables the region/language emulation feature. This allows some games which need a specific language to be set to work, and **DLCs for foreign games** to load. 
- - To use it:
-    - Create a folder named **locales** inside luma/
+- **Use custom path**: If the option is **on**, you can change the default location of the Luma3DS payload (which is `arm9loaderhax.bin` on the root of the SD) by typing it in a `path.txt` file in `luma`, it must start with a `/` and not exceed 55 characters. This path is also picked up if not booting via A9LH.
+
+---
+
+- **Enable region/language emulation and external .code**: Enables the following two features: 
+ - The region/language emulation feature allows some games which need a specific language to be set to work, and **DLCs for foreign games** to load. To use it:
+    - Create a folder named **locales** inside `luma`
     - Create a .txt file with game's **title id** as the name (look them up on **www.3dsdb.com**). 
     - Inside the file,
          - Put **3 characters for the region** ("JPN", "USA", "EUR", "AUS", "CHN", "KOR", "TWN")
          - Put **an empty space**
          - Put **2 characters for the language** ("JP", "EN", "FR", "DE", "IT", "ES", "ZH", "KO", "NL", "PT", "RU", "TW"). 
- - For example, to play Pokémon™ Y in Japanese language and region: 
-    - Create `0004000000055E00.txt`
-    - Put in `JPN JP`
-    - Save
+    - For example, to play Pokémon™ Y in Japanese language and region: 
+         - Create `0004000000055E00.txt`
+         - Put in `JPN JP`
+         - Save
+ - The external .code feature allows you to use patched binaries for games. To use it:
+    - Create a folder named **code_sections** inside `luma`
+    - Obtain a patched code.bin for the game, and rename it with game's **title id** as the file name (look them up on **www.3dsdb.com**). 
+    - For example, to use a patched binary with Pokémon™ Y, rename it to `0004000000055E00.bin`.
 
 ---
 
-- **Show current NAND in System Settings**: This displays the current NAND/FIRM instead of "Ver." in System Settings. 
+- **Show NAND or user string in System Settings**: By default, this displays the current NAND/FIRM instead of "Ver." in System Settings. 
  - The strings that can be shown are: 
-    - **Emu** (**first EmuNAND** booted with its own FIRM), 
-    - **EmuS** (**first EmuNAND** booted with **the SysNAND FIRM**), 
-    - **Emu2** (**second EmuNAND** booted with its own FIRM), 
-    - **Sys** (**SysNAND** booted with with its own FIRM), 
-    - **SysE** (**SysNAND** booted with the first EmuNAND's FIRM).
+    - **Sys**: **SysNAND** booted with with its own FIRM,
+    - **Emu**: **first EmuNAND** booted with its own FIRM,
+    - **EmuX** (where **X** can be **2**, **3** or **4**): **EmuNAND X** booted with its own FIRM,
+    - **SysE**: **SysNAND** booted with the first EmuNAND's FIRM,
+    - **SyEX** (where **X** can be **2**, **3** or **4**): **SysNAND** booted with EmuNAND X's FIRM,
+    - **EmuS**: **first EmuNAND** booted with **the SysNAND FIRM**, 
+    - **EmXS** (where **X** can be **2**, **3** or **4**): **EmuNAND X** booted with **the SysNAND FIRM**.
+ - You can also display a custom version string for each NAND, by creating text files named `customversion_sys.txt`, `customversion_emu.txt`, `customversion_emu2.txt`, `customversion_emu3.txt` or `customversion_emu4.txt` inside `luma`. The version strings can't exceed 39 characters.
 
 ---
 
-- **Show GBA boot screen in patched AGB_FIRM**: Shows the original GBA boot animation when you launch a GBA game.
+- **Show GBA boot screen in patched AGB_FIRM**: If the option is **on**, the original GBA boot animation will be shown when launching a GBA game.
 
 ---
 
-- **Display splash screen before payloads**: Displays the **splash screen** (refer to the [Other features and notes](https://github.com/AuroraWright/Luma3DS/wiki/Other-features-and-notes) page) unconditionally before launching payloads. This is intended for splash screens that display button hints.
+- **Patch SVC/service/archive/ARM9 access**: disables SVC, service, archive and exHeader ARM9 access checks (the service and archive patches don't work on New 3DS FIRMs between 9.3 and 10.4)
+
+## Exception handlers
+
+Exception handlers give invaluable information when debugging crashes (reads/writes at invalid addresses, execution at invalid indresses, undefined instructions, etc.).
+
+Luma3DS handle CPU exceptions for itself, chainloaded arm9 payloads, and NATIVE_FIRM too. For NATIVE_FIRM, it handles `svcBreak` and kernel panics as well.
+
+To parse a crash dump produced by Luma3DS, use [this parser script](https://raw.githubusercontent.com/AuroraWright/Luma3DS/master/exceptions/exception_dump_parser.py).

_Sidebar.md

@@ -2,6 +2,5 @@
 [Installation and upgrade](https://github.com/AuroraWright/Luma3DS/wiki/Installation-and-upgrade)  
 [Options and usage](https://github.com/AuroraWright/Luma3DS/wiki/Options-and-usage)  
 [Other features and notes](https://github.com/AuroraWright/Luma3DS/wiki/Other-features-and-notes)  
-[Dev-branch-only options and features](https://github.com/AuroraWright/Luma3DS/wiki/Dev-branch-only-options-and-features)  
 [FAQ and troubleshooting](https://github.com/AuroraWright/Luma3DS/wiki/FAQ-and-Troubleshooting)  
 [Credits](https://github.com/AuroraWright/Luma3DS/wiki/Credits)