Update arm9.lsf

5 files changed, 648 insertions, 528 deletions

diff --git a/arm9/Makefile b/arm9/Makefile
index c16709df..c25c0026 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -282,8 +282,8 @@ $(CXX_OBJS): $(BUILD_DIR)/%.o: %.cpp $$(dep)
 $(S_OBJS) $(LIBS_OBJS): $(BUILD_DIR)/%.o: %.s $$(dep)
 	$(AS) $(ASFLAGS) -o $@ $<
 
-# $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(LD_TEMPLATE)
-# 	$(MAKELCF) $(MAKELCF_FLAGS) $^ $@
+#$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(LD_TEMPLATE)
+#	$(MAKELCF) $(MAKELCF_FLAGS) $^ $@
 
 $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)
 	$(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $<
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index c8e9988c..b8dc26b3 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -100,7 +100,6 @@ MEMORY {
 	MODULE_84 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0   >  MODULE_84.sbin
 	MODULE_85 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0   >  MODULE_85.sbin
 	MODULE_86 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0   >  MODULE_86.sbin
-
 	dummy.MAIN_EX		(RW)  : ORIGIN = 0x023e0000, LENGTH = 0x0
 	arena.MAIN			(RW)  : ORIGIN = AFTER(arm9,MODULE_00,MODULE_01,MODULE_02,MODULE_04,MODULE_05,MODULE_06,MODULE_07,MODULE_08,MODULE_09,MODULE_10,MODULE_11,MODULE_12,MODULE_13,MODULE_14,MODULE_15,MODULE_16,MODULE_17,MODULE_18,MODULE_19,MODULE_20,MODULE_21,MODULE_22,MODULE_23,MODULE_24,MODULE_25,MODULE_26,MODULE_27,MODULE_28,MODULE_29,MODULE_30,MODULE_31,MODULE_32,MODULE_33,MODULE_34,MODULE_35,MODULE_36,MODULE_37,MODULE_38,MODULE_39,MODULE_40,MODULE_41,MODULE_42,MODULE_43,MODULE_44,MODULE_45,MODULE_46,MODULE_47,MODULE_48,MODULE_49,MODULE_50,MODULE_51,MODULE_52,MODULE_53,MODULE_54,MODULE_55,MODULE_56,MODULE_57,MODULE_58,MODULE_59,MODULE_60,MODULE_61,MODULE_62,MODULE_63,MODULE_64,MODULE_65,MODULE_66,MODULE_67,MODULE_68,MODULE_69,MODULE_70,MODULE_71,MODULE_72,MODULE_73,MODULE_74,MODULE_75,MODULE_76,MODULE_77,MODULE_78,MODULE_79,MODULE_80,MODULE_81,MODULE_82,MODULE_83,MODULE_84,MODULE_85,MODULE_86), LENGTH = 0x0
 	arena.MAIN_EX		(RW)  : ORIGIN = AFTER(dummy.MAIN_EX), LENGTH = 0x0
@@ -578,12 +577,12 @@ SECTIONS {
 		/* C standard library */
 		libc.o (.text)
 		/* MWCC library */
-		libmwcc.o (.text)
+		stdlibmwcc.o (.text)
 
 		. = ALIGN(4);
 		/* Exception */
 		libc.o (.exception)
-		libmwcc.o (.exception)
+		stdlibmwcc.o (.exception)
 
 		. = ALIGN(4);
 	SDK_STATIC_ETABLE_START = .;
@@ -763,7 +762,7 @@ SECTIONS {
 		FS_overlay.o (.rodata)
 		CTRDG_backup.o (.rodata)
 		libc.o (.rodata)
-		libmwcc.o (.rodata)
+		stdlibmwcc.o (.rodata)
 		. = ALIGN(4);
 
 		SDK_STATIC_SINIT_START = .;
@@ -955,7 +954,7 @@ SECTIONS {
 		CTRDG_backup.o (.bss)
 		CTRDG_task.o (.bss)
 		libc.o (.bss)
-		libmwcc.o (.bss)
+		stdlibmwcc.o (.bss)
 		. = ALIGN(32);
 		SDK_STATIC_BSS_END = .;
 		SDK_STATIC_BSS_SIZE = SDK_STATIC_BSS_END - SDK_STATIC_BSS_START;
@@ -1002,7 +1001,7 @@ SECTIONS {
 	{
 		. = ALIGN(32);
 		SDK_AUTOLOAD.DTCM.BSS_START = .;
-		OS_irqHandler.o (.dtcm.bss)
+		OS_irqHandler.o (.bss)
 		. = ALIGN(32);
 		SDK_AUTOLOAD.DTCM.BSS_END = .;
 		SDK_AUTOLOAD.DTCM.BSS_SIZE = SDK_AUTOLOAD.DTCM.BSS_END - SDK_AUTOLOAD.DTCM.BSS_START;
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index 77986205..7597b782 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -1,445 +1,482 @@
+### Linker spec file for Pokemon Diamond/Pearl US ###
+###   Pass this to the SDK's makelcf.exe utility  ###
+###        along with the ARM9-TS template.       ###
 
 Static arm9
 {
 	Address 0x02000000
 	Object main.o
-    Object GFLIB_sysctl.o
-    Object unk_020010A8.o
-    Object unk_02001B80.o
-    Object string_util.o
-    Object unk_020023C0.o
-    Object unk_02002C14.o
-    Object unk_02002F08.o
-    Object unk_020030E8.o
-    Object unk_02003B98.o
-    Object unk_020040F4.o
-    Object unk_020051F4.o
-    Object unk_02005CFC.o
-    Object poke_overlay.o
-    Object unk_020061E8.o
-    Object unk_02006234.o
-    Object filesystem.o
-    Object unk_02006864.o
-    Object unk_02006D98.o
-    Object unk_02008AA4.o
-    Object unk_02008DEC.o
-    Object unk_02009EAC.o
-    Object unk_0200A384.o
-    Object unk_0200AA80.o
-    Object unk_0200BA78.o
-    Object unk_0200BB14.o
-    Object unk_0200CA44.o
-    Object unk_0200CABC.o
-    Object unk_0200E1D0.o
-    Object unk_0200E850.o
-    Object unk_0201137C.o
-    Object unk_02011744.o
-    Object unk_02012CC8.o
-    Object unk_02013724.o
-    Object unk_020139D8.o
-    Object unk_02013CD4.o
-    Object unk_020142EC.o
-    Object unk_020144FC.o
-    Object unk_02014590.o
-    Object unk_02014BF4.o
-    Object unk_02015CC0.o
-    Object unk_02015D14.o
-    Object unk_02015E30.o
-    Object unk_02015EA0.o
-    Object unk_020166C8.o
-    Object unk_02016B94.o
-    Object unk_0201B1A8.o
-    Object unk_0201B4E8.o
-    Object unk_0201B6D0.o
-    Object unk_0201B8B8.o
-    Object math_util.o
-    Object unk_0201BCBC.o
-    Object unk_0201C24C.o
-    Object unk_0201C360.o
-    Object unk_0201C620.o
-    Object unk_0201C6B4.o
-    Object unk_0201C7A0.o
-    Object unk_0201CBEC.o
-    Object unk_0201CC08.o
-    Object unk_0201D040.o
-    Object unk_0201E00C.o
-    Object unk_0201E66C.o
-    Object unk_0201E7D8.o
-    Object unk_0201F06C.o
-    Object unk_020208B8.o
-    Object unk_02020AFC.o
-    Object error_handling.o
-    Object unk_02020C44.o
-    Object unk_0202134C.o
-    Object unk_02021590.o
-    Object unk_02021934.o
-    Object unk_02021FF8.o
-    Object unk_02022244.o
-    Object unk_02022294.o
-    Object unk_020222E8.o
-    Object unk_02022318.o
-    Object unk_02022450.o
-    Object unk_02022504.o
-    Object save.o
-    Object unk_0202376C.o
-    Object unk_020238C4.o
-    Object unk_02023AC4.o
-    Object unk_02023C40.o
-    Object unk_02024E64.o
-    Object unk_02024F30.o
-    Object unk_020250A4.o
-    Object unk_02025484.o
-    Object unk_020254B8.o
-    Object unk_02025658.o
-    Object unk_02025954.o
-    Object unk_02026CD0.o
-    Object unk_02027E30.o
-    Object unk_020281E0.o
-    Object unk_020286F8.o
-    Object unk_02028910.o
-    Object unk_02028980.o
-    Object unk_02029A84.o
-    Object unk_02029AE0.o
-    Object unk_02029C58.o
-    Object unk_02029CEC.o
-    Object unk_02029E48.o
-    Object unk_02029EC4.o
-    Object unk_02029FB0.o
-    Object unk_0202A1E0.o
-    Object unk_0202A8F4.o
-    Object unk_0202A924.o
-    Object unk_0202ABBC.o
-    Object unk_0202AC20.o
-    Object unk_0202B034.o
-    Object unk_0202B374.o
-    Object unk_0202B870.o
-    Object unk_0202BE98.o
-    Object unk_0202C0E0.o
-    Object unk_0202C144.o
-    Object unk_0202C198.o
-    Object unk_0202D394.o
-    Object unk_0202D4C4.o
-    Object unk_0202D858.o
-    Object unk_0202D8D0.o
-    Object unk_0202DB14.o
-    Object unk_0202E29C.o
-    Object unk_0202F150.o
-    Object unk_02031480.o
-    Object unk_02031734.o
-    Object unk_020336C0.o
-    Object unk_02033778.o
-    Object unk_020337E8.o
-    Object unk_02033874.o
-    Object unk_02033B68.o
-    Object unk_02033F50.o
-    Object unk_02034188.o
-    Object unk_020343A8.o
-    Object unk_02034710.o
-    Object unk_02034A28.o
-    Object unk_02034D7C.o
-    Object unk_02034E84.o
-    Object unk_02034FE4.o
-    Object unk_02035068.o
-    Object unk_02036FA4.o
-    Object unk_02037024.o
-    Object unk_020372D4.o
-    Object unk_020377B0.o
-    Object unk_020377F0.o
-    Object script.o
-    Object unk_02038C78.o
-    Object scrcmd.o
-    Object scrcmd_2.o
-    Object scrcmd_3.o
-    Object scrcmd_4.o
-    Object scrcmd_5.o
-    Object scrcmd_6.o
-    Object scrcmd_7.o
-    Object scrcmd_8.o
-    Object scrcmd_9.o
-    Object scrcmd_10.o
-    Object scrcmd_11.o
-    Object scrcmd_12.o
-    Object scrcmd_13.o
-    Object scrcmd_14.o
-    Object scrcmd_15.o
-    Object scrcmd_16.o
-    Object scrcmd_17.o
-    Object scrcmd_18.o
-    Object scrcmd_19.o
-    Object scrcmd_20.o
-    Object scrcmd_21.o
-    Object scrcmd_22.o
-    Object scrcmd_23.o
-    Object scrcmd_24.o
-    Object scrcmd_25.o
-    Object unk_02046030.o
-    Object unk_02046294.o
-    Object unk_0204639C.o
-    Object unk_0204653C.o
-    Object unk_02047500.o
-    Object unk_020476CC.o
-    Object unk_02048120.o
-    Object unk_020484A8.o
-    Object unk_02048904.o
-    Object unk_0204A01C.o
-    Object unk_0204A368.o
-    Object unk_0204A498.o
-    Object unk_0204AB0C.o
-    Object unk_0204ADE0.o
-    Object unk_0204AEA8.o
-    Object unk_0204AF24.o
-    Object unk_0204B0A0.o
-    Object unk_0204B34C.o
-    Object unk_0204B9EC.o
-    Object unk_0204BE14.o
-    Object unk_0204C1B4.o
-    Object unk_0204CA80.o
-    Object unk_0204CB20.o
-    Object unk_0204FBA8.o
-    Object unk_02050E48.o
-    Object unk_020520AC.o
-    Object unk_02052EE8.o
-    Object unk_0205363C.o
-    Object unk_02053750.o
-    Object unk_02054590.o
-    Object unk_0205478C.o
-    Object unk_02054C14.o
-    Object unk_02055068.o
-    Object unk_020557F4.o
-    Object unk_02057380.o
-    Object unk_02058EE8.o
-    Object unk_02059F04.o
-    Object unk_0205AD98.o
-    Object unk_0205BEF8.o
-    Object unk_0205C334.o
-    Object unk_0205C598.o
-    Object unk_0205CDB4.o
-    Object unk_0205CE48.o
-    Object unk_0205DD18.o
-    Object unk_0205E4EC.o
-    Object unk_0205EB38.o
-    Object unk_0205EC84.o
-    Object unk_0205F314.o
-    Object unk_0205F7A0.o
-    Object unk_0205FA2C.o
-    Object unk_0206015C.o
-    Object unk_02060344.o
-    Object unk_020603B0.o
-    Object unk_020606B0.o
-    Object unk_020607D4.o
-    Object unk_02060CCC.o
-    Object unk_020625EC.o
-    Object unk_0206367C.o
-    Object unk_02063888.o
-    Object unk_02063948.o
-    Object unk_0206439C.o
-    Object unk_020643C0.o
-    Object unk_020647A4.o
-    Object unk_02064CA8.o
-    Object unk_02064E20.o
-    Object unk_02064E4C.o
-    Object unk_02064E90.o
-    Object unk_020653EC.o
-    Object unk_02066840.o
-    Object unk_02066978.o
-    Object waza.o
-    Object unk_0206ABC4.o
-    Object unk_0206B16C.o
-    Object unk_0206B688.o
-    Object party.o
-    Object unk_0206BB28.o
-    Object unk_0206BB5C.o
-    Object unk_0206BF90.o
-    Object unk_0206C700.o
-    Object unk_0206DE24.o
-    Object unk_0206E0F0.o
-    Object unk_0206E2F0.o
-    Object unk_0206E5B4.o
-    Object unk_0206EB80.o
-    Object unk_0206F1F0.o
-    Object unk_0206F3FC.o
-    Object unk_02072548.o
-    Object unk_02073710.o
-    Object unk_02073DA8.o
-    Object unk_0207550C.o
-    Object unk_020772F0.o
-    Object unk_020799E8.o
-    Object unk_02079C70.o
-    Object unk_0207C328.o
-    Object unk_0207D5BC.o
-    Object unk_0207EF6C.o
-    Object unk_0207F95C.o
-    Object unk_0207FC5C.o
-    Object unk_0207FD00.o
-    Object unk_02080C38.o
-    Object unk_020828BC.o
-    Object unk_020834D0.o
-    Object unk_02083B84.o
-    Object unk_02083D48.o
-    Object unk_02084098.o
-    Object unk_020842D0.o
-    Object unk_020842DC.o
-    Object unk_020851B8.o
-    Object unk_02085258.o
-    Object unk_02085338.o
-    Object unk_020854E0.o
-    Object unk_020859C0.o
-    Object unk_02086084.o
-    Object unk_02086414.o
-    Object unk_02086FA8.o
-    Object unk_02087A1C.o
-    Object unk_02087A6C.o
-    Object unk_02087D00.o
-    Object unk_02088320.o
-    Object unk_02088814.o
-    Object unk_02088858.o
-    Object unk_0208890C.o
-    Object unk_0208898C.o
-    Object unk_02088AAC.o
-    Object unk_02088D1C.o
-    Object unk_02088DD8.o
-    Object unk_02088F0C.o
-    Object unk_020893E0.o
-    Object unk_02089498.o
-    Object unk_02089960.o
-    Object unk_02089D90.o
-    Object unk_02089F24.o
-    Object unk_0208A258.o
-    Object unk_0208A300.o
-    Object unk_0208A338.o
-    Object unk_0208A998.o
-    ### Third-party libraries ###
-    Object unk_0208AC14.o
-    Object custom_allocator.o
-    Object unk_020910EC.o
-    Object unk_020AF030.o
-    ### Nitro SDK ###
-    Object FX_mtx22.o
-    Object FX_mtx33.o
-    Object FX_mtx43.o
-    Object FX_mtx44.o
-    Object FX_cp.o
-    Object FX_vec.o
-    Object FX_atan.o
-    Object FX.o
-    Object GX.o
-    Object GX_state.o
-    Object GX_vramcnt.o
-    Object GX_bgcnt.o
-    Object GX_g2.o
-    Object GX_g3b.o
-    Object GX_g3imm.o
-    Object GX_g3x.o
-    Object GX_g3_util.o
-    Object GX_load2d.o
-    Object GX_load3d.o
-    Object GX_g3.o
-    Object GX_asm.o
-    Object OS_irqHandler.o
-    Object OS_irqTable.o
-    Object OS_interrupt.o
-    Object OS_spinLock.o
-    Object OS_printf.o
-    Object OS_thread.o
-    Object OS_context.o
-    Object OS_emulator.o
-    Object OS_message.o
-    Object OS_mutex.o
-    Object OS_cache.o
-    Object OS_init.o
-    Object OS_arena.o
-    Object OS_alloc.o
-    Object OS_tcm.o
-    Object OS_protectionUnit.o
-    Object OS_protectionRegion.o
-    Object OS_exception.o
-    Object OS_timer.o
-    Object OS_tick.o
-    Object OS_alarm.o
-    Object OS_valarm.o
-    Object OS_system.o
-    Object OS_reset.o
-    Object OS_ownerInfo.o
-    Object OS_vramExclusive.o
-    Object OS_entropy.o
-    Object OS_terminate_proc.o
-    Object MI_wram.o
-    Object MI_dma.o
-    Object MI_dma_hblank.o
-    Object MI_dma_gxcommand.o
-    Object MI_memory.o
-    Object MI_swap.o
-    Object MI_uncompress.o
-    Object MI_dma_card.o
-    Object MI_init.o
-    Object SND_interface.o
-    Object SND_main.o
-    Object SND_command.o
-    Object SND_alarm.o
-    Object SND_work.o
-    Object SND_util.o
-    Object SND_bank.o
-    Object PXI_init.o
-    Object PXI_fifo.o
-    Object FS_command.o
-    Object FS_command_default.o
-    Object FS_archive.o
-    Object FS_file.o
-    Object FS_rom.o
-    Object FS_overlay.o
-    Object DGT_hash1.o
-    Object DGT_hash2.o
-    Object DGT_sha1s_arm4cw.o
-    Object CP_context.o
-    Object SPI_tp.o
-    Object SPI_mic.o
-    Object SPI_pm.o
-    Object RTC_external.o
-    Object RTC_internal.o
-    Object RTC_convert.o
-    Object CARD_common.o
-    Object CARD_spi.o
-    Object CARD_backup.o
-    Object CARD_rom.o
-    Object CARD_request.o
-    Object CARD_pullOut.o
-    Object WM_system.o
-    Object WM_sync.o
-    Object WM_standard.o
-    Object WM_mp.o
-    Object WM_dcf.o
-    Object WM_ds.o
-    Object WM_ks.o
-    Object WM_etc.o
-    Object CTRDG.o
-    Object CTRDG_proc.o
-    Object CTRDG_backup.o
-    Object CTRDG_flash_common.o
-    Object CTRDG_flash_AT29LV512.o
-    Object CTRDG_flash_LE39FW512.o
-    Object CTRDG_flash_MX29L010.o
-    Object CTRDG_flash_MX29L512.o
-    Object CTRDG_task.o
-    Object MATH.o
-    Object MATH_dgt.o
-    Object MATH_crc.o
-    Object STD_string.o
-    ### C standard library ###
-    Object libc.o
-    ### MWCC library ###
-    Object libmwcc.o
+	Object unk_020010A8.o
+	Object unk_02001B80.o
+	Object string_util.o
+	Object unk_020023C0.o
+	Object unk_02002C14.o
+	Object unk_02002F08.o
+	Object unk_020030E8.o
+	Object sound.o
+	Object unk_020040F4.o
+	Object unk_020051F4.o
+	Object unk_02005CFC.o
+	Object poke_overlay.o
+	Object unk_020061E8.o
+	Object unk_02006234.o
+	Object filesystem.o
+	Object unk_02006864.o
+	Object unk_02006D98.o
+	Object unk_02008AA4.o
+	Object unk_02008DEC.o
+	Object unk_02009EAC.o
+	Object msgdata.o
+	Object unk_0200AA80.o
+	Object unk_0200BA78.o
+	Object unk_0200BB14.o
+	Object unk_0200CA44.o
+	Object unk_0200CABC.o
+	Object unk_0200E1D0.o
+	Object unk_0200E850.o
+	Object unk_0201137C.o
+	Object unk_02011744.o
+	Object unk_02012CC8.o
+	Object unk_02013724.o
+	Object unk_020139D8.o
+	Object unk_02013CD4.o
+	Object unk_020142EC.o
+	Object unk_020144FC.o
+	Object unk_02014590.o
+	Object unk_02014BF4.o
+	Object unk_02015CC0.o
+	Object unk_02015D14.o
+	Object unk_02015E30.o
+	Object unk_02015EA0.o
+	Object unk_020166C8.o
+	Object unk_02016B94.o
+	Object unk_0201B1A8.o
+	Object unk_0201B4E8.o
+	Object unk_0201B6D0.o
+	Object unk_0201B8B8.o
+	Object math_util.o
+	Object unk_0201BCBC.o
+	Object unk_0201C24C.o
+	Object unk_0201C360.o
+	Object unk_0201C620.o
+	Object unk_0201C6B4.o
+	Object unk_0201C7A0.o
+	Object unk_0201CBEC.o
+	Object unk_0201CC08.o
+	Object unk_0201D040.o
+	Object unk_0201E00C.o
+	Object unk_0201E66C.o
+	Object unk_0201E7D8.o
+	Object unk_0201F06C.o
+	Object unk_020208B8.o
+	Object unk_02020AFC.o
+	Object error_handling.o
+	Object unk_02020C44.o
+	Object unk_0202134C.o
+	Object unk_02021590.o
+	Object unk_02021934.o
+	Object unk_02021FF8.o
+	Object unk_02022244.o
+	Object unk_02022294.o
+	Object unk_020222E8.o
+	Object unk_02022318.o
+	Object unk_02022450.o
+	Object unk_02022504.o
+	Object save.o
+	Object unk_0202376C.o
+	Object unk_020238C4.o
+	Object unk_02023AC4.o
+	Object unk_02023C40.o
+	Object unk_02024E64.o
+	Object unk_02024F30.o
+	Object unk_020250A4.o
+	Object unk_02025484.o
+	Object unk_020254B8.o
+	Object unk_02025658.o
+	Object unk_02025954.o
+	Object unk_02026CD0.o
+	Object unk_02027E30.o
+	Object unk_020281E0.o
+	Object unk_020286F8.o
+	Object unk_02028910.o
+	Object unk_02028980.o
+	Object unk_02029A84.o
+	Object unk_02029AE0.o
+	Object unk_02029C58.o
+	Object unk_02029CEC.o
+	Object unk_02029E48.o
+	Object unk_02029EC4.o
+	Object unk_02029FB0.o
+	Object unk_0202A1E0.o
+	Object unk_0202A8F4.o
+	Object unk_0202A924.o
+	Object unk_0202ABBC.o
+	Object unk_0202AC20.o
+	Object unk_0202B034.o
+	Object unk_0202B374.o
+	Object unk_0202B870.o
+	Object unk_0202BE98.o
+	Object unk_0202C0E0.o
+	Object unk_0202C144.o
+	Object unk_0202C198.o
+	Object unk_0202D394.o
+	Object unk_0202D4C4.o
+	Object unk_0202D858.o
+	Object unk_0202D8D0.o
+	Object unk_0202DB14.o
+	Object unk_0202E29C.o
+	Object unk_0202F150.o
+	Object unk_02031480.o
+	Object unk_02031734.o
+	Object unk_020336C0.o
+	Object unk_02033778.o
+	Object unk_020337E8.o
+	Object unk_02033874.o
+	Object unk_02033B68.o
+	Object unk_02033F50.o
+	Object unk_02034188.o
+	Object unk_020343A8.o
+	Object map_header.o
+	Object unk_02034A28.o
+	Object unk_02034D7C.o
+	Object unk_02034E84.o
+	Object unk_02034FE4.o
+	Object unk_02035068.o
+	Object unk_02036FA4.o
+	Object unk_02037024.o
+	Object unk_020372D4.o
+	Object unk_020377B0.o
+	Object unk_020377F0.o
+	Object script.o
+	Object unk_02038C78.o
+	Object scrcmd.o
+	Object scrcmd_2.o
+	Object scrcmd_3.o
+	Object scrcmd_4.o
+	Object scrcmd_5.o
+	Object scrcmd_6.o
+	Object scrcmd_7.o
+	Object scrcmd_8.o
+	Object scrcmd_9.o
+	Object scrcmd_10.o
+	Object scrcmd_11.o
+	Object scrcmd_12.o
+	Object scrcmd_13.o
+	Object scrcmd_14.o
+	Object scrcmd_15.o
+	Object scrcmd_16.o
+	Object scrcmd_17.o
+	Object scrcmd_18.o
+	Object scrcmd_19.o
+	Object scrcmd_20.o
+	Object scrcmd_21.o
+	Object scrcmd_22.o
+	Object scrcmd_23.o
+	Object scrcmd_24.o
+	Object scrcmd_25.o
+	Object unk_02046030.o
+	Object unk_02046294.o
+	Object unk_0204639C.o
+	Object unk_0204653C.o
+	Object unk_02047500.o
+	Object unk_020476CC.o
+	Object unk_02048120.o
+	Object unk_020484A8.o
+	Object unk_02048904.o
+	Object unk_0204A01C.o
+	Object unk_0204A368.o
+	Object unk_0204A498.o
+	Object unk_0204AB0C.o
+	Object unk_0204ADE0.o
+	Object unk_0204AEA8.o
+	Object unk_0204AF24.o
+	Object unk_0204B0A0.o
+	Object unk_0204B34C.o
+	Object unk_0204B9EC.o
+	Object unk_0204BE14.o
+	Object unk_0204C1B4.o
+	Object unk_0204CA80.o
+	Object unk_0204CB20.o
+	Object unk_0204FBA8.o
+	Object unk_02050E48.o
+	Object unk_020520AC.o
+	Object unk_02052EE8.o
+	Object unk_0205363C.o
+	Object unk_02053750.o
+	Object unk_02054590.o
+	Object unk_0205478C.o
+	Object unk_02054C14.o
+	Object unk_02055068.o
+	Object unk_020557F4.o
+	Object unk_02057380.o
+	Object unk_02058EE8.o
+	Object unk_02059F04.o
+	Object unk_0205AD98.o
+	Object unk_0205BEF8.o
+	Object unk_0205C334.o
+	Object unk_0205C598.o
+	Object unk_0205CDB4.o
+	Object unk_0205CE48.o
+	Object unk_0205DD18.o
+	Object unk_0205E4EC.o
+	Object unk_0205EB38.o
+	Object unk_0205EC84.o
+	Object unk_0205F314.o
+	Object unk_0205F7A0.o
+	Object unk_0205FA2C.o
+	Object unk_0206015C.o
+	Object unk_02060344.o
+	Object unk_020603B0.o
+	Object unk_020606B0.o
+	Object unk_020607D4.o
+	Object unk_02060CCC.o
+	Object unk_020625EC.o
+	Object unk_0206367C.o
+	Object unk_02063888.o
+	Object unk_02063948.o
+	Object unk_0206439C.o
+	Object unk_020643C0.o
+	Object unk_020647A4.o
+	Object unk_02064CA8.o
+	Object unk_02064E20.o
+	Object unk_02064E4C.o
+	Object unk_02064E90.o
+	Object unk_020653EC.o
+	Object unk_02066840.o
+	Object pokemon.o
+	Object waza.o
+	Object unk_0206ABC4.o
+	Object unk_0206B16C.o
+	Object unk_0206B688.o
+	Object party.o
+	Object unk_0206BB28.o
+	Object unk_0206BB5C.o
+	Object unk_0206BF90.o
+	Object unk_0206C700.o
+	Object unk_0206DE24.o
+	Object unk_0206E0F0.o
+	Object unk_0206E2F0.o
+	Object itemtool.o
+	Object unk_0206EB80.o
+	Object unk_0206F1F0.o
+	Object unk_0206F3FC.o
+	Object unk_02072548.o
+	Object unk_02073710.o
+	Object unk_02073DA8.o
+	Object unk_0207550C.o
+	Object unk_020772F0.o
+	Object unk_020799E8.o
+	Object unk_02079C70.o
+	Object unk_0207C328.o
+	Object unk_0207D5BC.o
+	Object unk_0207EF6C.o
+	Object unk_0207F95C.o
+	Object unk_0207FC5C.o
+	Object unk_0207FD00.o
+	Object unk_02080C38.o
+	Object unk_020828BC.o
+	Object unk_020834D0.o
+	Object unk_02083B84.o
+	Object unk_02083D48.o
+	Object unk_02084098.o
+	Object unk_020842D0.o
+	Object unk_020842DC.o
+	Object unk_020851B8.o
+	Object nutdata.o
+	Object unk_02085338.o
+	Object unk_020854E0.o
+	Object unk_020859C0.o
+	Object unk_02086084.o
+	Object unk_02086414.o
+	Object unk_02086FA8.o
+	Object unk_02087A1C.o
+	Object unk_02087A6C.o
+	Object unk_02087D00.o
+	Object unk_02088320.o
+	Object unk_02088814.o
+	Object unk_02088858.o
+	Object unk_0208890C.o
+	Object unk_0208898C.o
+	Object unk_02088AAC.o
+	Object unk_02088D1C.o
+	Object unk_02088DD8.o
+	Object unk_02088F0C.o
+	Object unk_020893E0.o
+	Object unk_02089498.o
+	Object unk_02089960.o
+	Object unk_02089D90.o
+	Object unk_02089F24.o
+	Object unk_0208A258.o
+	Object unk_0208A300.o
+	Object unk_0208A338.o
+	Object unk_0208A998.o
+	### Third-party libraries ###
+	Object unk_0208AC14.o
+	Object custom_allocator.o
+	Object unk_020910EC.o
+	Object DWC_backup.o
+	Object DWC_bm_init.o
+	Object DWC_util_wifiidtool.o
+	Object DWC_init.o
+	Object DWC_account.o
+	Object SOC_socl_startup.o
+	Object SOC_socl_command.o
+	Object SOC_socl_create.o
+	Object SOC_socl_bind.o
+	Object SOC_socl_read.o
+	Object SOC_socl_shutdown.o
+	Object SOC_socl_close.o
+	Object SOC_socl_cleanup.o
+	Object SOC_socl_poll.o
+	Object SOC_socl_const.o
+	Object SOC_socl_misc.o
+	Object SOC_socl_list.o
+	Object SOC_soc.o
+	Object SOC_socl_ssl.o
+	Object CPS_network.o
+	Object SSL_ssl.o
+	Object SSL_md5.o
+	Object SSL_sha1.o
+	Object SSL_rca4.o
+	Object SSL_biginteger.o
+	Object WCM_system.o
+	Object WCM_aplist.o
+	Object WCM_cpsif.o
+	Object WCM_util.o
+	Object WIFI_stubsmd5_dummy.o
+	Object libVCT.o
+	Object unk_020ADA84.o
+	Object sndlib.o
+	### Nitro SDK ###
+	Object FX_mtx22.o
+	Object FX_mtx33.o
+	Object FX_mtx43.o
+	Object FX_mtx44.o
+	Object FX_cp.o
+	Object FX_vec.o
+	Object FX_atan.o
+	Object FX.o
+	Object GX.o
+	Object GX_state.o
+	Object GX_vramcnt.o
+	Object GX_bgcnt.o
+	Object GX_g2.o
+	Object GX_g3b.o
+	Object GX_g3imm.o
+	Object GX_g3x.o
+	Object GX_g3_util.o
+	Object GX_load2d.o
+	Object GX_load3d.o
+	Object GX_g3.o
+	Object GX_asm.o
+	Object OS_irqHandler.o (.text)
+	Object OS_irqTable.o
+	Object OS_interrupt.o
+	Object OS_spinLock.o
+	Object OS_printf.o
+	Object OS_thread.o
+	Object OS_context.o
+	Object OS_emulator.o
+	Object OS_message.o
+	Object OS_mutex.o
+	Object OS_cache.o
+	Object OS_init.o
+	Object OS_arena.o
+	Object OS_alloc.o
+	Object OS_tcm.o
+	Object OS_protectionUnit.o
+	Object OS_protectionRegion.o
+	Object OS_exception.o
+	Object OS_timer.o
+	Object OS_tick.o
+	Object OS_alarm.o
+	Object OS_valarm.o
+	Object OS_system.o
+	Object OS_reset.o
+	Object OS_ownerInfo.o
+	Object OS_vramExclusive.o
+	Object OS_entropy.o
+	Object OS_terminate_proc.o
+	Object MI_wram.o
+	Object MI_dma.o
+	Object MI_dma_hblank.o
+	Object MI_dma_gxcommand.o
+	Object MI_memory.o
+	Object MI_swap.o
+	Object MI_uncompress.o
+	Object MI_dma_card.o
+	Object MI_init.o
+	Object SND_interface.o
+	Object SND_main.o
+	Object SND_command.o
+	Object SND_alarm.o
+	Object SND_work.o
+	Object SND_util.o
+	Object SND_bank.o
+	Object PXI_init.o
+	Object PXI_fifo.o
+	Object FS_command.o
+	Object FS_command_default.o
+	Object FS_archive.o
+	Object FS_file.o
+	Object FS_rom.o
+	Object FS_overlay.o
+	Object DGT_hash1.o
+	Object DGT_hash2.o
+	Object DGT_sha1s_arm4cw.o
+	Object CP_context.o
+	Object SPI_tp.o
+	Object SPI_mic.o
+	Object SPI_pm.o
+	Object RTC_external.o
+	Object RTC_internal.o
+	Object RTC_convert.o
+	Object CARD_common.o
+	Object CARD_spi.o
+	Object CARD_backup.o
+	Object CARD_rom.o
+	Object CARD_request.o
+	Object CARD_pullOut.o
+	Object WM_system.o
+	Object WM_sync.o
+	Object WM_standard.o
+	Object WM_mp.o
+	Object WM_dcf.o
+	Object WM_ds.o
+	Object WM_ks.o
+	Object WM_etc.o
+	Object CTRDG.o
+	Object CTRDG_proc.o
+	Object CTRDG_backup.o
+	Object CTRDG_flash_common.o
+	Object CTRDG_flash_AT29LV512.o
+	Object CTRDG_flash_LE39FW512.o
+	Object CTRDG_flash_MX29L010.o
+	Object CTRDG_flash_MX29L512.o
+	Object CTRDG_task.o
+	Object MATH_pop.o
+	Object MATH_dgt.o
+	Object MATH_crc.o
+	Object STD_string.o
+	### Standard libraries ###
+	Object libc.o
+	Object stdlibmwcc.o
 }
 
 Autoload ITCM
 {
 	Address 0x01FF8000
-	Object arm9_itcm.o
+	Object OS_irqHandler.o (.itcm)
+	Object OS_reset.o (.itcm)
+	Object MI_dma.o (.itcm)
+	Object MI_dma_gxcommand.o (.itcm)
 }
 
 Autoload DTCM
 {
 	Address 0x027E0000
-	Library libos.a
+	Object OS_irqHandler.o (.bss)
+	Object OS_irqTable.o (.dtcm)
 }
 
 Autoload EXT
@@ -449,439 +486,525 @@ Autoload EXT
 
 Overlay MODULE_00
 {
-	Address 0x021D74E0
+	After arm9
 }
+
 Overlay MODULE_01
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_01.o
 }
+
 Overlay MODULE_02
 {
-	Address 0x021D7520
+	After MODULE_01
 }
+
 Overlay MODULE_03
 {
-	Address 0x01FF8700
+	After ITCM
 }
+
 Overlay MODULE_04
 {
-	Address 0x021D74E0
+	After arm9
 	Object thumb_04.o
 	Object arm_04.o
 }
+
 Overlay MODULE_05
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_05.o
 }
+
 Overlay MODULE_06
 {
-	Address 0x022396A0
+	After MODULE_05
 	Object module_06.o
 }
+
 Overlay MODULE_07
 {
-	Address 0x02211E60
+	After MODULE_04
 	Object module_07.o
 }
+
 Overlay MODULE_08
 {
-	Address 0x02211E60
+	After MODULE_04
 	Object module_08.o
 }
+
 Overlay MODULE_09
 {
-	Address 0x02211E60
+	After MODULE_04
 	Object module_09.o
 }
+
 Overlay MODULE_10
 {
-	Address 0x021D74E0
+	After arm9
 }
+
 Overlay MODULE_11
 {
-	Address 0x0222D5C0
+	After MODULE_08
 	Object module_11.o
 }
+
 Overlay MODULE_12
 {
-	Address 0x0222D5C0
+	After MODULE_08
 	Object module_12.o
 }
+
 Overlay MODULE_13
 {
-	Address 0x02211E60
+	After MODULE_04
 	Object module_13_init.o
 	Object module_13_arm1.o
 	Object module_13_thumb.o
 	Object module_13_arm2.o
 }
+
 Overlay MODULE_14
 {
-	/* Menu? */
-	Address 0x021D74E0
+	### Menu? ###
+	After arm9
 	Object module_14.o
 }
+
 Overlay MODULE_15
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_15.o
 }
+
 Overlay MODULE_16
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_16.o
 }
+
 Overlay MODULE_17
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_17.o
 }
+
 Overlay MODULE_18
 {
-	Address 0x022396A0
+	After MODULE_05
 	Object module_18.o
 }
+
 Overlay MODULE_19
 {
-	Address 0x02252440
+	After MODULE_06
 	Object module_19.o
 }
+
 Overlay MODULE_20
 {
-	Address 0x02252440
+	After MODULE_06
 	Object module_20.o
 }
+
 Overlay MODULE_21
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_21.o
 }
+
 Overlay MODULE_22
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_22.o
 }
+
 Overlay MODULE_23
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_23.o
 }
+
 Overlay MODULE_24
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_24.o
 }
+
 Overlay MODULE_25
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_25.o
 }
+
 Overlay MODULE_26
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_26.o
 }
+
 Overlay MODULE_27
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_27.o
 }
+
 Overlay MODULE_28
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_28.o
 }
+
 Overlay MODULE_29
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_29.o
 }
+
 Overlay MODULE_30
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_30.o
 }
+
 Overlay MODULE_31
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_31.o
 }
+
 Overlay MODULE_32
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_32.o
 }
+
 Overlay MODULE_33
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_33.o
 }
+
 Overlay MODULE_34
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_34.o
 }
+
 Overlay MODULE_35
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_35.o
 }
+
 Overlay MODULE_36
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_36.o
 }
+
 Overlay MODULE_37
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_37.o
 }
+
 Overlay MODULE_38
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_38.o
 }
+
 Overlay MODULE_39
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_39.o
 }
+
 Overlay MODULE_40
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_40.o
 }
+
 Overlay MODULE_41
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_41.o
 }
+
 Overlay MODULE_42
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_42.o
 }
+
 Overlay MODULE_43
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_43.o
 }
+
 Overlay MODULE_44
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_44.o
 }
+
 Overlay MODULE_45
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_45.o
 }
+
 Overlay MODULE_46
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_46.o
 }
+
 Overlay MODULE_47
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_47.o
 }
+
 Overlay MODULE_48
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_48.o
 }
+
 Overlay MODULE_49
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_49.o
 }
+
 Overlay MODULE_50
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_50.o
 }
+
 Overlay MODULE_51
 {
-	Address 0x02254840
+	After MODULE_20
 	Object module_51.o
 }
+
 Overlay MODULE_52
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_52.o
 }
+
 Overlay MODULE_53
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_53.o
 }
+
 Overlay MODULE_54
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_54.o
 }
+
 Overlay MODULE_55
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_55.o
 }
+
 Overlay MODULE_56
 {
-	Address 0x02211E60
+	After MODULE_04
 	Object module_56.o
 }
+
 Overlay MODULE_57
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_57.o
 }
+
 Overlay MODULE_58
 {
-	Address 0x021D9A20
+	After MODULE_57
 	Object module_58.o
 }
+
 Overlay MODULE_59
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_59.o
 }
+
 Overlay MODULE_60
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_60.o
 }
+
 Overlay MODULE_61
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_61.o
 }
+
 Overlay MODULE_62
 {
-	Address 0x0222D5C0
+	After MODULE_08
 	Object module_62.o
 }
+
 Overlay MODULE_63
 {
-	/* Title Demo */
-	Address 0x021D74E0
+	### Title Demo ###
+	After arm9
 	Object module_63.o
 }
+
 Overlay MODULE_64
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_64.o
 }
+
 Overlay MODULE_65
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_65.o
 }
+
 Overlay MODULE_66
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_66.o
 }
+
 Overlay MODULE_67
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_67.o
 }
+
 Overlay MODULE_68
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_68.o
 }
+
 Overlay MODULE_69
 {
-	Address 0x0222D5C0
+	After MODULE_08
 	Object module_69.o
 }
+
 Overlay MODULE_70
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_70.o
 }
+
 Overlay MODULE_71
 {
-	Address 0x0222D5C0
+	After MODULE_08
 	Object module_71.o
 }
+
 Overlay MODULE_72
 {
-	Address 0x021D74E0
-	Object module_72.o
+	After arm9
 }
+
 Overlay MODULE_73
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_73.o
 }
+
 Overlay MODULE_74
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_74.o
 }
+
 Overlay MODULE_75
 {
-	/* Player's bag */
+	### Player's bag ###
 	Address 0x021E6BA0
 	Object module_75.o
 }
+
 Overlay MODULE_76
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_76.o
 }
+
 Overlay MODULE_77
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_77.o
 }
+
 Overlay MODULE_78
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_78.o
 }
+
 Overlay MODULE_79
 {
-	Address 0x02211E60
-	Object module_79.o
+	After MODULE_04
+	Object module_79_thumb.o
+	Object module_79_arm.o
 }
+
 Overlay MODULE_80
 {
-	Address 0x0222D5C0
+	After MODULE_08
 	Object module_80.o
 }
+
 Overlay MODULE_81
 {
-	Address 0x02237E40
+	After MODULE_80
 	Object module_81.o
 }
+
 Overlay MODULE_82
 {
-	Address 0x0222D5C0
+	After MODULE_08
 	Object module_82.o
 }
+
 Overlay MODULE_83
 {
-	Address 0x0222D5C0
+	After MODULE_08
 	Object module_83.o
 }
+
 Overlay MODULE_84
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_84.o
 }
+
 Overlay MODULE_85
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_85.o
 }
+
 Overlay MODULE_86
 {
-	Address 0x021D74E0
+	After arm9
 	Object module_86.o
 }
diff --git a/arm9/asm/libmwcc.s b/arm9/asm/stdlibmwcc.s
index 5b3fc86d..5b3fc86d 100644
--- a/arm9/asm/libmwcc.s
+++ b/arm9/asm/stdlibmwcc.s
diff --git a/arm9/lib/src/OS_irqHandler.c b/arm9/lib/src/OS_irqHandler.c
index b1211b98..68f1425d 100644
--- a/arm9/lib/src/OS_irqHandler.c
+++ b/arm9/lib/src/OS_irqHandler.c
@@ -5,9 +5,7 @@
 #include "sections.h"
 #include "CP_context.h"
 
-#pragma section DTCM begin
 OSThreadQueue OSi_IrqThreadQueue = { NULL, NULL };
-#pragma section DTCM end
 
 #pragma section ITCM begin
 ARM_FUNC asm void OS_IrqHandler(void)