diff --git a/asm/ai/ai_80042860.s b/asm/ai/ai.s
similarity index 93%
rename from asm/ai/ai_80042860.s
rename to asm/ai/ai.s
index ad2fb1f0..ecaccd48 100644
--- a/asm/ai/ai_80042860.s
+++ b/asm/ai/ai.s
@@ -411,3 +411,97 @@ lbl_80042DD4:
 /* 80042E04 0003EC44  38 21 00 20 */	addi r1, r1, 0x20
 /* 80042E08 0003EC48  4E 80 00 20 */	blr
 /* 80042E0C 0003EC4C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@1_80432F40"
+"@1_80432F40":
+
+	.4byte 0x3C3C2052
+	.4byte 0x564C5F53
+	.4byte 0x444B202D
+	.4byte 0x20414920
+	.4byte 0x0972656C
+	.4byte 0x65617365
+	.4byte 0x20627569
+	.4byte 0x6C643A20
+	.4byte 0x41756720
+	.4byte 0x32332032
+	.4byte 0x30313020
+	.4byte 0x31373A32
+	.4byte 0x393A3437
+	.4byte 0x20283078
+	.4byte 0x34333032
+	.4byte 0x5F313435
+	.4byte 0x29203E3E
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __AIVersion
+__AIVersion:
+
+	.4byte "@1_80432F40"
+	.4byte 0
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global __AI_init_flag
+__AI_init_flag:
+	.skip 0x4
+
+.global __AID_Active
+__AID_Active:
+	.skip 0x4
+
+.global buffer
+buffer:
+	.skip 0x4
+
+.global lbl_8055CB4C
+lbl_8055CB4C:
+	.skip 0x4
+
+.global max_wait
+max_wait:
+	.skip 0x4
+
+.global lbl_8055CB54
+lbl_8055CB54:
+	.skip 0x4
+
+.global min_wait
+min_wait:
+	.skip 0x4
+
+.global lbl_8055CB5C
+lbl_8055CB5C:
+	.skip 0x4
+
+.global bound_48KHz
+bound_48KHz:
+	.skip 0x4
+
+.global lbl_8055CB64
+lbl_8055CB64:
+	.skip 0x4
+
+.global bound_32KHz
+bound_32KHz:
+	.skip 0x4
+
+.global lbl_8055CB6C
+lbl_8055CB6C:
+	.skip 0x4
+
+.global __OldStack
+__OldStack:
+	.skip 0x4
+
+.global __CallbackStack
+__CallbackStack:
+	.skip 0x4
+
+.global __AID_Callback
+__AID_Callback:
+	.skip 0x8
diff --git a/asm/ai/ai_80432f40.s b/asm/ai/ai_80432f40.s
deleted file mode 100644
index 76edc608..00000000
--- a/asm/ai/ai_80432f40.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@1_80432F40"
-"@1_80432F40":
-
-	.4byte 0x3C3C2052
-	.4byte 0x564C5F53
-	.4byte 0x444B202D
-	.4byte 0x20414920
-	.4byte 0x0972656C
-	.4byte 0x65617365
-	.4byte 0x20627569
-	.4byte 0x6C643A20
-	.4byte 0x41756720
-	.4byte 0x32332032
-	.4byte 0x30313020
-	.4byte 0x31373A32
-	.4byte 0x393A3437
-	.4byte 0x20283078
-	.4byte 0x34333032
-	.4byte 0x5F313435
-	.4byte 0x29203E3E
-	.4byte 0
diff --git a/asm/ai/ai_80556610.s b/asm/ai/ai_80556610.s
deleted file mode 100644
index a5d08bab..00000000
--- a/asm/ai/ai_80556610.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __AIVersion
-__AIVersion:
-
-	.4byte "@1_80432F40"
-	.4byte 0
diff --git a/asm/ai/ai_8055cb40.s b/asm/ai/ai_8055cb40.s
deleted file mode 100644
index a1ba0a94..00000000
--- a/asm/ai/ai_8055cb40.s
+++ /dev/null
@@ -1,62 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global __AI_init_flag
-__AI_init_flag:
-	.skip 0x4
-
-.global __AID_Active
-__AID_Active:
-	.skip 0x4
-
-.global buffer
-buffer:
-	.skip 0x4
-
-.global lbl_8055CB4C
-lbl_8055CB4C:
-	.skip 0x4
-
-.global max_wait
-max_wait:
-	.skip 0x4
-
-.global lbl_8055CB54
-lbl_8055CB54:
-	.skip 0x4
-
-.global min_wait
-min_wait:
-	.skip 0x4
-
-.global lbl_8055CB5C
-lbl_8055CB5C:
-	.skip 0x4
-
-.global bound_48KHz
-bound_48KHz:
-	.skip 0x4
-
-.global lbl_8055CB64
-lbl_8055CB64:
-	.skip 0x4
-
-.global bound_32KHz
-bound_32KHz:
-	.skip 0x4
-
-.global lbl_8055CB6C
-lbl_8055CB6C:
-	.skip 0x4
-
-.global __OldStack
-__OldStack:
-	.skip 0x4
-
-.global __CallbackStack
-__CallbackStack:
-	.skip 0x4
-
-.global __AID_Callback
-__AID_Callback:
-	.skip 0x8
diff --git a/obj_files.mk b/obj_files.mk
index 96af630c..66402c15 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -189,9 +189,10 @@ $(BUILD_DIR)/asm/dvd/dvdFatal.o \
 $(BUILD_DIR)/asm/dvd/dvdDeviceError.o \
 $(BUILD_DIR)/asm/dvd/dvd_broadway.o \
 \
+$(BUILD_DIR)/asm/ai/ai.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/ai/ai_80042860.o \
 $(BUILD_DIR)/asm/ax/AX_80042e10.o \
 $(BUILD_DIR)/asm/ax/AXAlloc_80042e80.o \
 $(BUILD_DIR)/asm/ax/AXAux_80043370.o \
@@ -3222,7 +3223,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/ai/ai_80432f40.o \
 $(BUILD_DIR)/asm/ax/AX_80432f88.o \
 $(BUILD_DIR)/asm/ax/AXVPB_80432fd0.o \
 $(BUILD_DIR)/asm/ax/AXComp_80433060.o \
@@ -5160,7 +5160,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/ai/ai_80556610.o \
 $(BUILD_DIR)/asm/ax/AX_80556618.o \
 $(BUILD_DIR)/asm/ax/DSPCode_80556620.o \
 $(BUILD_DIR)/asm/axfx/AXFXHooks_80556628.o \
@@ -5601,7 +5600,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/ai/ai_8055cb40.o \
 $(BUILD_DIR)/asm/ax/AX_8055cb80.o \
 $(BUILD_DIR)/asm/ax/AXAlloc_8055cb88.o \
 $(BUILD_DIR)/asm/ax/AXAux_8055cb90.o \