92 files changed, 609 insertions, 427 deletions

diff --git a/arm7/arm7.sha1 b/arm7/arm7.sha1
new file mode 100644
index 00000000..e3bf79ef
--- /dev/null
+++ b/arm7/arm7.sha1
@@ -0,0 +1 @@
+39aacbf97ae65b17783057aeed06b80049b18dee  build/arm7.bin
diff --git a/arm9/Makefile b/arm9/Makefile
index 5b12cbb8..53a868d0 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -54,6 +54,9 @@ S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s))
 O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \
            $(foreach file,$(S_FILES),$(BUILD_DIR)/$(file:.s=.o)) \
 
+# Overlay modules
+BIN_FILES := $(wildcard files/*.__AT_*)
+
 ##################### Compiler Options #######################
 
 MWCCVERSION := 2.0/base
@@ -144,8 +147,8 @@ $(BUILD_DIR)/%.o: %.s
 $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) undefined_syms.txt
 	$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
 
-$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT)
-	$(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES)
+$(ELF): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BIN_FILES)
+	$(LD) $(LDFLAGS) $(BUILD_DIR)/$(LD_SCRIPT) -o $(ELF) $(O_FILES) $(BIN_FILES)
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill=0xFF $< $@
@@ -168,6 +171,8 @@ DUMMY != mkdir -p $(ALL_DIRS)
 %.png: ;
 %.pal: ;
 
+$(BIN_FILES): ;
+
 $(BUILD_DIR)/data/icon.o: graphics/icon.4bpp graphics/icon.gbapal
 
 ### Debug Print ###
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 50a9da9c..e71920ae 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -1,3 +1,4 @@
+
 MEMORY {
 	.itcm (RWX) : ORIGIN=0x01FF8000, LENGTH=0
 	.text (RX) : ORIGIN=0x02000000, LENGTH=0
@@ -8,96 +9,184 @@ MEMORY {
 	.ewram (RWX) : ORIGIN=0x023E0000, LENGTH=0
 	.dtcm (RW) : ORIGIN=0x027E0000, LENGTH=0
 	.overlay (RX) : ORIGIN=0, LENGTH=0
+	MODULE_00 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_01 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_02 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_03 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_04 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_05 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_06 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_07 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_08 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_09 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_10 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_11 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_12 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_13 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_14 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_15 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_16 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_17 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_18 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_19 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_20 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_21 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_22 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_23 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_24 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_25 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_26 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_27 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_28 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_29 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_30 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_31 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_32 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_33 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_34 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_35 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_36 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_37 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_38 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_39 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_40 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_41 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_42 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_43 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_44 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_45 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_46 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_47 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_48 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_49 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_50 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_51 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_52 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_53 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_54 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_55 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_56 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_57 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_58 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_59 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_60 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_61 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_62 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_63 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_64 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_65 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_66 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_67 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_68 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_69 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_70 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_71 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_72 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_73 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_74 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_75 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_76 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_77 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_78 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_79 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_80 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_81 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_82 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_83 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_84 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_85 (RWX) : ORIGIN=0, LENGTH=0
+	MODULE_86 (RWX) : ORIGIN=0, LENGTH=0
 }
 
 SECTIONS {
 #include "undefined_syms.txt"
-    .text : AT (0x0) {
-        secure.o (.text)
-        crt0.o (.text)
-        crt0.o (.version)
-        main.o (.text)
-        FUN_02000DF4.o (.text)
-        unk_02000E0C.o (.text)
-        string_util.o (.text)
-        unk_020023C0.o (.text)
-        filesystem.o (.text)
-        unk_02006864.o (.text)
-        script.o (.text)
-        unk_02038C78.o (.text)
-        scrcmd.o (.text)
-        unk_02046030.o (.text)
-        unk_0208AC14.o (.text)
-        unk_020AF030.o (.text)
-        /* Nitro SDK */
-        FX_arm9.o (.text)
-        GX_arm9.o (.text)
-        OS_arm9.o (.text)
-        MI_arm9.o (.text)
-        SND_arm9.o (.text)
-        PXI_arm9.o (.text)
-        FS_arm9.o (.text)
-        DGT_arm9.o (.text)
-        CP_arm9.o (.text)
-        SPI_arm9.o (.text)
-        PM_arm9.o (.text)
-        RTC_arm9.o (.text)
-        CARD_arm9.o (.text)
-        WM_arm9.o (.text)
-        CTRDG_arm9.o (.text)
-        MATH_arm9.o (.text)
-        STD_arm9.o (.text)
-        /* C standard library */
-        libc.o (.text)
-        /* MWCC library */
-        libmwcc.o (.text)
+	.text : AT (0x0) {
+		secure.o (.text)
+		crt0.o (.text)
+		crt0.o (.version)
+		main.o (.text)
+		FUN_02000DF4.o (.text)
+		unk_02000E0C.o (.text)
+		string_util.o (.text)
+		unk_020023C0.o (.text)
+		filesystem.o (.text)
+		unk_02006864.o (.text)
+		script.o (.text)
+		unk_02038C78.o (.text)
+		scrcmd.o (.text)
+		unk_02046030.o (.text)
+		unk_0208AC14.o (.text)
+		unk_020AF030.o (.text)
+		/* Nitro SDK */
+		FX_arm9.o (.text)
+		GX_arm9.o (.text)
+		OS_arm9.o (.text)
+		MI_arm9.o (.text)
+		SND_arm9.o (.text)
+		PXI_arm9.o (.text)
+		FS_arm9.o (.text)
+		DGT_arm9.o (.text)
+		CP_arm9.o (.text)
+		SPI_arm9.o (.text)
+		PM_arm9.o (.text)
+		RTC_arm9.o (.text)
+		CARD_arm9.o (.text)
+		WM_arm9.o (.text)
+		CTRDG_arm9.o (.text)
+		MATH_arm9.o (.text)
+		STD_arm9.o (.text)
+		/* C standard library */
+		libc.o (.text)
+		/* MWCC library */
+		libmwcc.o (.text)
 	} > .text
 
 	.data : AT (0xEC710) {
-        rom2.o (.data)
-        string_util.o (.data)
-        rom2_2.o (.data)
+		rom2.o (.data)
+		string_util.o (.data)
+		rom2_2.o (.data)
 	} > .data
 
-	SDK_AUTOLOAD_START = .;
 	SDK_STATIC_BSS_START = .;
-	SDK_STATIC_BSS_END = . + 0xd0540;
+	SDK_STATIC_BSS_END = SDK_STATIC_BSS_START + 0xd0540;
+
+	SDK_AUTOLOAD_START = .;
 
 	.itcm : AT (0x106FA0)
 	{
 		SDK_AUTOLOAD_ITCM_START = .;
-        arm9_itcm.o (.itcm)
-        SDK_AUTOLOAD_ITCM_END = .;
-        . = 0x01FF8720;
-        SDK_SECTION_ARENA_ITCM_START = .;
-    } > .itcm
-
-    .dtcm : AT (0x1076A0) {
-    	SDK_AUTOLOAD_DTCM_START = .;
-    	OS_arm9.o (.dtcm)
-    	SDK_AUTOLOAD_DTCM_END = .;
-    	SDK_SECTION_ARENA_DTCM_START = 0x027E0080;
-    } > .dtcm
-
-    .autoload : AT (0x107700) {
+		arm9_itcm.o (.itcm)
+		SDK_AUTOLOAD_ITCM_END = .;
+		. = 0x01FF8720;
+		SDK_SECTION_ARENA_ITCM_START = .;
+	} > .itcm
+
+	.dtcm : AT (0x1076A0) {
+		SDK_AUTOLOAD_DTCM_START = .;
+		OS_arm9.o (.dtcm)
+		SDK_AUTOLOAD_DTCM_END = .;
+		SDK_SECTION_ARENA_DTCM_START = 0x027E0080;
+	} > .dtcm
+
+	.autoload : AT (0x107700) {
 		WRITEW SDK_AUTOLOAD_ITCM_START;
-        WRITEW SDK_AUTOLOAD_ITCM_SIZE;
-        WRITEW SDK_AUTOLOAD_ITCM_BSS_SIZE;
-        WRITEW SDK_AUTOLOAD_DTCM_START;
-        WRITEW SDK_AUTOLOAD_DTCM_SIZE;
-        WRITEW SDK_AUTOLOAD_DTCM_BSS_SIZE;
-        WRITEW SDK_AUTOLOAD_EXT_START;
-        WRITEW SDK_AUTOLOAD_EXT_SIZE;
-        WRITEW SDK_AUTOLOAD_EXT_BSS_SIZE;
-    } > .autoload
-
-    .footer : AT (0x107724) {
-    	WRITEW 0xDEC00621;
-    	WRITEW _start_ModuleParams - ADDR(.text);
-    	WRITEW 0;
-    } > .footer
-
-    .overlay : AT (0x107800) {
+		WRITEW SDK_AUTOLOAD_ITCM_SIZE;
+		WRITEW SDK_AUTOLOAD_ITCM_BSS_SIZE;
+		WRITEW SDK_AUTOLOAD_DTCM_START;
+		WRITEW SDK_AUTOLOAD_DTCM_SIZE;
+		WRITEW SDK_AUTOLOAD_DTCM_BSS_SIZE;
+		WRITEW SDK_AUTOLOAD_EXT_START;
+		WRITEW SDK_AUTOLOAD_EXT_SIZE;
+		WRITEW SDK_AUTOLOAD_EXT_BSS_SIZE;
+	} > .autoload
+
+	.footer : AT (0x107724) {
+		WRITEW 0xDEC00621;
+		WRITEW _start_ModuleParams - ADDR(.text);
+		WRITEW 0;
+	} > .footer
+
+	.overlay : AT (0x107800) {
 		WRITEW 0;
 		WRITEW SDK_MODULE_00_START;
 		WRITEW SDK_MODULE_00_SIZE;
@@ -880,5 +969,440 @@ SECTIONS {
 		WRITEW SDK_MODULE_86_STATIC_INIT_END;
 		WRITEW 86;
 		WRITEW 0;
-    } > .overlay
+	} > .overlay
+
+	.MODULE.00 : AT (0x108400) {
+		. = ALIGN(512);
+		FILE_10C400.o (.text)
+	} > MODULE_00
+
+	.MODULE.01 : AT (0x108600) {
+		. = ALIGN(512);
+		FILE_10C600.o (.text)
+	} > MODULE_01
+
+	.MODULE.02 : AT (0x108800) {
+		. = ALIGN(512);
+		FILE_10C800.o (.text)
+	} > MODULE_02
+
+	.MODULE.03 : AT (0x108A00) {
+		. = ALIGN(512);
+		FILE_10CA00.o (.text)
+	} > MODULE_03
+
+	.MODULE.04 : AT (0x108C00) {
+		. = ALIGN(512);
+		FILE_10CC00.o (.text)
+	} > MODULE_04
+
+	.MODULE.05 : AT (0x141400) {
+		. = ALIGN(512);
+		FILE_145400.o (.text)
+	} > MODULE_05
+
+	.MODULE.06 : AT (0x167600) {
+		. = ALIGN(512);
+		FILE_16B600.o (.text)
+	} > MODULE_06
+
+	.MODULE.07 : AT (0x180400) {
+		. = ALIGN(512);
+		FILE_184400.o (.text)
+	} > MODULE_07
+
+	.MODULE.08 : AT (0x183800) {
+		. = ALIGN(512);
+		FILE_187800.o (.text)
+	} > MODULE_08
+
+	.MODULE.09 : AT (0x19F000) {
+		. = ALIGN(512);
+		FILE_1A3000.o (.text)
+	} > MODULE_09
+
+	.MODULE.10 : AT (0x1A9200) {
+		. = ALIGN(512);
+		FILE_1AD200.o (.text)
+	} > MODULE_10
+
+	.MODULE.11 : AT (0x1A9400) {
+		. = ALIGN(512);
+		FILE_1AD400.o (.text)
+	} > MODULE_11
+
+	.MODULE.12 : AT (0x1DBE00) {
+		. = ALIGN(512);
+		FILE_1DFE00.o (.text)
+	} > MODULE_12
+
+	.MODULE.13 : AT (0x1F5200) {
+		. = ALIGN(512);
+		FILE_1F9200.o (.text)
+	} > MODULE_13
+
+	.MODULE.14 : AT (0x223E00) {
+		. = ALIGN(512);
+		FILE_227E00.o (.text)
+	} > MODULE_14
+
+	.MODULE.15 : AT (0x233400) {
+		. = ALIGN(512);
+		FILE_237400.o (.text)
+	} > MODULE_15
+
+	.MODULE.16 : AT (0x237C00) {
+		. = ALIGN(512);
+		FILE_23BC00.o (.text)
+	} > MODULE_16
+
+	.MODULE.17 : AT (0x260200) {
+		. = ALIGN(512);
+		FILE_264200.o (.text)
+	} > MODULE_17
+
+	.MODULE.18 : AT (0x267200) {
+		. = ALIGN(512);
+		FILE_26B200.o (.text)
+	} > MODULE_18
+
+	.MODULE.19 : AT (0x27F000) {
+		. = ALIGN(512);
+		FILE_283000.o (.text)
+	} > MODULE_19
+
+	.MODULE.20 : AT (0x27F200) {
+		. = ALIGN(512);
+		FILE_283200.o (.text)
+	} > MODULE_20
+
+	.MODULE.21 : AT (0x281600) {
+		. = ALIGN(512);
+		FILE_285600.o (.text)
+	} > MODULE_21
+
+	.MODULE.22 : AT (0x281C00) {
+		. = ALIGN(512);
+		FILE_285C00.o (.text)
+	} > MODULE_22
+
+	.MODULE.23 : AT (0x282C00) {
+		. = ALIGN(512);
+		FILE_286C00.o (.text)
+	} > MODULE_23
+
+	.MODULE.24 : AT (0x284600) {
+		. = ALIGN(512);
+		FILE_288600.o (.text)
+	} > MODULE_24
+
+	.MODULE.25 : AT (0x285000) {
+		. = ALIGN(512);
+		FILE_289000.o (.text)
+	} > MODULE_25
+
+	.MODULE.26 : AT (0x285600) {
+		. = ALIGN(512);
+		FILE_289600.o (.text)
+	} > MODULE_26
+
+	.MODULE.27 : AT (0x285E00) {
+		. = ALIGN(512);
+		FILE_289E00.o (.text)
+	} > MODULE_27
+
+	.MODULE.28 : AT (0x286A00) {
+		. = ALIGN(512);
+		FILE_28AA00.o (.text)
+	} > MODULE_28
+
+	.MODULE.29 : AT (0x288200) {
+		. = ALIGN(512);
+		FILE_28C200.o (.text)
+	} > MODULE_29
+
+	.MODULE.30 : AT (0x288C00) {
+		. = ALIGN(512);
+		FILE_28CC00.o (.text)
+	} > MODULE_30
+
+	.MODULE.31 : AT (0x289200) {
+		. = ALIGN(512);
+		FILE_28D200.o (.text)
+	} > MODULE_31
+
+	.MODULE.32 : AT (0x289800) {
+		. = ALIGN(512);
+		FILE_28D800.o (.text)
+	} > MODULE_32
+
+	.MODULE.33 : AT (0x289E00) {
+		. = ALIGN(512);
+		FILE_28DE00.o (.text)
+	} > MODULE_33
+
+	.MODULE.34 : AT (0x28A200) {
+		. = ALIGN(512);
+		FILE_28E200.o (.text)
+	} > MODULE_34
+
+	.MODULE.35 : AT (0x28A800) {
+		. = ALIGN(512);
+		FILE_28E800.o (.text)
+	} > MODULE_35
+
+	.MODULE.36 : AT (0x28B200) {
+		. = ALIGN(512);
+		FILE_28F200.o (.text)
+	} > MODULE_36
+
+	.MODULE.37 : AT (0x28C000) {
+		. = ALIGN(512);
+		FILE_290000.o (.text)
+	} > MODULE_37
+
+	.MODULE.38 : AT (0x28C600) {
+		. = ALIGN(512);
+		FILE_290600.o (.text)
+	} > MODULE_38
+
+	.MODULE.39 : AT (0x28D200) {
+		. = ALIGN(512);
+		FILE_291200.o (.text)
+	} > MODULE_39
+
+	.MODULE.40 : AT (0x28E000) {
+		. = ALIGN(512);
+		FILE_292000.o (.text)
+	} > MODULE_40
+
+	.MODULE.41 : AT (0x28EE00) {
+		. = ALIGN(512);
+		FILE_292E00.o (.text)
+	} > MODULE_41
+
+	.MODULE.42 : AT (0x290000) {
+		. = ALIGN(512);
+		FILE_294000.o (.text)
+	} > MODULE_42
+
+	.MODULE.43 : AT (0x290A00) {
+		. = ALIGN(512);
+		FILE_294A00.o (.text)
+	} > MODULE_43
+
+	.MODULE.44 : AT (0x291400) {
+		. = ALIGN(512);
+		FILE_295400.o (.text)
+	} > MODULE_44
+
+	.MODULE.45 : AT (0x291A00) {
+		. = ALIGN(512);
+		FILE_295A00.o (.text)
+	} > MODULE_45
+
+	.MODULE.46 : AT (0x292400) {
+		. = ALIGN(512);
+		FILE_296400.o (.text)
+	} > MODULE_46
+
+	.MODULE.47 : AT (0x292800) {
+		. = ALIGN(512);
+		FILE_296800.o (.text)
+	} > MODULE_47
+
+	.MODULE.48 : AT (0x293600) {
+		. = ALIGN(512);
+		FILE_297600.o (.text)
+	} > MODULE_48
+
+	.MODULE.49 : AT (0x294000) {
+		. = ALIGN(512);
+		FILE_298000.o (.text)
+	} > MODULE_49
+
+	.MODULE.50 : AT (0x294600) {
+		. = ALIGN(512);
+		FILE_298600.o (.text)
+	} > MODULE_50
+
+	.MODULE.51 : AT (0x294A00) {
+		. = ALIGN(512);
+		FILE_298A00.o (.text)
+	} > MODULE_51
+
+	.MODULE.52 : AT (0x295A00) {
+		. = ALIGN(512);
+		FILE_299A00.o (.text)
+	} > MODULE_52
+
+	.MODULE.53 : AT (0x295E00) {
+		. = ALIGN(512);
+		FILE_299E00.o (.text)
+	} > MODULE_53
+
+	.MODULE.54 : AT (0x298400) {
+		. = ALIGN(512);
+		FILE_29C400.o (.text)
+	} > MODULE_54
+
+	.MODULE.55 : AT (0x29A800) {
+		. = ALIGN(512);
+		FILE_29E800.o (.text)
+	} > MODULE_55
+
+	.MODULE.56 : AT (0x29DA00) {
+		. = ALIGN(512);
+		FILE_2A1A00.o (.text)
+	} > MODULE_56
+
+	.MODULE.57 : AT (0x2A2200) {
+		. = ALIGN(512);
+		FILE_2A6200.o (.text)
+	} > MODULE_57
+
+	.MODULE.58 : AT (0x2A4800) {
+		. = ALIGN(512);
+		FILE_2A8800.o (.text)
+	} > MODULE_58
+
+	.MODULE.59 : AT (0x2A5E00) {
+		. = ALIGN(512);
+		FILE_2A9E00.o (.text)
+	} > MODULE_59
+
+	.MODULE.60 : AT (0x2A8C00) {
+		. = ALIGN(512);
+		FILE_2ACC00.o (.text)
+	} > MODULE_60
+
+	.MODULE.61 : AT (0x2A9A00) {
+		. = ALIGN(512);
+		FILE_2ADA00.o (.text)
+	} > MODULE_61
+
+	.MODULE.62 : AT (0x2AAC00) {
+		. = ALIGN(512);
+		FILE_2AEC00.o (.text)
+	} > MODULE_62
+
+	.MODULE.63 : AT (0x2AEA00) {
+		. = ALIGN(512);
+		FILE_2B2A00.o (.text)
+	} > MODULE_63
+
+	.MODULE.64 : AT (0x2B3600) {
+		. = ALIGN(512);
+		FILE_2B7600.o (.text)
+	} > MODULE_64
+
+	.MODULE.65 : AT (0x2B5400) {
+		. = ALIGN(512);
+		FILE_2B9400.o (.text)
+	} > MODULE_65
+
+	.MODULE.66 : AT (0x2B8400) {
+		. = ALIGN(512);
+		FILE_2BC400.o (.text)
+	} > MODULE_66
+
+	.MODULE.67 : AT (0x2BAC00) {
+		. = ALIGN(512);
+		FILE_2BEC00.o (.text)
+	} > MODULE_67
+
+	.MODULE.68 : AT (0x2BD200) {
+		. = ALIGN(512);
+		FILE_2C1200.o (.text)
+	} > MODULE_68
+
+	.MODULE.69 : AT (0x2BE800) {
+		. = ALIGN(512);
+		FILE_2C2800.o (.text)
+	} > MODULE_69
+
+	.MODULE.70 : AT (0x2C0C00) {
+		. = ALIGN(512);
+		FILE_2C4C00.o (.text)
+	} > MODULE_70
+
+	.MODULE.71 : AT (0x2C1C00) {
+		. = ALIGN(512);
+		FILE_2C5C00.o (.text)
+	} > MODULE_71
+
+	.MODULE.72 : AT (0x2C5C00) {
+		. = ALIGN(512);
+		FILE_2C9C00.o (.text)
+	} > MODULE_72
+
+	.MODULE.73 : AT (0x2C5E00) {
+		. = ALIGN(512);
+		FILE_2C9E00.o (.text)
+	} > MODULE_73
+
+	.MODULE.74 : AT (0x2CAA00) {
+		. = ALIGN(512);
+		FILE_2CEA00.o (.text)
+	} > MODULE_74
+
+	.MODULE.75 : AT (0x2CBE00) {
+		. = ALIGN(512);
+		FILE_2CFE00.o (.text)
+	} > MODULE_75
+
+	.MODULE.76 : AT (0x2D1C00) {
+		. = ALIGN(512);
+		FILE_2D5C00.o (.text)
+	} > MODULE_76
+
+	.MODULE.77 : AT (0x2D3C00) {
+		. = ALIGN(512);
+		FILE_2D7C00.o (.text)
+	} > MODULE_77
+
+	.MODULE.78 : AT (0x2D5800) {
+		. = ALIGN(512);
+		FILE_2D9800.o (.text)
+	} > MODULE_78
+
+	.MODULE.79 : AT (0x2D5E00) {
+		. = ALIGN(512);
+		FILE_2D9E00.o (.text)
+	} > MODULE_79
+
+	.MODULE.80 : AT (0x2DB200) {
+		. = ALIGN(512);
+		FILE_2DF200.o (.text)
+	} > MODULE_80
+
+	.MODULE.81 : AT (0x2E5A00) {
+		. = ALIGN(512);
+		FILE_2E9A00.o (.text)
+	} > MODULE_81
+
+	.MODULE.82 : AT (0x2EB000) {
+		. = ALIGN(512);
+		FILE_2EF000.o (.text)
+	} > MODULE_82
+
+	.MODULE.83 : AT (0x2ED600) {
+		. = ALIGN(512);
+		FILE_2F1600.o (.text)
+	} > MODULE_83
+
+	.MODULE.84 : AT (0x2FBA00) {
+		. = ALIGN(512);
+		FILE_2FFA00.o (.text)
+	} > MODULE_84
+
+	.MODULE.85 : AT (0x2FF400) {
+		. = ALIGN(512);
+		FILE_303400.o (.text)
+	} > MODULE_85
+
+	.MODULE.86 : AT (0x308600) {
+		. = ALIGN(512);
+		FILE_30C600.o (.text)
+	} > MODULE_86
 }
diff --git a/arm9/arm9.sha1 b/arm9/arm9.sha1
new file mode 100644
index 00000000..3bc27b8a
--- /dev/null
+++ b/arm9/arm9.sha1
@@ -0,0 +1 @@
+f72681568e075a56beb25b584734a35d118468a1  build/arm9.bin
diff --git a/files/FILE_10C400.s b/arm9/files/FILE_10C400.s
index 5cf27f33..5cf27f33 100644
--- a/files/FILE_10C400.s
+++ b/arm9/files/FILE_10C400.s
diff --git a/files/FILE_10C600.s b/arm9/files/FILE_10C600.s
index d2608c8c..d2608c8c 100644
--- a/files/FILE_10C600.s
+++ b/arm9/files/FILE_10C600.s
diff --git a/files/FILE_10C800.s b/arm9/files/FILE_10C800.s
index 8cb22116..8cb22116 100644
--- a/files/FILE_10C800.s
+++ b/arm9/files/FILE_10C800.s
diff --git a/files/FILE_10CA00.s b/arm9/files/FILE_10CA00.s
index 46e1e03b..46e1e03b 100644
--- a/files/FILE_10CA00.s
+++ b/arm9/files/FILE_10CA00.s
diff --git a/files/FILE_10CC00.s b/arm9/files/FILE_10CC00.s
index 2876942a..2876942a 100644
--- a/files/FILE_10CC00.s
+++ b/arm9/files/FILE_10CC00.s
diff --git a/files/FILE_145400.s b/arm9/files/FILE_145400.s
index 31de6e12..31de6e12 100644
--- a/files/FILE_145400.s
+++ b/arm9/files/FILE_145400.s
diff --git a/files/FILE_16B600.s b/arm9/files/FILE_16B600.s
index 33e75c23..33e75c23 100644
--- a/files/FILE_16B600.s
+++ b/arm9/files/FILE_16B600.s
diff --git a/files/FILE_184400.s b/arm9/files/FILE_184400.s
index 936860c0..936860c0 100644
--- a/files/FILE_184400.s
+++ b/arm9/files/FILE_184400.s
diff --git a/files/FILE_187800.s b/arm9/files/FILE_187800.s
index 38b64eec..38b64eec 100644
--- a/files/FILE_187800.s
+++ b/arm9/files/FILE_187800.s
diff --git a/files/FILE_1A3000.s b/arm9/files/FILE_1A3000.s
index 3febcf47..3febcf47 100644
--- a/files/FILE_1A3000.s
+++ b/arm9/files/FILE_1A3000.s
diff --git a/files/FILE_1AD200.s b/arm9/files/FILE_1AD200.s
index 24bfcb9b..24bfcb9b 100644
--- a/files/FILE_1AD200.s
+++ b/arm9/files/FILE_1AD200.s
diff --git a/files/FILE_1AD400.s b/arm9/files/FILE_1AD400.s
index f66becc6..f66becc6 100644
--- a/files/FILE_1AD400.s
+++ b/arm9/files/FILE_1AD400.s
diff --git a/files/FILE_1DFE00.s b/arm9/files/FILE_1DFE00.s
index 5e5e8a7c..5e5e8a7c 100644
--- a/files/FILE_1DFE00.s
+++ b/arm9/files/FILE_1DFE00.s
diff --git a/files/FILE_1F9200.s b/arm9/files/FILE_1F9200.s
index e2e33721..e2e33721 100644
--- a/files/FILE_1F9200.s
+++ b/arm9/files/FILE_1F9200.s
diff --git a/files/FILE_227E00.s b/arm9/files/FILE_227E00.s
index ab307e3a..ab307e3a 100644
--- a/files/FILE_227E00.s
+++ b/arm9/files/FILE_227E00.s
diff --git a/files/FILE_237400.s b/arm9/files/FILE_237400.s
index 45907862..45907862 100644
--- a/files/FILE_237400.s
+++ b/arm9/files/FILE_237400.s
diff --git a/files/FILE_23BC00.s b/arm9/files/FILE_23BC00.s
index 72123ecb..72123ecb 100644
--- a/files/FILE_23BC00.s
+++ b/arm9/files/FILE_23BC00.s
diff --git a/files/FILE_264200.s b/arm9/files/FILE_264200.s
index 5e654387..5e654387 100644
--- a/files/FILE_264200.s
+++ b/arm9/files/FILE_264200.s
diff --git a/files/FILE_26B200.s b/arm9/files/FILE_26B200.s
index 0c91220f..0c91220f 100644
--- a/files/FILE_26B200.s
+++ b/arm9/files/FILE_26B200.s
diff --git a/files/FILE_283000.s b/arm9/files/FILE_283000.s
index 6b536136..6b536136 100644
--- a/files/FILE_283000.s
+++ b/arm9/files/FILE_283000.s
diff --git a/files/FILE_283200.s b/arm9/files/FILE_283200.s
index 461d9ac6..461d9ac6 100644
--- a/files/FILE_283200.s
+++ b/arm9/files/FILE_283200.s
diff --git a/files/FILE_285600.s b/arm9/files/FILE_285600.s
index 02c6eb09..02c6eb09 100644
--- a/files/FILE_285600.s
+++ b/arm9/files/FILE_285600.s
diff --git a/files/FILE_285C00.s b/arm9/files/FILE_285C00.s
index 70fab4a8..70fab4a8 100644
--- a/files/FILE_285C00.s
+++ b/arm9/files/FILE_285C00.s
diff --git a/files/FILE_286C00.s b/arm9/files/FILE_286C00.s
index 7d4ff42d..7d4ff42d 100644
--- a/files/FILE_286C00.s
+++ b/arm9/files/FILE_286C00.s
diff --git a/files/FILE_288600.s b/arm9/files/FILE_288600.s
index cdb33573..cdb33573 100644
--- a/files/FILE_288600.s
+++ b/arm9/files/FILE_288600.s
diff --git a/files/FILE_289000.s b/arm9/files/FILE_289000.s
index 0d794c29..0d794c29 100644
--- a/files/FILE_289000.s
+++ b/arm9/files/FILE_289000.s
diff --git a/files/FILE_289600.s b/arm9/files/FILE_289600.s
index 813f71fe..813f71fe 100644
--- a/files/FILE_289600.s
+++ b/arm9/files/FILE_289600.s
diff --git a/files/FILE_289E00.s b/arm9/files/FILE_289E00.s
index 34da6195..34da6195 100644
--- a/files/FILE_289E00.s
+++ b/arm9/files/FILE_289E00.s
diff --git a/files/FILE_28AA00.s b/arm9/files/FILE_28AA00.s
index d8827a3a..d8827a3a 100644
--- a/files/FILE_28AA00.s
+++ b/arm9/files/FILE_28AA00.s
diff --git a/files/FILE_28C200.s b/arm9/files/FILE_28C200.s
index b69d6856..b69d6856 100644
--- a/files/FILE_28C200.s
+++ b/arm9/files/FILE_28C200.s
diff --git a/files/FILE_28CC00.s b/arm9/files/FILE_28CC00.s
index 8b411001..8b411001 100644
--- a/files/FILE_28CC00.s
+++ b/arm9/files/FILE_28CC00.s
diff --git a/files/FILE_28D200.s b/arm9/files/FILE_28D200.s
index fe324802..fe324802 100644
--- a/files/FILE_28D200.s
+++ b/arm9/files/FILE_28D200.s
diff --git a/files/FILE_28D800.s b/arm9/files/FILE_28D800.s
index f787e794..f787e794 100644
--- a/files/FILE_28D800.s
+++ b/arm9/files/FILE_28D800.s
diff --git a/files/FILE_28DE00.s b/arm9/files/FILE_28DE00.s
index 6658c9fc..6658c9fc 100644
--- a/files/FILE_28DE00.s
+++ b/arm9/files/FILE_28DE00.s
diff --git a/files/FILE_28E200.s b/arm9/files/FILE_28E200.s
index d36e77ce..d36e77ce 100644
--- a/files/FILE_28E200.s
+++ b/arm9/files/FILE_28E200.s
diff --git a/files/FILE_28E800.s b/arm9/files/FILE_28E800.s
index bdc1ef52..bdc1ef52 100644
--- a/files/FILE_28E800.s
+++ b/arm9/files/FILE_28E800.s
diff --git a/files/FILE_28F200.s b/arm9/files/FILE_28F200.s
index f8b95b6a..f8b95b6a 100644
--- a/files/FILE_28F200.s
+++ b/arm9/files/FILE_28F200.s
diff --git a/files/FILE_290000.s b/arm9/files/FILE_290000.s
index 7e15ff90..7e15ff90 100644
--- a/files/FILE_290000.s
+++ b/arm9/files/FILE_290000.s
diff --git a/files/FILE_290600.s b/arm9/files/FILE_290600.s
index fda50640..fda50640 100644
--- a/files/FILE_290600.s
+++ b/arm9/files/FILE_290600.s
diff --git a/files/FILE_291200.s b/arm9/files/FILE_291200.s
index ce12a90a..ce12a90a 100644
--- a/files/FILE_291200.s
+++ b/arm9/files/FILE_291200.s
diff --git a/files/FILE_292000.s b/arm9/files/FILE_292000.s
index d50a3ef1..d50a3ef1 100644
--- a/files/FILE_292000.s
+++ b/arm9/files/FILE_292000.s
diff --git a/files/FILE_292E00.s b/arm9/files/FILE_292E00.s
index b5a8d36d..b5a8d36d 100644
--- a/files/FILE_292E00.s
+++ b/arm9/files/FILE_292E00.s
diff --git a/files/FILE_294000.s b/arm9/files/FILE_294000.s
index 8a03373c..8a03373c 100644
--- a/files/FILE_294000.s
+++ b/arm9/files/FILE_294000.s
diff --git a/files/FILE_294A00.s b/arm9/files/FILE_294A00.s
index 452c8165..452c8165 100644
--- a/files/FILE_294A00.s
+++ b/arm9/files/FILE_294A00.s
diff --git a/files/FILE_295400.s b/arm9/files/FILE_295400.s
index b21be08b..b21be08b 100644
--- a/files/FILE_295400.s
+++ b/arm9/files/FILE_295400.s
diff --git a/files/FILE_295A00.s b/arm9/files/FILE_295A00.s
index 1017f6aa..1017f6aa 100644
--- a/files/FILE_295A00.s
+++ b/arm9/files/FILE_295A00.s
diff --git a/files/FILE_296400.s b/arm9/files/FILE_296400.s
index 118ca39a..118ca39a 100644
--- a/files/FILE_296400.s
+++ b/arm9/files/FILE_296400.s
diff --git a/files/FILE_296800.s b/arm9/files/FILE_296800.s
index 68ac75b9..68ac75b9 100644
--- a/files/FILE_296800.s
+++ b/arm9/files/FILE_296800.s
diff --git a/files/FILE_297600.s b/arm9/files/FILE_297600.s
index 1887c4af..1887c4af 100644
--- a/files/FILE_297600.s
+++ b/arm9/files/FILE_297600.s
diff --git a/files/FILE_298000.s b/arm9/files/FILE_298000.s
index ffdcde2a..ffdcde2a 100644
--- a/files/FILE_298000.s
+++ b/arm9/files/FILE_298000.s
diff --git a/files/FILE_298600.s b/arm9/files/FILE_298600.s
index d4bef86c..d4bef86c 100644
--- a/files/FILE_298600.s
+++ b/arm9/files/FILE_298600.s
diff --git a/files/FILE_298A00.s b/arm9/files/FILE_298A00.s
index 258432c2..258432c2 100644
--- a/files/FILE_298A00.s
+++ b/arm9/files/FILE_298A00.s
diff --git a/files/FILE_299A00.s b/arm9/files/FILE_299A00.s
index 71432656..71432656 100644
--- a/files/FILE_299A00.s
+++ b/arm9/files/FILE_299A00.s
diff --git a/files/FILE_299E00.s b/arm9/files/FILE_299E00.s
index 4fb90fe1..4fb90fe1 100644
--- a/files/FILE_299E00.s
+++ b/arm9/files/FILE_299E00.s
diff --git a/files/FILE_29C400.s b/arm9/files/FILE_29C400.s
index 3b880c03..3b880c03 100644
--- a/files/FILE_29C400.s
+++ b/arm9/files/FILE_29C400.s
diff --git a/files/FILE_29E800.s b/arm9/files/FILE_29E800.s
index f3cf72cb..f3cf72cb 100644
--- a/files/FILE_29E800.s
+++ b/arm9/files/FILE_29E800.s
diff --git a/files/FILE_2A1A00.s b/arm9/files/FILE_2A1A00.s
index d917b776..d917b776 100644
--- a/files/FILE_2A1A00.s
+++ b/arm9/files/FILE_2A1A00.s
diff --git a/files/FILE_2A6200.s b/arm9/files/FILE_2A6200.s
index ae62fcc6..ae62fcc6 100644
--- a/files/FILE_2A6200.s
+++ b/arm9/files/FILE_2A6200.s
diff --git a/files/FILE_2A8800.s b/arm9/files/FILE_2A8800.s
index 967d96f3..967d96f3 100644
--- a/files/FILE_2A8800.s
+++ b/arm9/files/FILE_2A8800.s
diff --git a/files/FILE_2A9E00.s b/arm9/files/FILE_2A9E00.s
index 21839769..21839769 100644
--- a/files/FILE_2A9E00.s
+++ b/arm9/files/FILE_2A9E00.s
diff --git a/files/FILE_2ACC00.s b/arm9/files/FILE_2ACC00.s
index 2068bd4c..2068bd4c 100644
--- a/files/FILE_2ACC00.s
+++ b/arm9/files/FILE_2ACC00.s
diff --git a/files/FILE_2ADA00.s b/arm9/files/FILE_2ADA00.s
index 9f464dac..9f464dac 100644
--- a/files/FILE_2ADA00.s
+++ b/arm9/files/FILE_2ADA00.s
diff --git a/files/FILE_2AEC00.s b/arm9/files/FILE_2AEC00.s
index e6a54fb3..e6a54fb3 100644
--- a/files/FILE_2AEC00.s
+++ b/arm9/files/FILE_2AEC00.s
diff --git a/files/FILE_2B2A00.s b/arm9/files/FILE_2B2A00.s
index 44eba0d2..44eba0d2 100644
--- a/files/FILE_2B2A00.s
+++ b/arm9/files/FILE_2B2A00.s
diff --git a/files/FILE_2B7600.s b/arm9/files/FILE_2B7600.s
index 8258b44e..8258b44e 100644
--- a/files/FILE_2B7600.s
+++ b/arm9/files/FILE_2B7600.s
diff --git a/files/FILE_2B9400.s b/arm9/files/FILE_2B9400.s
index 17ffa8d8..17ffa8d8 100644
--- a/files/FILE_2B9400.s
+++ b/arm9/files/FILE_2B9400.s
diff --git a/files/FILE_2BC400.s b/arm9/files/FILE_2BC400.s
index e34ef7f4..e34ef7f4 100644
--- a/files/FILE_2BC400.s
+++ b/arm9/files/FILE_2BC400.s
diff --git a/files/FILE_2BEC00.s b/arm9/files/FILE_2BEC00.s
index c229a70e..c229a70e 100644
--- a/files/FILE_2BEC00.s
+++ b/arm9/files/FILE_2BEC00.s
diff --git a/files/FILE_2C1200.s b/arm9/files/FILE_2C1200.s
index f357627d..f357627d 100644
--- a/files/FILE_2C1200.s
+++ b/arm9/files/FILE_2C1200.s
diff --git a/files/FILE_2C2800.s b/arm9/files/FILE_2C2800.s
index bddd6f01..bddd6f01 100644
--- a/files/FILE_2C2800.s
+++ b/arm9/files/FILE_2C2800.s
diff --git a/files/FILE_2C4C00.s b/arm9/files/FILE_2C4C00.s
index d41910b0..d41910b0 100644
--- a/files/FILE_2C4C00.s
+++ b/arm9/files/FILE_2C4C00.s
diff --git a/files/FILE_2C5C00.s b/arm9/files/FILE_2C5C00.s
index c24ed641..c24ed641 100644
--- a/files/FILE_2C5C00.s
+++ b/arm9/files/FILE_2C5C00.s
diff --git a/files/FILE_2C9C00.s b/arm9/files/FILE_2C9C00.s
index 72b30caa..72b30caa 100644
--- a/files/FILE_2C9C00.s
+++ b/arm9/files/FILE_2C9C00.s
diff --git a/files/FILE_2C9E00.s b/arm9/files/FILE_2C9E00.s
index 91cc4599..91cc4599 100644
--- a/files/FILE_2C9E00.s
+++ b/arm9/files/FILE_2C9E00.s
diff --git a/files/FILE_2CEA00.s b/arm9/files/FILE_2CEA00.s
index e9a4ed70..e9a4ed70 100644
--- a/files/FILE_2CEA00.s
+++ b/arm9/files/FILE_2CEA00.s
diff --git a/files/FILE_2CFE00.s b/arm9/files/FILE_2CFE00.s
index 513e7dea..513e7dea 100644
--- a/files/FILE_2CFE00.s
+++ b/arm9/files/FILE_2CFE00.s
diff --git a/files/FILE_2D5C00.s b/arm9/files/FILE_2D5C00.s
index adc46cc2..adc46cc2 100644
--- a/files/FILE_2D5C00.s
+++ b/arm9/files/FILE_2D5C00.s
diff --git a/files/FILE_2D7C00.s b/arm9/files/FILE_2D7C00.s
index 4fc876ea..4fc876ea 100644
--- a/files/FILE_2D7C00.s
+++ b/arm9/files/FILE_2D7C00.s
diff --git a/files/FILE_2D9800.s b/arm9/files/FILE_2D9800.s
index 772b6549..772b6549 100644
--- a/files/FILE_2D9800.s
+++ b/arm9/files/FILE_2D9800.s
diff --git a/files/FILE_2D9E00.s b/arm9/files/FILE_2D9E00.s
index 934f9168..934f9168 100644
--- a/files/FILE_2D9E00.s
+++ b/arm9/files/FILE_2D9E00.s
diff --git a/files/FILE_2DF200.s b/arm9/files/FILE_2DF200.s
index b5761253..b5761253 100644
--- a/files/FILE_2DF200.s
+++ b/arm9/files/FILE_2DF200.s
diff --git a/files/FILE_2E9A00.s b/arm9/files/FILE_2E9A00.s
index 8b6338f7..8b6338f7 100644
--- a/files/FILE_2E9A00.s
+++ b/arm9/files/FILE_2E9A00.s
diff --git a/files/FILE_2EF000.s b/arm9/files/FILE_2EF000.s
index b8304264..b8304264 100644
--- a/files/FILE_2EF000.s
+++ b/arm9/files/FILE_2EF000.s
diff --git a/files/FILE_2F1600.s b/arm9/files/FILE_2F1600.s
index 643b88fc..643b88fc 100644
--- a/files/FILE_2F1600.s
+++ b/arm9/files/FILE_2F1600.s
diff --git a/files/FILE_2FFA00.s b/arm9/files/FILE_2FFA00.s
index 8fb7cb9c..8fb7cb9c 100644
--- a/files/FILE_2FFA00.s
+++ b/arm9/files/FILE_2FFA00.s
diff --git a/files/FILE_303400.s b/arm9/files/FILE_303400.s
index a180411b..a180411b 100644
--- a/files/FILE_303400.s
+++ b/arm9/files/FILE_303400.s
diff --git a/files/FILE_30C600.s b/arm9/files/FILE_30C600.s
index 72531ed0..72531ed0 100644
--- a/files/FILE_30C600.s
+++ b/arm9/files/FILE_30C600.s
diff --git a/pokediamond.lcf b/pokediamond.lcf
index 01161a05..362e8e6c 100644
--- a/pokediamond.lcf
+++ b/pokediamond.lcf
@@ -6,93 +6,6 @@ MEMORY {
     filenametable (RWX) : ORIGIN=0, LENGTH=0
     fileallocationtable (RWX) : ORIGIN=0, LENGTH=0
     icon_title (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_10C400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_10C600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_10C800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_10CA00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_10CC00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_145400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_16B600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_184400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_187800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_1A3000 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_1AD200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_1AD400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_1DFE00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_1F9200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_227E00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_237400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_23BC00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_264200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_26B200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_283000 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_283200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_285600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_285C00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_286C00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_288600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_289000 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_289600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_289E00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28AA00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28C200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28CC00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28D200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28D800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28DE00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28E200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28E800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_28F200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_290000 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_290600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_291200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_292000 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_292E00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_294000 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_294A00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_295400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_295A00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_296400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_296800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_297600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_298000 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_298600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_298A00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_299A00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_299E00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_29C400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_29E800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2A1A00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2A6200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2A8800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2A9E00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2ACC00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2ADA00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2AEC00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2B2A00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2B7600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2B9400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2BC400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2BEC00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2C1200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2C2800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2C4C00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2C5C00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2C9C00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2C9E00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2CEA00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2CFE00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2D5C00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2D7C00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2D9800 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2D9E00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2DF200 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2E9A00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2EF000 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2F1600 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_2FFA00 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_303400 (RWX) : ORIGIN=0, LENGTH=0
-    rom3.FILE_30C600 (RWX) : ORIGIN=0, LENGTH=0
     narc.FILE_339000 (RWX) : ORIGIN=0, LENGTH=0
     narc.FILE_339200 (RWX) : ORIGIN=0, LENGTH=0
     narc.FILE_339C00 (RWX) : ORIGIN=0, LENGTH=0
@@ -377,268 +290,6 @@ SECTIONS {
         INCLUDE arm9.bin
 	} > arm9
 
-	.FILE_10C400 : AT (0x10C400) {
-        FILE_10C400.o (.text) /* 0x10C400 */
-	} > rom3.FILE_10C400
-	.FILE_10C600 : AT (0x10C600) {
-        FILE_10C600.o (.text) /* 0x10C600 */
-	} > rom3.FILE_10C600
-	.FILE_10C800 : AT (0x10C800) {
-        FILE_10C800.o (.text) /* 0x10C800 */
-	} > rom3.FILE_10C800
-	.FILE_10CA00 : AT (0x10CA00) {
-        FILE_10CA00.o (.text) /* 0x10CA00 */
-	} > rom3.FILE_10CA00
-	.FILE_10CC00 : AT (0x10CC00) {
-        FILE_10CC00.o (.text) /* 0x10CC00 */
-	} > rom3.FILE_10CC00
-	.FILE_145400 : AT (0x145400) {
-        FILE_145400.o (.text) /* 0x145400 */
-	} > rom3.FILE_145400
-	.FILE_16B600 : AT (0x16B600) {
-        FILE_16B600.o (.text) /* 0x16B600 */
-	} > rom3.FILE_16B600
-	.FILE_184400 : AT (0x184400) {
-        FILE_184400.o (.text) /* 0x184400 */
-	} > rom3.FILE_184400
-	.FILE_187800 : AT (0x187800) {
-        FILE_187800.o (.text) /* 0x187800 */
-	} > rom3.FILE_187800
-	.FILE_1A3000 : AT (0x1A3000) {
-        FILE_1A3000.o (.text) /* 0x1A3000 */
-	} > rom3.FILE_1A3000
-	.FILE_1AD200 : AT (0x1AD200) {
-        FILE_1AD200.o (.text) /* 0x1AD200 */
-	} > rom3.FILE_1AD200
-	.FILE_1AD400 : AT (0x1AD400) {
-        FILE_1AD400.o (.text) /* 0x1AD400 */
-	} > rom3.FILE_1AD400
-	.FILE_1DFE00 : AT (0x1DFE00) {
-        FILE_1DFE00.o (.text) /* 0x1DFE00 */
-	} > rom3.FILE_1DFE00
-	.FILE_1F9200 : AT (0x1F9200) {
-        FILE_1F9200.o (.text) /* 0x1F9200 */
-	} > rom3.FILE_1F9200
-	.FILE_227E00 : AT (0x227E00) {
-        FILE_227E00.o (.text) /* 0x227E00 */
-	} > rom3.FILE_227E00
-	.FILE_237400 : AT (0x237400) {
-        FILE_237400.o (.text) /* 0x237400 */
-	} > rom3.FILE_237400
-	.FILE_23BC00 : AT (0x23BC00) {
-        FILE_23BC00.o (.text) /* 0x23BC00 */
-	} > rom3.FILE_23BC00
-	.FILE_264200 : AT (0x264200) {
-        FILE_264200.o (.text) /* 0x264200 */
-	} > rom3.FILE_264200
-	.FILE_26B200 : AT (0x26B200) {
-        FILE_26B200.o (.text) /* 0x26B200 */
-	} > rom3.FILE_26B200
-	.FILE_283000 : AT (0x283000) {
-        FILE_283000.o (.text) /* 0x283000 */
-	} > rom3.FILE_283000
-	.FILE_283200 : AT (0x283200) {
-        FILE_283200.o (.text) /* 0x283200 */
-	} > rom3.FILE_283200
-	.FILE_285600 : AT (0x285600) {
-        FILE_285600.o (.text) /* 0x285600 */
-	} > rom3.FILE_285600
-	.FILE_285C00 : AT (0x285C00) {
-        FILE_285C00.o (.text) /* 0x285C00 */
-	} > rom3.FILE_285C00
-	.FILE_286C00 : AT (0x286C00) {
-        FILE_286C00.o (.text) /* 0x286C00 */
-	} > rom3.FILE_286C00
-	.FILE_288600 : AT (0x288600) {
-        FILE_288600.o (.text) /* 0x288600 */
-	} > rom3.FILE_288600
-	.FILE_289000 : AT (0x289000) {
-        FILE_289000.o (.text) /* 0x289000 */
-	} > rom3.FILE_289000
-	.FILE_289600 : AT (0x289600) {
-        FILE_289600.o (.text) /* 0x289600 */
-	} > rom3.FILE_289600
-	.FILE_289E00 : AT (0x289E00) {
-        FILE_289E00.o (.text) /* 0x289E00 */
-	} > rom3.FILE_289E00
-	.FILE_28AA00 : AT (0x28AA00) {
-        FILE_28AA00.o (.text) /* 0x28AA00 */
-	} > rom3.FILE_28AA00
-	.FILE_28C200 : AT (0x28C200) {
-        FILE_28C200.o (.text) /* 0x28C200 */
-	} > rom3.FILE_28C200
-	.FILE_28CC00 : AT (0x28CC00) {
-        FILE_28CC00.o (.text) /* 0x28CC00 */
-	} > rom3.FILE_28CC00
-	.FILE_28D200 : AT (0x28D200) {
-        FILE_28D200.o (.text) /* 0x28D200 */
-	} > rom3.FILE_28D200
-	.FILE_28D800 : AT (0x28D800) {
-        FILE_28D800.o (.text) /* 0x28D800 */
-	} > rom3.FILE_28D800
-	.FILE_28DE00 : AT (0x28DE00) {
-        FILE_28DE00.o (.text) /* 0x28DE00 */
-	} > rom3.FILE_28DE00
-	.FILE_28E200 : AT (0x28E200) {
-        FILE_28E200.o (.text) /* 0x28E200 */
-	} > rom3.FILE_28E200
-	.FILE_28E800 : AT (0x28E800) {
-        FILE_28E800.o (.text) /* 0x28E800 */
-	} > rom3.FILE_28E800
-	.FILE_28F200 : AT (0x28F200) {
-        FILE_28F200.o (.text) /* 0x28F200 */
-	} > rom3.FILE_28F200
-	.FILE_290000 : AT (0x290000) {
-        FILE_290000.o (.text) /* 0x290000 */
-	} > rom3.FILE_290000
-	.FILE_290600 : AT (0x290600) {
-        FILE_290600.o (.text) /* 0x290600 */
-	} > rom3.FILE_290600
-	.FILE_291200 : AT (0x291200) {
-        FILE_291200.o (.text) /* 0x291200 */
-	} > rom3.FILE_291200
-	.FILE_292000 : AT (0x292000) {
-        FILE_292000.o (.text) /* 0x292000 */
-	} > rom3.FILE_292000
-	.FILE_292E00 : AT (0x292E00) {
-        FILE_292E00.o (.text) /* 0x292E00 */
-	} > rom3.FILE_292E00
-	.FILE_294000 : AT (0x294000) {
-        FILE_294000.o (.text) /* 0x294000 */
-	} > rom3.FILE_294000
-	.FILE_294A00 : AT (0x294A00) {
-        FILE_294A00.o (.text) /* 0x294A00 */
-	} > rom3.FILE_294A00
-	.FILE_295400 : AT (0x295400) {
-        FILE_295400.o (.text) /* 0x295400 */
-	} > rom3.FILE_295400
-	.FILE_295A00 : AT (0x295A00) {
-        FILE_295A00.o (.text) /* 0x295A00 */
-	} > rom3.FILE_295A00
-	.FILE_296400 : AT (0x296400) {
-        FILE_296400.o (.text) /* 0x296400 */
-	} > rom3.FILE_296400
-	.FILE_296800 : AT (0x296800) {
-        FILE_296800.o (.text) /* 0x296800 */
-	} > rom3.FILE_296800
-	.FILE_297600 : AT (0x297600) {
-        FILE_297600.o (.text) /* 0x297600 */
-	} > rom3.FILE_297600
-	.FILE_298000 : AT (0x298000) {
-        FILE_298000.o (.text) /* 0x298000 */
-	} > rom3.FILE_298000
-	.FILE_298600 : AT (0x298600) {
-        FILE_298600.o (.text) /* 0x298600 */
-	} > rom3.FILE_298600
-	.FILE_298A00 : AT (0x298A00) {
-        FILE_298A00.o (.text) /* 0x298A00 */
-	} > rom3.FILE_298A00
-	.FILE_299A00 : AT (0x299A00) {
-        FILE_299A00.o (.text) /* 0x299A00 */
-	} > rom3.FILE_299A00
-	.FILE_299E00 : AT (0x299E00) {
-        FILE_299E00.o (.text) /* 0x299E00 */
-	} > rom3.FILE_299E00
-	.FILE_29C400 : AT (0x29C400) {
-        FILE_29C400.o (.text) /* 0x29C400 */
-	} > rom3.FILE_29C400
-	.FILE_29E800 : AT (0x29E800) {
-        FILE_29E800.o (.text) /* 0x29E800 */
-	} > rom3.FILE_29E800
-	.FILE_2A1A00 : AT (0x2A1A00) {
-        FILE_2A1A00.o (.text) /* 0x2A1A00 */
-	} > rom3.FILE_2A1A00
-	.FILE_2A6200 : AT (0x2A6200) {
-        FILE_2A6200.o (.text) /* 0x2A6200 */
-	} > rom3.FILE_2A6200
-	.FILE_2A8800 : AT (0x2A8800) {
-        FILE_2A8800.o (.text) /* 0x2A8800 */
-	} > rom3.FILE_2A8800
-	.FILE_2A9E00 : AT (0x2A9E00) {
-        FILE_2A9E00.o (.text) /* 0x2A9E00 */
-	} > rom3.FILE_2A9E00
-	.FILE_2ACC00 : AT (0x2ACC00) {
-        FILE_2ACC00.o (.text) /* 0x2ACC00 */
-	} > rom3.FILE_2ACC00
-	.FILE_2ADA00 : AT (0x2ADA00) {
-        FILE_2ADA00.o (.text) /* 0x2ADA00 */
-	} > rom3.FILE_2ADA00
-	.FILE_2AEC00 : AT (0x2AEC00) {
-        FILE_2AEC00.o (.text) /* 0x2AEC00 */
-	} > rom3.FILE_2AEC00
-	.FILE_2B2A00 : AT (0x2B2A00) {
-        FILE_2B2A00.o (.text) /* 0x2B2A00 */
-	} > rom3.FILE_2B2A00
-	.FILE_2B7600 : AT (0x2B7600) {
-        FILE_2B7600.o (.text) /* 0x2B7600 */
-	} > rom3.FILE_2B7600
-	.FILE_2B9400 : AT (0x2B9400) {
-        FILE_2B9400.o (.text) /* 0x2B9400 */
-	} > rom3.FILE_2B9400
-	.FILE_2BC400 : AT (0x2BC400) {
-        FILE_2BC400.o (.text) /* 0x2BC400 */
-	} > rom3.FILE_2BC400
-	.FILE_2BEC00 : AT (0x2BEC00) {
-        FILE_2BEC00.o (.text) /* 0x2BEC00 */
-	} > rom3.FILE_2BEC00
-	.FILE_2C1200 : AT (0x2C1200) {
-        FILE_2C1200.o (.text) /* 0x2C1200 */
-	} > rom3.FILE_2C1200
-	.FILE_2C2800 : AT (0x2C2800) {
-        FILE_2C2800.o (.text) /* 0x2C2800 */
-	} > rom3.FILE_2C2800
-	.FILE_2C4C00 : AT (0x2C4C00) {
-        FILE_2C4C00.o (.text) /* 0x2C4C00 */
-	} > rom3.FILE_2C4C00
-	.FILE_2C5C00 : AT (0x2C5C00) {
-        FILE_2C5C00.o (.text) /* 0x2C5C00 */
-	} > rom3.FILE_2C5C00
-	.FILE_2C9C00 : AT (0x2C9C00) {
-        FILE_2C9C00.o (.text) /* 0x2C9C00 */
-	} > rom3.FILE_2C9C00
-	.FILE_2C9E00 : AT (0x2C9E00) {
-        FILE_2C9E00.o (.text) /* 0x2C9E00 */
-	} > rom3.FILE_2C9E00
-	.FILE_2CEA00 : AT (0x2CEA00) {
-        FILE_2CEA00.o (.text) /* 0x2CEA00 */
-	} > rom3.FILE_2CEA00
-	.FILE_2CFE00 : AT (0x2CFE00) {
-        FILE_2CFE00.o (.text) /* 0x2CFE00 */
-	} > rom3.FILE_2CFE00
-	.FILE_2D5C00 : AT (0x2D5C00) {
-        FILE_2D5C00.o (.text) /* 0x2D5C00 */
-	} > rom3.FILE_2D5C00
-	.FILE_2D7C00 : AT (0x2D7C00) {
-        FILE_2D7C00.o (.text) /* 0x2D7C00 */
-	} > rom3.FILE_2D7C00
-	.FILE_2D9800 : AT (0x2D9800) {
-        FILE_2D9800.o (.text) /* 0x2D9800 */
-	} > rom3.FILE_2D9800
-	.FILE_2D9E00 : AT (0x2D9E00) {
-        FILE_2D9E00.o (.text) /* 0x2D9E00 */
-	} > rom3.FILE_2D9E00
-	.FILE_2DF200 : AT (0x2DF200) {
-        FILE_2DF200.o (.text) /* 0x2DF200 */
-	} > rom3.FILE_2DF200
-	.FILE_2E9A00 : AT (0x2E9A00) {
-        FILE_2E9A00.o (.text) /* 0x2E9A00 */
-	} > rom3.FILE_2E9A00
-	.FILE_2EF000 : AT (0x2EF000) {
-        FILE_2EF000.o (.text) /* 0x2EF000 */
-	} > rom3.FILE_2EF000
-	.FILE_2F1600 : AT (0x2F1600) {
-        FILE_2F1600.o (.text) /* 0x2F1600 */
-	} > rom3.FILE_2F1600
-	.FILE_2FFA00 : AT (0x2FFA00) {
-        FILE_2FFA00.o (.text) /* 0x2FFA00 */
-	} > rom3.FILE_2FFA00
-	.FILE_303400 : AT (0x303400) {
-        FILE_303400.o (.text) /* 0x303400 */
-	} > rom3.FILE_303400
-	.FILE_30C600 : AT (0x30C600) {
-        FILE_30C600.o (.text) /* 0x30C600 */
-	} > rom3.FILE_30C600
-
     .arm7 : AT(0x30D000) {
 		ARM7AutoLoad = 0x02380158;
         INCLUDE arm7.bin