Merge branch 'master' into developer

Conflicts:
	source/config.c
	source/firm.c
	source/fs.c
	source/fs.h
	source/patches.c
	source/patches.h
	source/utils.h
This commit is contained in:
TuxSH
2016-08-03 22:52:51 +02:00
25 changed files with 1490 additions and 954 deletions

View File

@@ -408,7 +408,7 @@ void patchCode(u64 progId, u8 *code, u32 size)
case 0x0004001000027000LL: // KOR MSET
case 0x0004001000028000LL: // TWN MSET
{
if(CONFIG(5))
if(CONFIG(4))
{
static const u16 verPattern[] = u"Ver.";
const u32 currentNand = BOOTCONFIG(0, 3);
@@ -577,7 +577,7 @@ void patchCode(u64 progId, u8 *code, u32 size)
}
default:
if(CONFIG(4))
if(CONFIG(3))
{
u32 tidHigh = (progId & 0xFFFFFFF000000000LL) >> 0x24;