Merge branch 'master' of https://github.com/AuroraWright/Luma3DS

LumaTeam · Aug 26, 2016 · 2dd64b8 · 2dd64b8
2 parents b5cdded + 7afdc2b
commit 2dd64b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/patches/twl_k11modules.s b/patches/twl_k11modules.s
@@ -135,7 +135,7 @@ patchesStart:
     .halfword 1
     .halfword 8
     .byte 0x83, 0x30, 0x2e, 0xa4, 0xb0, 0xe2, 0xc2, 0xd6 ; (decrypted = 0x02, 0x01, 0x1a, 0xe3, 0x08, 0x60, 0x87, 0x05)
-    .byte 0x89, 0x53, 0xb2, 0xa4, 0xb0, 0xe2, 0xc2, 0xd6 ; (decrypted = 0x08, 0x62, 0x86, 0xe3, 0x08, 0x60, 0x87, 0xe5)
+    .byte 0x83, 0x50, 0xf2, 0xa4, 0xb0, 0xe2, 0xc2, 0xd6 ; (decrypted = 0x02, 0x61, 0xc6, 0xe3, 0x08, 0x60, 0x87, 0xe5)
 
 patchesEnd:
 

diff --git a/source/config.c b/source/config.c
@@ -43,7 +43,8 @@ void configureCFW(void)
                                         "( ) Show current NAND in System Settings",
                                         "( ) Show GBA boot screen in patched AGB_FIRM",
                                         "( ) Display splash screen before payloads",
-                                        "( ) Use a PIN" };
+                                        "( ) Use a PIN",
+                                        "( ) Enable experimental TwlBg patches" };
 
     struct multiOption {
         int posXs[4];

diff --git a/source/firm.c b/source/firm.c
@@ -321,7 +321,7 @@ static inline void patchLegacyFirm(FirmwareType firmType)
 
     applyLegacyFirmPatches((u8 *)firm, firmType);
 
-    if(firmType == TWL_FIRM)
+    if(firmType == TWL_FIRM && CONFIG(8))
         patchTwlBg((u8 *)firm + section[1].offset);
 }