Merged the two branches

This commit is contained in:
Aurora
2016-09-08 18:47:13 +02:00
parent 72c8212a0e
commit dc8e4e5f14
13 changed files with 187 additions and 22 deletions

View File

@@ -495,6 +495,7 @@ void patchCode(u64 progId, u8 *code, u32 size)
break;
}
#ifdef DEV
case 0x0004003000008A02LL: // ErrDisp
{
if(CONFIG_DEVOPTIONS == 0)
@@ -528,6 +529,7 @@ void patchCode(u64 progId, u8 *code, u32 size)
break;
}
#endif
default:
if(CONFIG_USELANGEMUANDCODE)