Revert agbcc dependency to pret master

berry_fix/Makefile

@@ -1,9 +1,8 @@
+include $(DEVKITARM)/base_tools
 COMPARE ?= 0
 
-AS := ../tools/binutils/bin/arm-none-eabi-as
 CPP := $(CC) -E
-LD := ../tools/binutils/bin/arm-none-eabi-ld
-OBJCOPY := ../tools/binutils/bin/arm-none-eabi-objcopy
+LD := $(DEVKITARM)/bin/arm-none-eabi-ld
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
@@ -160,7 +159,7 @@ $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
 	$(AS) $(ASFLAGS) -I sound -o $@ $<
 
 $(ELF): ld_script.txt $(OBJS)
-	cd $(OBJ_DIR) && ../$(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@
+	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../ld_script.txt -o ../$@
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary $< $@

berry_fix/payload/Makefile

@@ -1,9 +1,8 @@
+include $(DEVKITARM)/base_tools
 COMPARE ?= 0
 
-AS := ../../tools/binutils/bin/arm-none-eabi-as
 CPP := $(CC) -E
-LD := ../../tools/binutils/bin/arm-none-eabi-ld
-OBJCOPY := ../../tools/binutils/bin/arm-none-eabi-objcopy
+LD := $(DEVKITARM)/bin/arm-none-eabi-ld
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
@@ -131,6 +130,7 @@ endif
 $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
 	@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
 	@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CC1FLAGS) -o $(C_BUILDDIR)/$*.s
+	@echo -e ".text\n\t.align 2, 0 @ Don't pad with nop\n" >> $(C_BUILDDIR)/$*.s
 	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
 
 ifeq ($(NODEP),1)
@@ -167,7 +167,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm
 	cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../$< | sed "s#tools/#../tools/#g" > ld_script.ld
 
 $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
-	cd $(OBJ_DIR) && ../$(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB)
+	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../$@ $(LIB)
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary $< $@

berry_fix/payload/src/agb_flash.c

@@ -1,5 +1,5 @@
-#include <gba/gba.h>
-#include <gba/flash_internal.h>
+#include "gba/gba.h"
+#include "gba/flash_internal.h"
 
 static u8 sTimerNum;
 static u16 sTimerCount;