OS_arm9.s etc. to libos.s

21 files changed, 477 insertions, 42 deletions

diff --git a/arm9/Makefile b/arm9/Makefile
index 0cff252a..0343dd8c 100644
--- a/arm9/Makefile
+++ b/arm9/Makefile
@@ -76,7 +76,7 @@ MWCCARM  := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwccarm.exe
 MWLDARM  := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwldarm.exe
 MWASMARM := $(TOOLS_DIR)/mwccarm/$(MWCCVERSION)/mwasmarm.exe
 MAKELSF := $(WINE) $(TOOLS_DIR)/bin/makelcf.exe
-MAKELSF_FLAGS := -DCONST_34=0x34 -DCONST_3F=0x3F $(foreach module,$(wildcard files/OVERLAY_*.bin.__AT_*),-M${module})
+MAKELSF_FLAGS := -DCONST_34=0x34 -DCONST_3F=0x3F
 
 AS      := $(WINE) $(MWASMARM)
 CC      := $(WINE) $(MWCCARM)
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 42ce3088..235d3667 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -119,23 +119,23 @@ SECTIONS {
 		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)
+		libfx.o (.text)
+		libgx.o (.text)
+		libos.o (.text)
+		libmi.o (.text)
+		libsnd.o (.text)
+		libpxi.o (.text)
+		libfs.o (.text)
+		libdgt.o (.text)
+		libcp.o (.text)
+		libspi.o (.text)
+		libpm.o (.text)
+		librtc.o (.text)
+		libcard.o (.text)
+		libwm.o (.text)
+		libctrdg.o (.text)
+		libmath.o (.text)
+		libstd.o (.text)
 		/* C standard library */
 		libc.o (.text)
 		/* MWCC library */
@@ -164,7 +164,7 @@ SECTIONS {
 
 	.dtcm : AT (0x1076A0) {
 		SDK_AUTOLOAD_DTCM_START = .;
-		OS_arm9.o (.dtcm)
+		libos.o (.dtcm)
 		SDK_AUTOLOAD_DTCM_END = .;
 		SDK_SECTION_ARENA_DTCM_START = 0x027E0080;
 	} > .dtcm
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index da885c0e..3df64d7d 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -16,41 +16,477 @@ Static arm9
     Object unk_02046030.o
     Object unk_0208AC14.o
     Object unk_020AF030.o
-    Object FX_arm9.o
-    Object GX_arm9.o
-    Object OS_arm9.o (.text)
-    Object MI_arm9.o
-    Object SND_arm9.o
-    Object PXI_arm9.o
-    Object FS_arm9.o
-    Object DGT_arm9.o
-    Object CP_arm9.o
-    Object SPI_arm9.o
-    Object PM_arm9.o
-    Object RTC_arm9.o
-    Object CARD_arm9.o
-    Object WM_arm9.o
-    Object CTRDG_arm9.o
-    Object MATH_arm9.o
-    Object STD_arm9.o
-    Object libc.o
-    Object libmwcc.o
+    Library libfx.a
+    Library libgx.a
+    Library libos.a
+    Library libmi.a
+    Library libsnd.a
+    Library libpxi.a
+    Library libfs.a
+    Library libdgt.a
+    Library libcp.a
+    Library libspi.a
+    Library libpm.a
+    Library librtc.a
+    Library libcard.a
+    Library libwm.a
+    Library libctrdg.a
+    Library libmath.a
+    Library libstd.a
+    Library libc.a
+    Library libmwcc.a
     Object rom2_2.o
 }
 
 Autoload ITCM
 {
 	Address 0x01FF8000
-	Object arm9_itcm.o (.itcm)
+	Object arm9_itcm.o
 }
 
 Autoload DTCM
 {
 	Address 0x027E0000
-	Object OS_arm9.o (.dtcm)
+	Library libos.a
 }
 
 Autoload EXT
 {
-	Address 0x023E0000
+	Address 0x02400000
+}
+
+Overlay overlay_00
+{
+	Address 0x021D74E0
+	Object FILE_10C400.o
+}
+Overlay overlay_01
+{
+	Address 0x021D74E0
+	Object FILE_10C600.o
+}
+Overlay overlay_02
+{
+	Address 0x021D7520
+	Object FILE_10C800.o
+}
+Overlay overlay_03
+{
+	Address 0x01FF8700
+	Object FILE_10CA00.o
+}
+Overlay overlay_04
+{
+	Address 0x021D74E0
+	Object FILE_10CC00.o
+}
+Overlay overlay_05
+{
+	Address 0x021D74E0
+	Object FILE_145400.o
+}
+Overlay overlay_06
+{
+	Address 0x022396A0
+	Object FILE_16B600.o
+}
+Overlay overlay_07
+{
+	Address 0x02211E60
+	Object FILE_184400.o
+}
+Overlay overlay_08
+{
+	Address 0x02211E60
+	Object FILE_187800.o
+}
+Overlay overlay_09
+{
+	Address 0x02211E60
+	Object FILE_1A3000.o
+}
+Overlay overlay_10
+{
+	Address 0x021D74E0
+	Object FILE_1AD200.o
+}
+Overlay overlay_11
+{
+	Address 0x0222D5C0
+	Object FILE_1AD400.o
+}
+Overlay overlay_12
+{
+	Address 0x0222D5C0
+	Object FILE_1DFE00.o
+}
+Overlay overlay_13
+{
+	Address 0x02211E60
+	Object FILE_1F9200.o
+}
+Overlay overlay_14
+{
+	Address 0x021D74E0
+	Object FILE_227E00.o
+}
+Overlay overlay_15
+{
+	Address 0x021D74E0
+	Object FILE_237400.o
+}
+Overlay overlay_16
+{
+	Address 0x021D74E0
+	Object FILE_23BC00.o
+}
+Overlay overlay_17
+{
+	Address 0x021D74E0
+	Object FILE_264200.o
+}
+Overlay overlay_18
+{
+	Address 0x022396A0
+	Object FILE_26B200.o
+}
+Overlay overlay_19
+{
+	Address 0x02252440
+	Object FILE_283000.o
+}
+Overlay overlay_20
+{
+	Address 0x02252440
+	Object FILE_283200.o
+}
+Overlay overlay_21
+{
+	Address 0x02254840
+	Object FILE_285600.o
+}
+Overlay overlay_22
+{
+	Address 0x02254840
+	Object FILE_285C00.o
+}
+Overlay overlay_23
+{
+	Address 0x02254840
+	Object FILE_286C00.o
+}
+Overlay overlay_24
+{
+	Address 0x02254840
+	Object FILE_288600.o
+}
+Overlay overlay_25
+{
+	Address 0x02254840
+	Object FILE_289000.o
+}
+Overlay overlay_26
+{
+	Address 0x02254840
+	Object FILE_289600.o
+}
+Overlay overlay_27
+{
+	Address 0x02254840
+	Object FILE_289E00.o
+}
+Overlay overlay_28
+{
+	Address 0x02254840
+	Object FILE_28AA00.o
+}
+Overlay overlay_29
+{
+	Address 0x02254840
+	Object FILE_28C200.o
+}
+Overlay overlay_30
+{
+	Address 0x02254840
+	Object FILE_28CC00.o
+}
+Overlay overlay_31
+{
+	Address 0x02254840
+	Object FILE_28D200.o
+}
+Overlay overlay_32
+{
+	Address 0x02254840
+	Object FILE_28D800.o
+}
+Overlay overlay_33
+{
+	Address 0x02254840
+	Object FILE_28DE00.o
+}
+Overlay overlay_34
+{
+	Address 0x02254840
+	Object FILE_28E200.o
+}
+Overlay overlay_35
+{
+	Address 0x02254840
+	Object FILE_28E800.o
+}
+Overlay overlay_36
+{
+	Address 0x02254840
+	Object FILE_28F200.o
+}
+Overlay overlay_37
+{
+	Address 0x02254840
+	Object FILE_290000.o
+}
+Overlay overlay_38
+{
+	Address 0x02254840
+	Object FILE_290600.o
+}
+Overlay overlay_39
+{
+	Address 0x02254840
+	Object FILE_291200.o
+}
+Overlay overlay_40
+{
+	Address 0x02254840
+	Object FILE_292000.o
+}
+Overlay overlay_41
+{
+	Address 0x02254840
+	Object FILE_292E00.o
+}
+Overlay overlay_42
+{
+	Address 0x02254840
+	Object FILE_294000.o
+}
+Overlay overlay_43
+{
+	Address 0x02254840
+	Object FILE_294A00.o
+}
+Overlay overlay_44
+{
+	Address 0x02254840
+	Object FILE_295400.o
+}
+Overlay overlay_45
+{
+	Address 0x02254840
+	Object FILE_295A00.o
+}
+Overlay overlay_46
+{
+	Address 0x02254840
+	Object FILE_296400.o
+}
+Overlay overlay_47
+{
+	Address 0x02254840
+	Object FILE_296800.o
+}
+Overlay overlay_48
+{
+	Address 0x02254840
+	Object FILE_297600.o
+}
+Overlay overlay_49
+{
+	Address 0x02254840
+	Object FILE_298000.o
+}
+Overlay overlay_50
+{
+	Address 0x02254840
+	Object FILE_298600.o
+}
+Overlay overlay_51
+{
+	Address 0x02254840
+	Object FILE_298A00.o
+}
+Overlay overlay_52
+{
+	Address 0x021D74E0
+	Object FILE_299A00.o
+}
+Overlay overlay_53
+{
+	Address 0x021D74E0
+	Object FILE_299E00.o
+}
+Overlay overlay_54
+{
+	Address 0x021D74E0
+	Object FILE_29C400.o
+}
+Overlay overlay_55
+{
+	Address 0x021D74E0
+	Object FILE_29E800.o
+}
+Overlay overlay_56
+{
+	Address 0x02211E60
+	Object FILE_2A1A00.o
+}
+Overlay overlay_57
+{
+	Address 0x021D74E0
+	Object FILE_2A6200.o
+}
+Overlay overlay_58
+{
+	Address 0x021D9A20
+	Object FILE_2A8800.o
+}
+Overlay overlay_59
+{
+	Address 0x021D74E0
+	Object FILE_2A9E00.o
+}
+Overlay overlay_60
+{
+	Address 0x021D74E0
+	Object FILE_2ACC00.o
+}
+Overlay overlay_61
+{
+	Address 0x021D74E0
+	Object FILE_2ADA00.o
+}
+Overlay overlay_62
+{
+	Address 0x0222D5C0
+	Object FILE_2AEC00.o
+}
+Overlay overlay_63
+{
+	Address 0x021D74E0
+	Object FILE_2B2A00.o
+}
+Overlay overlay_64
+{
+	Address 0x021D74E0
+	Object FILE_2B7600.o
+}
+Overlay overlay_65
+{
+	Address 0x021D74E0
+	Object FILE_2B9400.o
+}
+Overlay overlay_66
+{
+	Address 0x021D74E0
+	Object FILE_2BC400.o
+}
+Overlay overlay_67
+{
+	Address 0x021D74E0
+	Object FILE_2BEC00.o
+}
+Overlay overlay_68
+{
+	Address 0x021D74E0
+	Object FILE_2C1200.o
+}
+Overlay overlay_69
+{
+	Address 0x0222D5C0
+	Object FILE_2C2800.o
+}
+Overlay overlay_70
+{
+	Address 0x021D74E0
+	Object FILE_2C4C00.o
+}
+Overlay overlay_71
+{
+	Address 0x0222D5C0
+	Object FILE_2C5C00.o
+}
+Overlay overlay_72
+{
+	Address 0x021D74E0
+	Object FILE_2C9C00.o
+}
+Overlay overlay_73
+{
+	Address 0x021D74E0
+	Object FILE_2C9E00.o
+}
+Overlay overlay_74
+{
+	Address 0x021D74E0
+	Object FILE_2CEA00.o
+}
+Overlay overlay_75
+{
+	Address 0x021E6BA0
+	Object FILE_2CFE00.o
+}
+Overlay overlay_76
+{
+	Address 0x021D74E0
+	Object FILE_2D5C00.o
+}
+Overlay overlay_77
+{
+	Address 0x021D74E0
+	Object FILE_2D7C00.o
+}
+Overlay overlay_78
+{
+	Address 0x021D74E0
+	Object FILE_2D9800.o
+}
+Overlay overlay_79
+{
+	Address 0x02211E60
+	Object FILE_2D9E00.o
+}
+Overlay overlay_80
+{
+	Address 0x0222D5C0
+	Object FILE_2DF200.o
+}
+Overlay overlay_81
+{
+	Address 0x02237E40
+	Object FILE_2E9A00.o
+}
+Overlay overlay_82
+{
+	Address 0x0222D5C0
+	Object FILE_2EF000.o
+}
+Overlay overlay_83
+{
+	Address 0x0222D5C0
+	Object FILE_2F1600.o
+}
+Overlay overlay_84
+{
+	Address 0x021D74E0
+	Object FILE_2FFA00.o
+}
+Overlay overlay_85
+{
+	Address 0x021D74E0
+	Object FILE_303400.o
+}
+Overlay overlay_86
+{
+	Address 0x021D74E0
+	Object FILE_30C600.o
 }
diff --git a/arm9/asm/CARD_arm9.s b/arm9/asm/libcard.s
index 664e85f5..664e85f5 100644
--- a/arm9/asm/CARD_arm9.s
+++ b/arm9/asm/libcard.s
diff --git a/arm9/asm/CP_arm9.s b/arm9/asm/libcp.s
index c756e8e2..c756e8e2 100644
--- a/arm9/asm/CP_arm9.s
+++ b/arm9/asm/libcp.s
diff --git a/arm9/asm/CTRDG_arm9.s b/arm9/asm/libctrdg.s
index 301ea233..301ea233 100644
--- a/arm9/asm/CTRDG_arm9.s
+++ b/arm9/asm/libctrdg.s
diff --git a/arm9/asm/DGT_arm9.s b/arm9/asm/libdgt.s
index d5ef358d..d5ef358d 100644
--- a/arm9/asm/DGT_arm9.s
+++ b/arm9/asm/libdgt.s
diff --git a/arm9/asm/FS_arm9.s b/arm9/asm/libfs.s
index d9b791b8..d9b791b8 100644
--- a/arm9/asm/FS_arm9.s
+++ b/arm9/asm/libfs.s
diff --git a/arm9/asm/FX_arm9.s b/arm9/asm/libfx.s
index 61f797b2..61f797b2 100644
--- a/arm9/asm/FX_arm9.s
+++ b/arm9/asm/libfx.s
diff --git a/arm9/asm/GX_arm9.s b/arm9/asm/libgx.s
index 59a548b2..59a548b2 100644
--- a/arm9/asm/GX_arm9.s
+++ b/arm9/asm/libgx.s
diff --git a/arm9/asm/MATH_arm9.s b/arm9/asm/libmath.s
index 02dcfbcf..02dcfbcf 100644
--- a/arm9/asm/MATH_arm9.s
+++ b/arm9/asm/libmath.s
diff --git a/arm9/asm/MI_arm9.s b/arm9/asm/libmi.s
index 82747b38..82747b38 100644
--- a/arm9/asm/MI_arm9.s
+++ b/arm9/asm/libmi.s
diff --git a/arm9/asm/OS_arm9.s b/arm9/asm/libos.s
index 1323e376..1323e376 100644
--- a/arm9/asm/OS_arm9.s
+++ b/arm9/asm/libos.s
diff --git a/arm9/asm/PM_arm9.s b/arm9/asm/libpm.s
index 331c0fa9..331c0fa9 100644
--- a/arm9/asm/PM_arm9.s
+++ b/arm9/asm/libpm.s
diff --git a/arm9/asm/PXI_arm9.s b/arm9/asm/libpxi.s
index ab3af5de..ab3af5de 100644
--- a/arm9/asm/PXI_arm9.s
+++ b/arm9/asm/libpxi.s
diff --git a/arm9/asm/RTC_arm9.s b/arm9/asm/librtc.s
index 8116f8de..8116f8de 100644
--- a/arm9/asm/RTC_arm9.s
+++ b/arm9/asm/librtc.s
diff --git a/arm9/asm/SND_arm9.s b/arm9/asm/libsnd.s
index 99351712..99351712 100644
--- a/arm9/asm/SND_arm9.s
+++ b/arm9/asm/libsnd.s
diff --git a/arm9/asm/SPI_arm9.s b/arm9/asm/libspi.s
index 915bb22c..915bb22c 100644
--- a/arm9/asm/SPI_arm9.s
+++ b/arm9/asm/libspi.s
diff --git a/arm9/asm/STD_arm9.s b/arm9/asm/libstd.s
index 39946c46..39946c46 100644
--- a/arm9/asm/STD_arm9.s
+++ b/arm9/asm/libstd.s
diff --git a/arm9/asm/WM_arm9.s b/arm9/asm/libwm.s
index cc3e7998..cc3e7998 100644
--- a/arm9/asm/WM_arm9.s
+++ b/arm9/asm/libwm.s
diff --git a/arm9/asm/secure.s b/arm9/asm/secure.s
index 88ced857..632f43bc 100644
--- a/arm9/asm/secure.s
+++ b/arm9/asm/secure.s
@@ -20,7 +20,6 @@ FUN_020002FE: ; 0x020002FE
 
 .incbin "baserom.nds", 0x4302, 0x2F0
 
-
 	non_word_aligned_thumb_func_start SVC_WaitByLoop
 SVC_WaitByLoop:
 	swi 3