diff --git a/asm/si/SIBios_8002a3c0.s b/asm/si/SIBios.s
similarity index 97%
rename from asm/si/SIBios_8002a3c0.s
rename to asm/si/SIBios.s
index 34724774..2d43e9d3 100644
--- a/asm/si/SIBios_8002a3c0.s
+++ b/asm/si/SIBios.s
@@ -1623,3 +1623,109 @@ lbl_8002B994:
 /* 8002B9B4 000277F4  7C 08 03 A6 */	mtlr r0
 /* 8002B9B8 000277F8  38 21 00 20 */	addi r1, r1, 0x20
 /* 8002B9BC 000277FC  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@1_8042FB88"
+"@1_8042FB88":
+
+	.4byte 0x3C3C2052
+	.4byte 0x564C5F53
+	.4byte 0x444B202D
+	.4byte 0x20534920
+	.4byte 0x0972656C
+	.4byte 0x65617365
+	.4byte 0x20627569
+	.4byte 0x6C643A20
+	.4byte 0x41756720
+	.4byte 0x32332032
+	.4byte 0x30313020
+	.4byte 0x31373A33
+	.4byte 0x333A3138
+	.4byte 0x20283078
+	.4byte 0x34333032
+	.4byte 0x5F313435
+	.4byte 0x29203E3E
+	.4byte 0
+
+.global Si
+Si:
+
+	.4byte 0xFFFFFFFF
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+
+.global Type_8042FBE8
+Type_8042FBE8:
+
+	.4byte 0x00000008
+	.4byte 0x00000008
+	.4byte 0x00000008
+	.4byte 0x00000008
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global Packet
+Packet:
+	.skip 0x80
+
+.global XferTime
+XferTime:
+	.skip 0x20
+
+.global TypeTime
+TypeTime:
+	.skip 0x20
+
+.global Alarm
+Alarm:
+	.skip 0xC0
+
+.global InputBuffer
+InputBuffer:
+	.skip 0x20
+
+.global InputBufferValid
+InputBufferValid:
+	.skip 0x10
+
+.global InputBufferVcount
+InputBufferVcount:
+	.skip 0x10
+
+.global RDSTHandler
+RDSTHandler:
+	.skip 0x20
+
+.global TypeCallback
+TypeCallback:
+	.skip 0x40
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __SIVersion
+__SIVersion:
+
+	.4byte "@1_8042FB88"
+	.4byte 0
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "@LOCAL@SIInterruptHandler__FsP9OSContext@cmdTypeAndStatus"
+"@LOCAL@SIInterruptHandler__FsP9OSContext@cmdTypeAndStatus":
+	.skip 0x4
+
+.global "@LOCAL@SIInit__Fv@Initialized"
+"@LOCAL@SIInit__Fv@Initialized":
+	.skip 0x4
+
+.global "@LOCAL@SIGetType__Fl@cmdTypeAndStatus"
+"@LOCAL@SIGetType__Fl@cmdTypeAndStatus":
+	.skip 0x4
+
+.global __PADFixBits
+__PADFixBits:
+	.skip 0x4
diff --git a/asm/si/SIBios_8042fb88.s b/asm/si/SIBios_8042fb88.s
deleted file mode 100644
index 1804e1e6..00000000
--- a/asm/si/SIBios_8042fb88.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@1_8042FB88"
-"@1_8042FB88":
-
-	.4byte 0x3C3C2052
-	.4byte 0x564C5F53
-	.4byte 0x444B202D
-	.4byte 0x20534920
-	.4byte 0x0972656C
-	.4byte 0x65617365
-	.4byte 0x20627569
-	.4byte 0x6C643A20
-	.4byte 0x41756720
-	.4byte 0x32332032
-	.4byte 0x30313020
-	.4byte 0x31373A33
-	.4byte 0x333A3138
-	.4byte 0x20283078
-	.4byte 0x34333032
-	.4byte 0x5F313435
-	.4byte 0x29203E3E
-	.4byte 0
-
-.global Si
-Si:
-
-	.4byte 0xFFFFFFFF
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-
-.global Type_8042FBE8
-Type_8042FBE8:
-
-	.4byte 0x00000008
-	.4byte 0x00000008
-	.4byte 0x00000008
-	.4byte 0x00000008
diff --git a/asm/si/SIBios_8049a350.s b/asm/si/SIBios_8049a350.s
deleted file mode 100644
index a2d5e5bc..00000000
--- a/asm/si/SIBios_8049a350.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global Packet
-Packet:
-	.skip 0x80
-
-.global XferTime
-XferTime:
-	.skip 0x20
-
-.global TypeTime
-TypeTime:
-	.skip 0x20
-
-.global Alarm
-Alarm:
-	.skip 0xC0
-
-.global InputBuffer
-InputBuffer:
-	.skip 0x20
-
-.global InputBufferValid
-InputBufferValid:
-	.skip 0x10
-
-.global InputBufferVcount
-InputBufferVcount:
-	.skip 0x10
-
-.global RDSTHandler
-RDSTHandler:
-	.skip 0x20
-
-.global TypeCallback
-TypeCallback:
-	.skip 0x40
diff --git a/asm/si/SIBios_80556520.s b/asm/si/SIBios_80556520.s
deleted file mode 100644
index 9af86c3e..00000000
--- a/asm/si/SIBios_80556520.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __SIVersion
-__SIVersion:
-
-	.4byte "@1_8042FB88"
-	.4byte 0
diff --git a/asm/si/SIBios_8055c8e0.s b/asm/si/SIBios_8055c8e0.s
deleted file mode 100644
index a2f69fa5..00000000
--- a/asm/si/SIBios_8055c8e0.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "@LOCAL@SIInterruptHandler__FsP9OSContext@cmdTypeAndStatus"
-"@LOCAL@SIInterruptHandler__FsP9OSContext@cmdTypeAndStatus":
-	.skip 0x4
-
-.global "@LOCAL@SIInit__Fv@Initialized"
-"@LOCAL@SIInit__Fv@Initialized":
-	.skip 0x4
-
-.global "@LOCAL@SIGetType__Fl@cmdTypeAndStatus"
-"@LOCAL@SIGetType__Fl@cmdTypeAndStatus":
-	.skip 0x4
-
-.global __PADFixBits
-__PADFixBits:
-	.skip 0x4
diff --git a/asm/si/SISamplingRate_8002b9c0.s b/asm/si/SISamplingRate.s
similarity index 78%
rename from asm/si/SISamplingRate_8002b9c0.s
rename to asm/si/SISamplingRate.s
index 4d5139f3..d467e034 100644
--- a/asm/si/SISamplingRate_8002b9c0.s
+++ b/asm/si/SISamplingRate.s
@@ -75,3 +75,53 @@ SIRefreshSamplingRate:
 /* 8002BAA4 000278E4  4B FF FF 1C */	b SISetSamplingRate
 /* 8002BAA8 000278E8  00 00 00 00 */	.4byte 0x00000000
 /* 8002BAAC 000278EC  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global XYNTSC
+XYNTSC:
+
+	.4byte 0x00F60200
+	.4byte 0x000E1300
+	.4byte 0x001E0900
+	.4byte 0x002C0600
+	.4byte 0x00340500
+	.4byte 0x00410400
+	.4byte 0x00570300
+	.4byte 0x00570300
+	.4byte 0x00570300
+	.4byte 0x00830200
+	.4byte 0x00830200
+	.4byte 0x00830200
+	.4byte 0x01280200
+	.4byte 0x000F1500
+	.4byte 0x001D0B00
+	.4byte 0x002D0700
+	.4byte 0x00340600
+	.4byte 0x003F0500
+	.4byte 0x004E0400
+	.4byte 0x00680300
+	.4byte 0x00680300
+	.4byte 0x00680300
+	.4byte 0x00680300
+	.4byte 0x009C0200
+	.4byte 0x53495365
+	.4byte 0x7453616D
+	.4byte 0x706C696E
+	.4byte 0x67526174
+	.4byte 0x653A2075
+	.4byte 0x6E6B6E6F
+	.4byte 0x776E2054
+	.4byte 0x5620666F
+	.4byte 0x726D6174
+	.4byte 0x2E205573
+	.4byte 0x65206465
+	.4byte 0x6661756C
+	.4byte 0x742E0000
+	.4byte 0
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global SamplingRate
+SamplingRate:
+	.skip 0x8
diff --git a/asm/si/SISamplingRate_8042fbf8.s b/asm/si/SISamplingRate_8042fbf8.s
deleted file mode 100644
index aad6e3bb..00000000
--- a/asm/si/SISamplingRate_8042fbf8.s
+++ /dev/null
@@ -1,44 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global XYNTSC
-XYNTSC:
-
-	.4byte 0x00F60200
-	.4byte 0x000E1300
-	.4byte 0x001E0900
-	.4byte 0x002C0600
-	.4byte 0x00340500
-	.4byte 0x00410400
-	.4byte 0x00570300
-	.4byte 0x00570300
-	.4byte 0x00570300
-	.4byte 0x00830200
-	.4byte 0x00830200
-	.4byte 0x00830200
-	.4byte 0x01280200
-	.4byte 0x000F1500
-	.4byte 0x001D0B00
-	.4byte 0x002D0700
-	.4byte 0x00340600
-	.4byte 0x003F0500
-	.4byte 0x004E0400
-	.4byte 0x00680300
-	.4byte 0x00680300
-	.4byte 0x00680300
-	.4byte 0x00680300
-	.4byte 0x009C0200
-	.4byte 0x53495365
-	.4byte 0x7453616D
-	.4byte 0x706C696E
-	.4byte 0x67526174
-	.4byte 0x653A2075
-	.4byte 0x6E6B6E6F
-	.4byte 0x776E2054
-	.4byte 0x5620666F
-	.4byte 0x726D6174
-	.4byte 0x2E205573
-	.4byte 0x65206465
-	.4byte 0x6661756C
-	.4byte 0x742E0000
-	.4byte 0
diff --git a/asm/si/SISamplingRate_8055c8f0.s b/asm/si/SISamplingRate_8055c8f0.s
deleted file mode 100644
index 34fbe72a..00000000
--- a/asm/si/SISamplingRate_8055c8f0.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global SamplingRate
-SamplingRate:
-	.skip 0x8
diff --git a/obj_files.mk b/obj_files.mk
index b0006a53..ebfee3e0 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -149,10 +149,11 @@ $(BUILD_DIR)/asm/exi/EXIBios.o \
 $(BUILD_DIR)/asm/exi/EXIUart.o \
 $(BUILD_DIR)/asm/exi/EXICommon.o \
 \
+$(BUILD_DIR)/asm/si/SIBios.o \
+$(BUILD_DIR)/asm/si/SISamplingRate.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/si/SIBios_8002a3c0.o \
-$(BUILD_DIR)/asm/si/SISamplingRate_8002b9c0.o \
 $(BUILD_DIR)/asm/db/db_8002bab0.o \
 $(BUILD_DIR)/asm/vi/vi_8002bad0.o \
 $(BUILD_DIR)/asm/vi/i2c_8002e490.o \
@@ -3219,8 +3220,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \
 $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \
 $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
 $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \
-$(BUILD_DIR)/asm/si/SIBios_8042fb88.o \
-$(BUILD_DIR)/asm/si/SISamplingRate_8042fbf8.o \
 $(BUILD_DIR)/asm/vi/vi_8042fc90.o \
 $(BUILD_DIR)/asm/vi/vi3in1_804301e8.o \
 $(BUILD_DIR)/asm/gx/GXInit_80430800.o \
@@ -5038,7 +5037,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \
 $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \
 $(BUILD_DIR)/asm/src/Alarm_804966e0.o \
 $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \
-$(BUILD_DIR)/asm/si/SIBios_8049a350.o \
 $(BUILD_DIR)/asm/vi/vi_8049a570.o \
 $(BUILD_DIR)/asm/vi/vi3in1_8049a6e0.o \
 $(BUILD_DIR)/asm/gx/GXInit_8049a700.o \
@@ -5185,7 +5183,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \
 $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \
 $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
 $(BUILD_DIR)/asm/src/Table_80556398.o \
-$(BUILD_DIR)/asm/si/SIBios_80556520.o \
 $(BUILD_DIR)/asm/vi/vi_80556528.o \
 $(BUILD_DIR)/asm/vi/i2c_80556548.o \
 $(BUILD_DIR)/asm/vi/vi3in1_80556550.o \
@@ -5639,8 +5636,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \
 $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \
 $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
 $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \
-$(BUILD_DIR)/asm/si/SIBios_8055c8e0.o \
-$(BUILD_DIR)/asm/si/SISamplingRate_8055c8f0.o \
 $(BUILD_DIR)/asm/db/db_8055c8f8.o \
 $(BUILD_DIR)/asm/vi/vi_8055c900.o \
 $(BUILD_DIR)/asm/vi/i2c_8055c9b0.o \