Merge master and dev builds

injector/Makefile

@@ -30,10 +30,6 @@ LDFLAGS := -Xlinker --defsym="__start__=0x14000000" -specs=3dsx.specs $(ASFLAGS)
 objects = $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
           $(call rwildcard, $(dir_source), *.s *.c))
 
-ifeq ($(strip $(DEV)),TRUE)
-CFLAGS += -DDEV
-endif
-
 .PHONY: all
 all: ../$(dir_build)/$(name).cxi
 

injector/source/patcher.c

@@ -582,10 +582,9 @@ void patchCode(u64 progId, u8 *code, u32 size)
             break;
         }
 
-#ifdef DEV
         case 0x0004003000008A02LL: // ErrDisp
         {
-            if(MULTICONFIG(DEVOPTIONS) == 0)
+            if(MULTICONFIG(DEVOPTIONS) == 1)
             {
                 static const u8 unitinfoCheckPattern1[] = { 
                     0x14, 0x00, 0xD0, 0xE5, 0xDB
@@ -616,7 +615,6 @@ void patchCode(u64 progId, u8 *code, u32 size)
 
             break;
         }
-#endif
 
         default:
             if(CONFIG(USELANGEMUANDCODE))

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);