-use same iosu patcher for both haxchi and cbhc to allow haxchi to be…

…nefit from it

-added new config option to haxchi, "sysmenu" which will relaunch you into the system menu with signature, region patches and everything else that cbhc patches
-small logic correction in the iosu patcher

dsrom/Makefile

@@ -54,10 +54,10 @@ zeldaph: setup_zeldaph zeldaph.nds
 zeldast: setup_zeldast zeldast.nds
 
 setup:
-	@cd option_select && make && cd ..
+	@cd cbhc_menu && make && cd ..
 	@cd hbl_loader && make && cd ..
-	@cd cfw_booter && make && cd ..
-	@cd CBHC && make && cd ..
+	@cd iosu_patcher && make && cd ..
+	@cd option_select && make && cd ..
 
 setup_animalcrossing:
 	@rm -f defines.s $(ROP_BIN) haxchi_rop_hook.bin
@@ -267,8 +267,8 @@ zeldast.zip:
 
 clean:
 	@rm -f *.bin *.nds ../installer/data/*.zip defines.s
-	@cd option_select && make clean && cd ..
+	@cd cbhc_menu && make clean && cd ..
 	@cd hbl_loader && make clean && cd ..
-	@cd cfw_booter && make clean && cd ..
-	@cd CBHC && make clean && cd ..
+	@cd iosu_patcher && make clean && cd ..
+	@cd option_select && make clean && cd ..
 	@echo "all cleaned up !"

dsrom/cbhc_menu/Makefile

@@ -0,0 +1,32 @@
+PATH := $(DEVKITPPC)/bin:$(PATH)
+PREFIX ?= powerpc-eabi-
+CC = $(PREFIX)gcc
+AS = $(PREFIX)gcc
+CFLAGS = -std=gnu89 -O3 -Wall -nostdinc -fno-builtin -I$(DEVKITPPC)/lib/gcc/powerpc-eabi/6.2.0/include -I$(DEVKITPPC)/powerpc-eabi/include
+ASFLAGS = -mregnames -x assembler-with-cpp
+LD = $(PREFIX)ld
+OBJCOPY = $(PREFIX)objcopy
+LDFLAGS=-Ttext 1808000 -L$(DEVKITPPC)/lib/gcc/powerpc-eabi/6.2.0 -L$(DEVKITPPC)/powerpc-eabi/lib -lgcc -lc
+OBJDUMP ?= $(PREFIX)objdump
+project	:=	.
+root	:=	$(CURDIR)
+build	:=	 $(root)/bin
+
+FIRMWARE = 550
+
+all: clean setup main
+
+setup:
+	mkdir -p $(root)/bin/
+
+main:
+	$(CC) $(CFLAGS) -DVER=$(FIRMWARE) -c $(project)/main.c
+	$(AS) $(ASFLAGS) -DVER=$(FIRMWARE) -c $(project)/crt0.S
+	cp -r $(root)/*.o $(build)
+	rm $(root)/*.o
+	$(LD) -o cbhc_menu.elf $(build)/crt0.o `find $(build) -name "*.o" ! -name "crt0.o"` $(LDFLAGS) -Map cbhc_menu.map
+	$(OBJCOPY) cbhc_menu.elf -S -O binary ../cbhc_menu.bin
+
+clean:
+	rm -rf $(build) payload
+	rm -rf cbhc_menu.elf cbhc_menu.map