Merge master into local branch
This commit is contained in:
commit
958fb4c739
@ -876,25 +876,29 @@ 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))
|
||||||
{
|
{
|
||||||
u8 regionId = 0xFF,
|
|
||||||
languageId;
|
|
||||||
|
|
||||||
if(!loadTitleCodeSection(progId, code, size) ||
|
if(!loadTitleCodeSection(progId, code, size) ||
|
||||||
!applyCodeIpsPatch(progId, code, size) ||
|
!applyCodeIpsPatch(progId, code, size)) goto error;
|
||||||
!loadTitleLocaleConfig(progId, ®ionId, &languageId) ||
|
|
||||||
!patchLayeredFs(progId, code, size, textSize, roSize, dataSize, roAddress, dataAddress)) goto error;
|
|
||||||
|
|
||||||
if(regionId != 0xFF)
|
if((u32)((progId >> 0x20) & 0xFFFFFFEDULL) == 0x00040000)
|
||||||
{
|
{
|
||||||
u32 CFGUHandleOffset;
|
u8 regionId = 0xFF,
|
||||||
u8 *CFGU_GetConfigInfoBlk2_endPos = getCfgOffsets(code, textSize, &CFGUHandleOffset);
|
languageId;
|
||||||
|
|
||||||
if(CFGU_GetConfigInfoBlk2_endPos == NULL ||
|
if(!loadTitleLocaleConfig(progId, ®ionId, &languageId) ||
|
||||||
!patchCfgGetLanguage(code, textSize, languageId, CFGU_GetConfigInfoBlk2_endPos)) goto error;
|
!patchLayeredFs(progId, code, size, textSize, roSize, dataSize, roAddress, dataAddress)) goto error;
|
||||||
|
|
||||||
patchCfgGetRegion(code, textSize, regionId, CFGUHandleOffset);
|
if(regionId != 0xFF)
|
||||||
|
{
|
||||||
|
u32 CFGUHandleOffset;
|
||||||
|
u8 *CFGU_GetConfigInfoBlk2_endPos = getCfgOffsets(code, textSize, &CFGUHandleOffset);
|
||||||
|
|
||||||
|
if(CFGU_GetConfigInfoBlk2_endPos == NULL ||
|
||||||
|
!patchCfgGetLanguage(code, textSize, languageId, CFGU_GetConfigInfoBlk2_endPos)) goto error;
|
||||||
|
|
||||||
|
patchCfgGetRegion(code, textSize, regionId, CFGUHandleOffset);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user