Merge master and dev builds

2016-09-19 14:03:55 +02:00
parent eaa4d6323e
commit 420ccdcb82
15 changed files with 123 additions and 303 deletions
--- a/injector/source/patcher.h
+++ b/injector/source/patcher.h
@@ -16,24 +16,21 @@ enum multiOptions
 {
    DEFAULTEMU = 0,
    BRIGHTNESS,
+    SPLASH,
    PIN,
-    NEWCPU
-#ifdef DEV
-  , DEVOPTIONS
-#endif
+    NEWCPU,
+    DEVOPTIONS
 };

 enum singleOptions
 {
    AUTOBOOTSYS = 0,
    USESYSFIRM,
+    SDFIRMSANDMODULES,
    USELANGEMUANDCODE,
    PATCHVERSTRING,
    SHOWGBABOOT,
-    PAYLOADSPLASH
-#ifdef DEV
-  , PATCHACCESS
-#endif
+    PATCHACCESS
 };

 void patchCode(u64 progId, u8 *code, u32 size);