Merge master into local branch

This commit is contained in:
Aurora Wright 2017-05-05 20:20:07 +02:00
commit 958fb4c739

View File

@ -876,14 +876,17 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
)) goto error; )) goto error;
} }
if(CONFIG(PATCHGAMES) && (u32)((progId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000) if(CONFIG(PATCHGAMES))
{
if(!loadTitleCodeSection(progId, code, size) ||
!applyCodeIpsPatch(progId, code, size)) goto error;
if((u32)((progId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000)
{ {
u8 regionId = 0xFF, u8 regionId = 0xFF,
languageId; languageId;
if(!loadTitleCodeSection(progId, code, size) || if(!loadTitleLocaleConfig(progId, &regionId, &languageId) ||
!applyCodeIpsPatch(progId, code, size) ||
!loadTitleLocaleConfig(progId, &regionId, &languageId) ||
!patchLayeredFs(progId, code, size, textSize, roSize, dataSize, roAddress, dataAddress)) goto error; !patchLayeredFs(progId, code, size, textSize, roSize, dataSize, roAddress, dataAddress)) goto error;
if(regionId != 0xFF) if(regionId != 0xFF)
@ -897,6 +900,7 @@ void patchCode(u64 progId, u16 progVer, u8 *code, u32 size, u32 textSize, u32 ro
patchCfgGetRegion(code, textSize, regionId, CFGUHandleOffset); patchCfgGetRegion(code, textSize, regionId, CFGUHandleOffset);
} }
} }
}
return; return;