From 0fc8235815339f9b52707e89c4b2f7f7bb13fc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Mon, 17 Oct 2022 09:13:49 +0100
Subject: [PATCH] merge dvd

---
 asm/dvd/{dvd_8003a140.s => dvd.s}             |  528 ++++++++
 ...eviceError_8003ff50.s => dvdDeviceError.s} |  174 +++
 asm/dvd/dvdDeviceError_80407888.s             |   14 -
 asm/dvd/dvdDeviceError_80431ea0.s             |  132 --
 asm/dvd/dvdDeviceError_8049fd40.s             |    6 -
 asm/dvd/dvdDeviceError_805565f8.s             |    8 -
 asm/dvd/dvdDeviceError_8055cb10.s             |    6 -
 asm/dvd/dvdDeviceError_8055e6a0.s             |    8 -
 asm/dvd/{dvdFatal_804316d8.s => dvdFatal.s}   |  165 +++
 asm/dvd/dvdFatal_8003fde0.s                   |  119 --
 asm/dvd/dvdFatal_80407850.s                   |   24 -
 asm/dvd/dvdFatal_805565f0.s                   |    8 -
 asm/dvd/dvdFatal_8055cb08.s                   |    6 -
 asm/dvd/dvdFatal_8055e698.s                   |    8 -
 asm/dvd/dvd_80431260.s                        |  316 -----
 asm/dvd/dvd_8049ae00.s                        |   46 -
 asm/dvd/dvd_805565d8.s                        |   28 -
 asm/dvd/dvd_8055ca60.s                        |  138 ---
 ...dvd_broadway_800401e0.s => dvd_broadway.s} | 1058 +++++++++++++++++
 asm/dvd/dvd_broadway_80432038.s               |  972 ---------------
 asm/dvd/dvd_broadway_8049fd60.s               |   26 -
 asm/dvd/dvd_broadway_80556600.s               |   14 -
 asm/dvd/dvd_broadway_8055cb18.s               |   46 -
 asm/dvd/{dvderror_8003f2d0.s => dvderror.s}   |   50 +
 asm/dvd/dvderror_804316a8.s                   |   22 -
 asm/dvd/dvderror_8049fae0.s                   |   14 -
 asm/dvd/dvderror_8055caf8.s                   |   14 -
 asm/dvd/{dvdfs_800398f0.s => dvdfs.s}         |  148 +++
 asm/dvd/dvdfs_804310f8.s                      |  108 --
 asm/dvd/dvdfs_805565c8.s                      |   14 -
 asm/dvd/dvdfs_8055ca30.s                      |   26 -
 .../{dvdidutils_8003fcf0.s => dvdidutils.s}   |    0
 asm/dvd/{dvdqueue_8003f050.s => dvdqueue.s}   |    6 +
 asm/dvd/dvdqueue_8049fab0.s                   |    6 -
 obj_files.mk                                  |   43 +-
 35 files changed, 2138 insertions(+), 2163 deletions(-)
 rename asm/dvd/{dvd_8003a140.s => dvd.s} (97%)
 rename asm/dvd/{dvdDeviceError_8003ff50.s => dvdDeviceError.s} (75%)
 delete mode 100644 asm/dvd/dvdDeviceError_80407888.s
 delete mode 100644 asm/dvd/dvdDeviceError_80431ea0.s
 delete mode 100644 asm/dvd/dvdDeviceError_8049fd40.s
 delete mode 100644 asm/dvd/dvdDeviceError_805565f8.s
 delete mode 100644 asm/dvd/dvdDeviceError_8055cb10.s
 delete mode 100644 asm/dvd/dvdDeviceError_8055e6a0.s
 rename asm/dvd/{dvdFatal_804316d8.s => dvdFatal.s} (60%)
 delete mode 100644 asm/dvd/dvdFatal_8003fde0.s
 delete mode 100644 asm/dvd/dvdFatal_80407850.s
 delete mode 100644 asm/dvd/dvdFatal_805565f0.s
 delete mode 100644 asm/dvd/dvdFatal_8055cb08.s
 delete mode 100644 asm/dvd/dvdFatal_8055e698.s
 delete mode 100644 asm/dvd/dvd_80431260.s
 delete mode 100644 asm/dvd/dvd_8049ae00.s
 delete mode 100644 asm/dvd/dvd_805565d8.s
 delete mode 100644 asm/dvd/dvd_8055ca60.s
 rename asm/dvd/{dvd_broadway_800401e0.s => dvd_broadway.s} (88%)
 delete mode 100644 asm/dvd/dvd_broadway_80432038.s
 delete mode 100644 asm/dvd/dvd_broadway_8049fd60.s
 delete mode 100644 asm/dvd/dvd_broadway_80556600.s
 delete mode 100644 asm/dvd/dvd_broadway_8055cb18.s
 rename asm/dvd/{dvderror_8003f2d0.s => dvderror.s} (97%)
 delete mode 100644 asm/dvd/dvderror_804316a8.s
 delete mode 100644 asm/dvd/dvderror_8049fae0.s
 delete mode 100644 asm/dvd/dvderror_8055caf8.s
 rename asm/dvd/{dvdfs_800398f0.s => dvdfs.s} (92%)
 delete mode 100644 asm/dvd/dvdfs_804310f8.s
 delete mode 100644 asm/dvd/dvdfs_805565c8.s
 delete mode 100644 asm/dvd/dvdfs_8055ca30.s
 rename asm/dvd/{dvdidutils_8003fcf0.s => dvdidutils.s} (100%)
 rename asm/dvd/{dvdqueue_8003f050.s => dvdqueue.s} (98%)
 delete mode 100644 asm/dvd/dvdqueue_8049fab0.s

diff --git a/asm/dvd/dvd_8003a140.s b/asm/dvd/dvd.s
similarity index 97%
rename from asm/dvd/dvd_8003a140.s
rename to asm/dvd/dvd.s
index 87c9784b..801936de 100644
--- a/asm/dvd/dvd_8003a140.s
+++ b/asm/dvd/dvd.s
@@ -6119,3 +6119,531 @@ __DVDTestAlarm:
 lbl_8003F048:
 /* 8003F048 0003AE88  48 01 4D A8 */	b __wpadNoAlloc
 /* 8003F04C 0003AE8C  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@1_80431260"
+"@1_80431260":
+
+	.4byte 0x3C3C2052
+	.4byte 0x564C5F53
+	.4byte 0x444B202D
+	.4byte 0x20445644
+	.4byte 0x20097265
+	.4byte 0x6C656173
+	.4byte 0x65206275
+	.4byte 0x696C643A
+	.4byte 0x20417567
+	.4byte 0x20323320
+	.4byte 0x32303130
+	.4byte 0x2031373A
+	.4byte 0x33303A30
+	.4byte 0x35202830
+	.4byte 0x78343330
+	.4byte 0x325F3134
+	.4byte 0x3529203E
+	.4byte 0x3E000000
+
+.global "@4255_804312A8"
+"@4255_804312A8":
+
+	.4byte 0x44564443
+	.4byte 0x68616E67
+	.4byte 0x65446973
+	.4byte 0x6B28293A
+	.4byte 0x20465354
+	.4byte 0x20696E20
+	.4byte 0x74686520
+	.4byte 0x6E657720
+	.4byte 0x64697363
+	.4byte 0x20697320
+	.4byte 0x746F6F20
+	.4byte 0x6269672E
+	.4byte 0x20202000
+
+.global "@4490"
+"@4490":
+
+	.4byte lbl_8003C448
+	.4byte lbl_8003C43C
+	.4byte lbl_8003C43C
+	.4byte lbl_8003C448
+	.4byte lbl_8003C3E8
+	.4byte lbl_8003C3E8
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C3E8
+	.4byte lbl_8003C448
+	.4byte lbl_8003C3E8
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C41C
+	.4byte lbl_8003C3E8
+	.4byte lbl_8003C3E8
+	.4byte lbl_8003C424
+	.4byte lbl_8003C424
+	.4byte lbl_8003C3E8
+	.4byte lbl_8003C424
+	.4byte lbl_8003C448
+	.4byte lbl_8003C448
+	.4byte lbl_8003C3E8
+	.4byte lbl_8003C3E8
+
+.global "@4658"
+"@4658":
+
+	.4byte lbl_8003D790
+	.4byte lbl_8003D324
+	.4byte lbl_8003D44C
+	.4byte lbl_8003D468
+	.4byte lbl_8003D324
+	.4byte lbl_8003D300
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D498
+	.4byte lbl_8003D4B8
+	.4byte lbl_8003D480
+	.4byte lbl_8003D4DC
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D790
+	.4byte lbl_8003D4FC
+	.4byte lbl_8003D514
+	.4byte lbl_8003D63C
+	.4byte lbl_8003D668
+	.4byte lbl_8003D690
+	.4byte lbl_8003D6A0
+	.4byte lbl_8003D680
+	.4byte lbl_8003D790
+	.4byte lbl_8003D6BC
+	.4byte lbl_8003D6E8
+	.4byte lbl_8003D75C
+
+.global "@4657"
+"@4657":
+
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D258
+	.4byte lbl_8003D258
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D258
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D258
+	.4byte lbl_8003D258
+	.4byte lbl_8003D258
+	.4byte lbl_8003D258
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D258
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D258
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D2DC
+	.4byte lbl_8003D258
+	.4byte lbl_8003D258
+
+.global ImmCommand
+ImmCommand:
+
+	.4byte 0xFFFFFFFF
+	.4byte 0xFFFFFFFF
+	.4byte 0xFFFFFFFF
+
+.global "@5033_804314EC"
+"@5033_804314EC":
+
+	.4byte lbl_8003E704
+	.4byte lbl_8003E6A4
+	.4byte lbl_8003E6A4
+	.4byte lbl_8003E704
+	.4byte lbl_8003E684
+	.4byte lbl_8003E684
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E684
+	.4byte lbl_8003E704
+	.4byte lbl_8003E684
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E684
+	.4byte lbl_8003E684
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E684
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E704
+	.4byte lbl_8003E684
+	.4byte lbl_8003E684
+
+.global "@5032_80431598"
+"@5032_80431598":
+
+	.4byte lbl_8003E590
+	.4byte lbl_8003E590
+	.4byte lbl_8003E5B0
+	.4byte lbl_8003E614
+	.4byte lbl_8003E660
+	.4byte lbl_8003E730
+	.4byte lbl_8003E730
+	.4byte lbl_8003E730
+	.4byte lbl_8003E730
+	.4byte lbl_8003E87C
+	.4byte lbl_8003E87C
+	.4byte lbl_8003E590
+	.4byte lbl_8003E730
+	.4byte lbl_8003E82C
+
+.global "@5040"
+"@5040":
+
+	.4byte lbl_8003E948
+	.4byte lbl_8003E948
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E948
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E948
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E948
+	.4byte lbl_8003E948
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E948
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E93C
+	.4byte lbl_8003E948
+	.4byte lbl_8003E948
+
+.global "@5139"
+"@5139":
+
+	.4byte lbl_8003EBAC
+	.4byte lbl_8003EBDC
+	.4byte lbl_8003EB7C
+	.4byte lbl_8003EB7C
+	.4byte lbl_8003EBAC
+	.4byte lbl_8003EBAC
+	.4byte lbl_8003EBAC
+	.4byte lbl_8003EBAC
+	.4byte lbl_8003EBAC
+	.4byte lbl_8003EBDC
+	.4byte lbl_8003EB7C
+	.4byte lbl_8003EB7C
+	.4byte lbl_8003EBAC
+	.4byte lbl_8003EBAC
+	.4byte 0
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global __DVDTicketViewBuffer
+__DVDTicketViewBuffer:
+	.skip 0x100
+
+.global __DVDTmdBuffer
+__DVDTmdBuffer:
+	.skip 0x4A00
+
+.global BB2
+BB2:
+	.skip 0x20
+
+.global DummyCommandBlock
+DummyCommandBlock:
+	.skip 0x30
+
+.global FatalAlarm
+FatalAlarm:
+	.skip 0x30
+
+.global CoverAlarm
+CoverAlarm:
+	.skip 0x40
+
+.global CurrDiskID
+CurrDiskID:
+	.skip 0x20
+
+.global __DVDGameTocBuffer
+__DVDGameTocBuffer:
+	.skip 0x20
+
+.global __DVDPartInfoBuffer
+__DVDPartInfoBuffer:
+	.skip 0x20
+
+.global ResetAlarm
+ResetAlarm:
+	.skip 0x30
+
+.global __DVDStopMotorCommandBlock
+__DVDStopMotorCommandBlock:
+	.skip 0x60
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __DVDVersion
+__DVDVersion:
+
+	.4byte "@1_80431260"
+
+.global autoInvalidation
+autoInvalidation:
+
+	.4byte 0x00000001
+
+.global checkOptionalCommand
+checkOptionalCommand:
+
+	.4byte defaultOptionalCommandChecker
+
+.global "@4254_805565E4"
+"@4254_805565E4":
+
+	.4byte 0x6476642E
+	.4byte 0x63000000
+
+.global DmaCommand
+DmaCommand:
+
+	.4byte 0xFFFFFFFF
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global CommandInfoCounter
+CommandInfoCounter:
+	.skip 0x4
+
+.global PauseFlag
+PauseFlag:
+	.skip 0x4
+
+.global PausingFlag
+PausingFlag:
+	.skip 0x4
+
+.global FatalErrorFlag
+FatalErrorFlag:
+	.skip 0x4
+
+.global Canceling
+Canceling:
+	.skip 0x4
+
+.global ResumeFromHere
+ResumeFromHere:
+	.skip 0x4
+
+.global NumInternalRetry
+NumInternalRetry:
+	.skip 0x4
+
+.global FirstTimeInBootrom
+FirstTimeInBootrom:
+	.skip 0x4
+
+.global Breaking
+Breaking:
+	.skip 0x4
+
+.global WaitingForCoverOpen
+WaitingForCoverOpen:
+	.skip 0x4
+
+.global WaitingForCoverClose
+WaitingForCoverClose:
+	.skip 0x4
+
+.global MotorStopped
+MotorStopped:
+	.skip 0x4
+
+.global ChangedDisc
+ChangedDisc:
+	.skip 0x4
+
+.global PreparingCover
+PreparingCover:
+	.skip 0x4
+
+.global __DVDLayoutFormat
+__DVDLayoutFormat:
+	.skip 0x4
+
+.global DVDInitialized
+DVDInitialized:
+	.skip 0x4
+
+.global __BS2DVDLowIntType
+__BS2DVDLowIntType:
+	.skip 0x4
+
+.global Prepared_8055CAA4
+Prepared_8055CAA4:
+	.skip 0x4
+
+.global BootGameInfo
+BootGameInfo:
+	.skip 0x4
+
+.global PartInfo
+PartInfo:
+	.skip 0x4
+
+.global GameToc
+GameToc:
+	.skip 0x10
+
+.global __DVDNumTmdBytes
+__DVDNumTmdBytes:
+	.skip 0x8
+
+.global LastResetEnd
+LastResetEnd:
+	.skip 0x4
+
+.global lbl_8055CACC
+lbl_8055CACC:
+	.skip 0x4
+
+.global MotorState
+MotorState:
+	.skip 0x4
+
+.global ResetRequired
+ResetRequired:
+	.skip 0x4
+
+.global LastError
+LastError:
+	.skip 0x4
+
+.global CancelLastError
+CancelLastError:
+	.skip 0x4
+
+.global CancelCallback
+CancelCallback:
+	.skip 0x4
+
+.global CurrCommand
+CurrCommand:
+	.skip 0x4
+
+.global bootInfo
+bootInfo:
+	.skip 0x4
+
+.global IDShouldBe
+IDShouldBe:
+	.skip 0x4
+
+.global executing
+executing:
+	.skip 0x4
+
+.global LastState
+LastState:
+	.skip 0x4
diff --git a/asm/dvd/dvdDeviceError_8003ff50.s b/asm/dvd/dvdDeviceError.s
similarity index 75%
rename from asm/dvd/dvdDeviceError_8003ff50.s
rename to asm/dvd/dvdDeviceError.s
index 7ee236fa..16350e4a 100644
--- a/asm/dvd/dvdDeviceError_8003ff50.s
+++ b/asm/dvd/dvdDeviceError.s
@@ -213,3 +213,177 @@ lbl_800401C0:
 /* 800401D4 0003C014  38 21 00 30 */	addi r1, r1, 0x30
 /* 800401D8 0003C018  4E 80 00 20 */	blr
 /* 800401DC 0003C01C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global __DVDDeviceErrorMessage
+__DVDDeviceErrorMessage:
+
+	.4byte "@835_80431EA0"
+	.4byte "@836_80431EDC"
+	.4byte "@837_80431F14"
+	.4byte "@838_80431F54"
+	.4byte "@839_80431F90"
+	.4byte "@840_80431FCC"
+	.4byte "@841_80432008"
+	.4byte 0
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@835_80431EA0"
+"@835_80431EA0":
+
+	.4byte 0x0A0A0A83
+	.4byte 0x47838981
+	.4byte 0x5B835281
+	.4byte 0x5B836882
+	.4byte 0x4F824F82
+	.4byte 0x5081420A
+	.4byte 0x957396BE
+	.4byte 0x82C88366
+	.4byte 0x836F8343
+	.4byte 0x835882AA
+	.4byte 0x8CA982C2
+	.4byte 0x82A982E8
+	.4byte 0x82DC82B5
+	.4byte 0x82BD8142
+	.4byte 0
+
+.global "@836_80431EDC"
+"@836_80431EDC":
+
+	.4byte 0x0A0A0A45
+	.4byte 0x72726F72
+	.4byte 0x20233030
+	.4byte 0x312C0A75
+	.4byte 0x6E617574
+	.4byte 0x686F7269
+	.4byte 0x7A656420
+	.4byte 0x64657669
+	.4byte 0x63652068
+	.4byte 0x61732062
+	.4byte 0x65656E20
+	.4byte 0x64657465
+	.4byte 0x63746564
+	.4byte 0x2E000000
+
+.global "@837_80431F14"
+"@837_80431F14":
+
+	.4byte 0x0A0A0A46
+	.4byte 0x65686C65
+	.4byte 0x72202330
+	.4byte 0x30313A0A
+	.4byte 0x45732077
+	.4byte 0x75726465
+	.4byte 0x2065696E
+	.4byte 0x6520756E
+	.4byte 0x7A756CE4
+	.4byte 0x73736967
+	.4byte 0x65204B6F
+	.4byte 0x6D706F6E
+	.4byte 0x656E7465
+	.4byte 0x0A656E74
+	.4byte 0x6465636B
+	.4byte 0x742E0000
+
+.global "@838_80431F54"
+"@838_80431F54":
+
+	.4byte 0x0A0A0A45
+	.4byte 0x72726575
+	.4byte 0x72203030
+	.4byte 0x313A0A75
+	.4byte 0x6E206469
+	.4byte 0x73706F73
+	.4byte 0x69746966
+	.4byte 0x206E6F6E
+	.4byte 0x20617574
+	.4byte 0x6F726973
+	.4byte 0xE9206120
+	.4byte 0xE974E920
+	.4byte 0x64E97465
+	.4byte 0x6374E92E
+	.4byte 0
+
+.global "@839_80431F90"
+"@839_80431F90":
+
+	.4byte 0x0A0A0A45
+	.4byte 0x72726F72
+	.4byte 0x20303031
+	.4byte 0x3A0A5365
+	.4byte 0x20686120
+	.4byte 0x64657465
+	.4byte 0x63746164
+	.4byte 0x6F20756E
+	.4byte 0x20646973
+	.4byte 0x706F7369
+	.4byte 0x7469766F
+	.4byte 0x206E6F0A
+	.4byte 0x6175746F
+	.4byte 0x72697A61
+	.4byte 0x646F2E00
+
+.global "@840_80431FCC"
+"@840_80431FCC":
+
+	.4byte 0x0A0A0A45
+	.4byte 0x72726F72
+	.4byte 0x65202330
+	.4byte 0x30313A0A
+	.4byte 0x72696C65
+	.4byte 0x7661746F
+	.4byte 0x20756E20
+	.4byte 0x64697370
+	.4byte 0x6F736974
+	.4byte 0x69766F20
+	.4byte 0x6E6F6E20
+	.4byte 0x6175746F
+	.4byte 0x72697A7A
+	.4byte 0x61746F2E
+	.4byte 0
+
+.global "@841_80432008"
+"@841_80432008":
+
+	.4byte 0x0A0A0A46
+	.4byte 0x6F757420
+	.4byte 0x23303031
+	.4byte 0x3A0A6F6E
+	.4byte 0x67656F6F
+	.4byte 0x726C6F6F
+	.4byte 0x6664206F
+	.4byte 0x6E646572
+	.4byte 0x6465656C
+	.4byte 0x20676576
+	.4byte 0x6F6E6465
+	.4byte 0x6E2E0000
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global CheckBuffer
+CheckBuffer:
+	.skip 0x20
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global lowDone
+lowDone:
+
+	.4byte 0x00000001
+	.4byte 0
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global lowIntType
+lowIntType:
+	.skip 0x8
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@850_8055E6A0"
+"@850_8055E6A0":
+
+	.4byte 0xFFFFFF00
+	.4byte 0
diff --git a/asm/dvd/dvdDeviceError_80407888.s b/asm/dvd/dvdDeviceError_80407888.s
deleted file mode 100644
index 8df91718..00000000
--- a/asm/dvd/dvdDeviceError_80407888.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global __DVDDeviceErrorMessage
-__DVDDeviceErrorMessage:
-
-	.4byte "@835_80431EA0"
-	.4byte "@836_80431EDC"
-	.4byte "@837_80431F14"
-	.4byte "@838_80431F54"
-	.4byte "@839_80431F90"
-	.4byte "@840_80431FCC"
-	.4byte "@841_80432008"
-	.4byte 0
diff --git a/asm/dvd/dvdDeviceError_80431ea0.s b/asm/dvd/dvdDeviceError_80431ea0.s
deleted file mode 100644
index 3dfd30eb..00000000
--- a/asm/dvd/dvdDeviceError_80431ea0.s
+++ /dev/null
@@ -1,132 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@835_80431EA0"
-"@835_80431EA0":
-
-	.4byte 0x0A0A0A83
-	.4byte 0x47838981
-	.4byte 0x5B835281
-	.4byte 0x5B836882
-	.4byte 0x4F824F82
-	.4byte 0x5081420A
-	.4byte 0x957396BE
-	.4byte 0x82C88366
-	.4byte 0x836F8343
-	.4byte 0x835882AA
-	.4byte 0x8CA982C2
-	.4byte 0x82A982E8
-	.4byte 0x82DC82B5
-	.4byte 0x82BD8142
-	.4byte 0
-
-.global "@836_80431EDC"
-"@836_80431EDC":
-
-	.4byte 0x0A0A0A45
-	.4byte 0x72726F72
-	.4byte 0x20233030
-	.4byte 0x312C0A75
-	.4byte 0x6E617574
-	.4byte 0x686F7269
-	.4byte 0x7A656420
-	.4byte 0x64657669
-	.4byte 0x63652068
-	.4byte 0x61732062
-	.4byte 0x65656E20
-	.4byte 0x64657465
-	.4byte 0x63746564
-	.4byte 0x2E000000
-
-.global "@837_80431F14"
-"@837_80431F14":
-
-	.4byte 0x0A0A0A46
-	.4byte 0x65686C65
-	.4byte 0x72202330
-	.4byte 0x30313A0A
-	.4byte 0x45732077
-	.4byte 0x75726465
-	.4byte 0x2065696E
-	.4byte 0x6520756E
-	.4byte 0x7A756CE4
-	.4byte 0x73736967
-	.4byte 0x65204B6F
-	.4byte 0x6D706F6E
-	.4byte 0x656E7465
-	.4byte 0x0A656E74
-	.4byte 0x6465636B
-	.4byte 0x742E0000
-
-.global "@838_80431F54"
-"@838_80431F54":
-
-	.4byte 0x0A0A0A45
-	.4byte 0x72726575
-	.4byte 0x72203030
-	.4byte 0x313A0A75
-	.4byte 0x6E206469
-	.4byte 0x73706F73
-	.4byte 0x69746966
-	.4byte 0x206E6F6E
-	.4byte 0x20617574
-	.4byte 0x6F726973
-	.4byte 0xE9206120
-	.4byte 0xE974E920
-	.4byte 0x64E97465
-	.4byte 0x6374E92E
-	.4byte 0
-
-.global "@839_80431F90"
-"@839_80431F90":
-
-	.4byte 0x0A0A0A45
-	.4byte 0x72726F72
-	.4byte 0x20303031
-	.4byte 0x3A0A5365
-	.4byte 0x20686120
-	.4byte 0x64657465
-	.4byte 0x63746164
-	.4byte 0x6F20756E
-	.4byte 0x20646973
-	.4byte 0x706F7369
-	.4byte 0x7469766F
-	.4byte 0x206E6F0A
-	.4byte 0x6175746F
-	.4byte 0x72697A61
-	.4byte 0x646F2E00
-
-.global "@840_80431FCC"
-"@840_80431FCC":
-
-	.4byte 0x0A0A0A45
-	.4byte 0x72726F72
-	.4byte 0x65202330
-	.4byte 0x30313A0A
-	.4byte 0x72696C65
-	.4byte 0x7661746F
-	.4byte 0x20756E20
-	.4byte 0x64697370
-	.4byte 0x6F736974
-	.4byte 0x69766F20
-	.4byte 0x6E6F6E20
-	.4byte 0x6175746F
-	.4byte 0x72697A7A
-	.4byte 0x61746F2E
-	.4byte 0
-
-.global "@841_80432008"
-"@841_80432008":
-
-	.4byte 0x0A0A0A46
-	.4byte 0x6F757420
-	.4byte 0x23303031
-	.4byte 0x3A0A6F6E
-	.4byte 0x67656F6F
-	.4byte 0x726C6F6F
-	.4byte 0x6664206F
-	.4byte 0x6E646572
-	.4byte 0x6465656C
-	.4byte 0x20676576
-	.4byte 0x6F6E6465
-	.4byte 0x6E2E0000
diff --git a/asm/dvd/dvdDeviceError_8049fd40.s b/asm/dvd/dvdDeviceError_8049fd40.s
deleted file mode 100644
index a7f9c386..00000000
--- a/asm/dvd/dvdDeviceError_8049fd40.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global CheckBuffer
-CheckBuffer:
-	.skip 0x20
diff --git a/asm/dvd/dvdDeviceError_805565f8.s b/asm/dvd/dvdDeviceError_805565f8.s
deleted file mode 100644
index 405e17f7..00000000
--- a/asm/dvd/dvdDeviceError_805565f8.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global lowDone
-lowDone:
-
-	.4byte 0x00000001
-	.4byte 0
diff --git a/asm/dvd/dvdDeviceError_8055cb10.s b/asm/dvd/dvdDeviceError_8055cb10.s
deleted file mode 100644
index a865f21a..00000000
--- a/asm/dvd/dvdDeviceError_8055cb10.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global lowIntType
-lowIntType:
-	.skip 0x8
diff --git a/asm/dvd/dvdDeviceError_8055e6a0.s b/asm/dvd/dvdDeviceError_8055e6a0.s
deleted file mode 100644
index 175fe570..00000000
--- a/asm/dvd/dvdDeviceError_8055e6a0.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@850_8055E6A0"
-"@850_8055E6A0":
-
-	.4byte 0xFFFFFF00
-	.4byte 0
diff --git a/asm/dvd/dvdFatal_804316d8.s b/asm/dvd/dvdFatal.s
similarity index 60%
rename from asm/dvd/dvdFatal_804316d8.s
rename to asm/dvd/dvdFatal.s
index baa25ee4..8222f651 100644
--- a/asm/dvd/dvdFatal_804316d8.s
+++ b/asm/dvd/dvdFatal.s
@@ -1,5 +1,148 @@
 .include "macros.inc"
 
+.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
+.global __DVDShowFatalMessage
+__DVDShowFatalMessage:
+/* 8003FDE0 0003BC20  94 21 FF E0 */	stwu r1, -0x20(r1)
+/* 8003FDE4 0003BC24  7C 08 02 A6 */	mflr r0
+/* 8003FDE8 0003BC28  90 01 00 24 */	stw r0, 0x24(r1)
+/* 8003FDEC 0003BC2C  93 E1 00 1C */	stw r31, 0x1c(r1)
+/* 8003FDF0 0003BC30  3B E0 00 00 */	li r31, 0x0
+/* 8003FDF4 0003BC34  93 C1 00 18 */	stw r30, 0x18(r1)
+/* 8003FDF8 0003BC38  83 C2 87 18 */	lwz r30, "@1482"@sda21(r2)
+/* 8003FDFC 0003BC3C  93 A1 00 14 */	stw r29, 0x14(r1)
+/* 8003FE00 0003BC40  48 00 D0 31 */	bl SCGetLanguage
+/* 8003FE04 0003BC44  54 60 06 3F */	clrlwi. r0, r3, 24
+/* 8003FE08 0003BC48  40 82 00 10 */	bne lbl_8003FE18
+/* 8003FE0C 0003BC4C  38 60 00 01 */	li r3, 0x1
+/* 8003FE10 0003BC50  4B FE 09 C1 */	bl OSSetFontEncode
+/* 8003FE14 0003BC54  48 00 00 0C */	b lbl_8003FE20
+.global lbl_8003FE18
+lbl_8003FE18:
+/* 8003FE18 0003BC58  38 60 00 00 */	li r3, 0x0
+/* 8003FE1C 0003BC5C  4B FE 09 B5 */	bl OSSetFontEncode
+.global lbl_8003FE20
+lbl_8003FE20:
+/* 8003FE20 0003BC60  48 00 D5 D1 */	bl SCGetProductGameRegion
+/* 8003FE24 0003BC64  7C 63 07 74 */	extsb r3, r3
+/* 8003FE28 0003BC68  38 03 FF FC */	addi r0, r3, -0x4
+/* 8003FE2C 0003BC6C  28 00 00 01 */	cmplwi r0, 0x1
+/* 8003FE30 0003BC70  40 81 00 24 */	ble lbl_8003FE54
+/* 8003FE34 0003BC74  2C 03 00 02 */	cmpwi r3, 0x2
+/* 8003FE38 0003BC78  41 82 00 10 */	beq lbl_8003FE48
+/* 8003FE3C 0003BC7C  3F A0 80 40 */	lis r29, __DVDErrorMessageDefault@ha
+/* 8003FE40 0003BC80  3B BD 78 50 */	addi r29, r29, __DVDErrorMessageDefault@l
+/* 8003FE44 0003BC84  48 00 00 14 */	b lbl_8003FE58
+.global lbl_8003FE48
+lbl_8003FE48:
+/* 8003FE48 0003BC88  3F A0 80 40 */	lis r29, __DVDErrorMessageEurope@ha
+/* 8003FE4C 0003BC8C  3B BD 78 6C */	addi r29, r29, __DVDErrorMessageEurope@l
+/* 8003FE50 0003BC90  48 00 00 08 */	b lbl_8003FE58
+.global lbl_8003FE54
+lbl_8003FE54:
+/* 8003FE54 0003BC94  3B AD 81 D0 */	addi r29, r13, __DVDErrorMessageChinaKorea@sda21
+.global lbl_8003FE58
+lbl_8003FE58:
+/* 8003FE58 0003BC98  48 00 CF D9 */	bl SCGetLanguage
+/* 8003FE5C 0003BC9C  54 60 06 3E */	clrlwi r0, r3, 24
+/* 8003FE60 0003BCA0  28 00 00 06 */	cmplwi r0, 0x6
+/* 8003FE64 0003BCA4  40 81 00 0C */	ble lbl_8003FE70
+/* 8003FE68 0003BCA8  80 BD 00 04 */	lwz r5, 0x4(r29)
+/* 8003FE6C 0003BCAC  48 00 00 10 */	b lbl_8003FE7C
+.global lbl_8003FE70
+lbl_8003FE70:
+/* 8003FE70 0003BCB0  48 00 CF C1 */	bl SCGetLanguage
+/* 8003FE74 0003BCB4  54 60 15 BA */	rlwinm r0, r3, 2, 22, 29
+/* 8003FE78 0003BCB8  7C BD 00 2E */	lwzx r5, r29, r0
+.global lbl_8003FE7C
+lbl_8003FE7C:
+/* 8003FE7C 0003BCBC  93 E1 00 08 */	stw r31, 0x8(r1)
+/* 8003FE80 0003BCC0  38 61 00 0C */	addi r3, r1, 0xc
+/* 8003FE84 0003BCC4  38 81 00 08 */	addi r4, r1, 0x8
+/* 8003FE88 0003BCC8  93 C1 00 0C */	stw r30, 0xc(r1)
+/* 8003FE8C 0003BCCC  4B FD FE 25 */	bl OSFatal
+/* 8003FE90 0003BCD0  80 01 00 24 */	lwz r0, 0x24(r1)
+/* 8003FE94 0003BCD4  83 E1 00 1C */	lwz r31, 0x1c(r1)
+/* 8003FE98 0003BCD8  83 C1 00 18 */	lwz r30, 0x18(r1)
+/* 8003FE9C 0003BCDC  83 A1 00 14 */	lwz r29, 0x14(r1)
+/* 8003FEA0 0003BCE0  7C 08 03 A6 */	mtlr r0
+/* 8003FEA4 0003BCE4  38 21 00 20 */	addi r1, r1, 0x20
+/* 8003FEA8 0003BCE8  4E 80 00 20 */	blr
+/* 8003FEAC 0003BCEC  00 00 00 00 */	.4byte 0x00000000
+.global DVDSetAutoFatalMessaging
+DVDSetAutoFatalMessaging:
+/* 8003FEB0 0003BCF0  94 21 FF F0 */	stwu r1, -0x10(r1)
+/* 8003FEB4 0003BCF4  7C 08 02 A6 */	mflr r0
+/* 8003FEB8 0003BCF8  90 01 00 14 */	stw r0, 0x14(r1)
+/* 8003FEBC 0003BCFC  93 E1 00 0C */	stw r31, 0xc(r1)
+/* 8003FEC0 0003BD00  7C 7F 1B 78 */	mr r31, r3
+/* 8003FEC4 0003BD04  4B FE 19 5D */	bl OSDisableInterrupts
+/* 8003FEC8 0003BD08  80 AD E6 E8 */	lwz r5, FatalFunc@sda21(r13)
+/* 8003FECC 0003BD0C  2C 1F 00 00 */	cmpwi r31, 0x0
+/* 8003FED0 0003BD10  38 80 00 00 */	li r4, 0x0
+/* 8003FED4 0003BD14  7C 05 00 D0 */	neg r0, r5
+/* 8003FED8 0003BD18  7C 00 2B 78 */	or r0, r0, r5
+/* 8003FEDC 0003BD1C  54 1F 0F FE */	srwi r31, r0, 31
+/* 8003FEE0 0003BD20  41 82 00 0C */	beq lbl_8003FEEC
+/* 8003FEE4 0003BD24  3C 80 80 04 */	lis r4, __DVDShowFatalMessage@ha
+/* 8003FEE8 0003BD28  38 84 FD E0 */	addi r4, r4, __DVDShowFatalMessage@l
+.global lbl_8003FEEC
+lbl_8003FEEC:
+/* 8003FEEC 0003BD2C  90 8D E6 E8 */	stw r4, FatalFunc@sda21(r13)
+/* 8003FEF0 0003BD30  4B FE 19 71 */	bl OSRestoreInterrupts
+/* 8003FEF4 0003BD34  7F E3 FB 78 */	mr r3, r31
+/* 8003FEF8 0003BD38  83 E1 00 0C */	lwz r31, 0xc(r1)
+/* 8003FEFC 0003BD3C  80 01 00 14 */	lwz r0, 0x14(r1)
+/* 8003FF00 0003BD40  7C 08 03 A6 */	mtlr r0
+/* 8003FF04 0003BD44  38 21 00 10 */	addi r1, r1, 0x10
+/* 8003FF08 0003BD48  4E 80 00 20 */	blr
+/* 8003FF0C 0003BD4C  00 00 00 00 */	.4byte 0x00000000
+.global __DVDGetAutoFatalMessaging
+__DVDGetAutoFatalMessaging:
+/* 8003FF10 0003BD50  80 6D E6 E8 */	lwz r3, FatalFunc@sda21(r13)
+/* 8003FF14 0003BD54  7C 03 00 D0 */	neg r0, r3
+/* 8003FF18 0003BD58  7C 00 1B 78 */	or r0, r0, r3
+/* 8003FF1C 0003BD5C  54 03 0F FE */	srwi r3, r0, 31
+/* 8003FF20 0003BD60  4E 80 00 20 */	blr
+/* 8003FF24 0003BD64  00 00 00 00 */	.4byte 0x00000000
+/* 8003FF28 0003BD68  00 00 00 00 */	.4byte 0x00000000
+/* 8003FF2C 0003BD6C  00 00 00 00 */	.4byte 0x00000000
+.global __DVDPrintFatalMessage
+__DVDPrintFatalMessage:
+/* 8003FF30 0003BD70  81 8D E6 E8 */	lwz r12, FatalFunc@sda21(r13)
+/* 8003FF34 0003BD74  2C 0C 00 00 */	cmpwi r12, 0x0
+/* 8003FF38 0003BD78  4D 82 00 20 */	beqlr
+/* 8003FF3C 0003BD7C  7D 89 03 A6 */	mtctr r12
+/* 8003FF40 0003BD80  4E 80 04 20 */	bctr
+/* 8003FF44 0003BD84  4E 80 00 20 */	blr
+/* 8003FF48 0003BD88  00 00 00 00 */	.4byte 0x00000000
+/* 8003FF4C 0003BD8C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global __DVDErrorMessageDefault
+__DVDErrorMessageDefault:
+
+	.4byte "@1462_804316D8"
+	.4byte "@1463"
+	.4byte "@1464"
+	.4byte "@1465_804318D0"
+	.4byte "@1466"
+	.4byte "@1467"
+	.4byte "@1468"
+
+.global __DVDErrorMessageEurope
+__DVDErrorMessageEurope:
+
+	.4byte "@1462_804316D8"
+	.4byte "@1469"
+	.4byte "@1464"
+	.4byte "@1470"
+	.4byte "@1471"
+	.4byte "@1467"
+	.4byte "@1468"
+.include "macros.inc"
+
 .section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
 .global "@1462_804316D8"
 "@1462_804316D8":
@@ -546,3 +689,25 @@
 	.4byte 0x666F726D
 	.4byte 0x6174696F
 	.4byte 0x6E2E0000
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __DVDErrorMessageChinaKorea
+__DVDErrorMessageChinaKorea:
+
+	.4byte "@1472"
+	.4byte "@1473"
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global FatalFunc
+FatalFunc:
+	.skip 0x8
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "@1482"
+"@1482":
+
+	.4byte 0xFFFFFF00
+	.4byte 0
diff --git a/asm/dvd/dvdFatal_8003fde0.s b/asm/dvd/dvdFatal_8003fde0.s
deleted file mode 100644
index a734db3e..00000000
--- a/asm/dvd/dvdFatal_8003fde0.s
+++ /dev/null
@@ -1,119 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
-.global __DVDShowFatalMessage
-__DVDShowFatalMessage:
-/* 8003FDE0 0003BC20  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 8003FDE4 0003BC24  7C 08 02 A6 */	mflr r0
-/* 8003FDE8 0003BC28  90 01 00 24 */	stw r0, 0x24(r1)
-/* 8003FDEC 0003BC2C  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 8003FDF0 0003BC30  3B E0 00 00 */	li r31, 0x0
-/* 8003FDF4 0003BC34  93 C1 00 18 */	stw r30, 0x18(r1)
-/* 8003FDF8 0003BC38  83 C2 87 18 */	lwz r30, "@1482"@sda21(r2)
-/* 8003FDFC 0003BC3C  93 A1 00 14 */	stw r29, 0x14(r1)
-/* 8003FE00 0003BC40  48 00 D0 31 */	bl SCGetLanguage
-/* 8003FE04 0003BC44  54 60 06 3F */	clrlwi. r0, r3, 24
-/* 8003FE08 0003BC48  40 82 00 10 */	bne lbl_8003FE18
-/* 8003FE0C 0003BC4C  38 60 00 01 */	li r3, 0x1
-/* 8003FE10 0003BC50  4B FE 09 C1 */	bl OSSetFontEncode
-/* 8003FE14 0003BC54  48 00 00 0C */	b lbl_8003FE20
-.global lbl_8003FE18
-lbl_8003FE18:
-/* 8003FE18 0003BC58  38 60 00 00 */	li r3, 0x0
-/* 8003FE1C 0003BC5C  4B FE 09 B5 */	bl OSSetFontEncode
-.global lbl_8003FE20
-lbl_8003FE20:
-/* 8003FE20 0003BC60  48 00 D5 D1 */	bl SCGetProductGameRegion
-/* 8003FE24 0003BC64  7C 63 07 74 */	extsb r3, r3
-/* 8003FE28 0003BC68  38 03 FF FC */	addi r0, r3, -0x4
-/* 8003FE2C 0003BC6C  28 00 00 01 */	cmplwi r0, 0x1
-/* 8003FE30 0003BC70  40 81 00 24 */	ble lbl_8003FE54
-/* 8003FE34 0003BC74  2C 03 00 02 */	cmpwi r3, 0x2
-/* 8003FE38 0003BC78  41 82 00 10 */	beq lbl_8003FE48
-/* 8003FE3C 0003BC7C  3F A0 80 40 */	lis r29, __DVDErrorMessageDefault@ha
-/* 8003FE40 0003BC80  3B BD 78 50 */	addi r29, r29, __DVDErrorMessageDefault@l
-/* 8003FE44 0003BC84  48 00 00 14 */	b lbl_8003FE58
-.global lbl_8003FE48
-lbl_8003FE48:
-/* 8003FE48 0003BC88  3F A0 80 40 */	lis r29, __DVDErrorMessageEurope@ha
-/* 8003FE4C 0003BC8C  3B BD 78 6C */	addi r29, r29, __DVDErrorMessageEurope@l
-/* 8003FE50 0003BC90  48 00 00 08 */	b lbl_8003FE58
-.global lbl_8003FE54
-lbl_8003FE54:
-/* 8003FE54 0003BC94  3B AD 81 D0 */	addi r29, r13, __DVDErrorMessageChinaKorea@sda21
-.global lbl_8003FE58
-lbl_8003FE58:
-/* 8003FE58 0003BC98  48 00 CF D9 */	bl SCGetLanguage
-/* 8003FE5C 0003BC9C  54 60 06 3E */	clrlwi r0, r3, 24
-/* 8003FE60 0003BCA0  28 00 00 06 */	cmplwi r0, 0x6
-/* 8003FE64 0003BCA4  40 81 00 0C */	ble lbl_8003FE70
-/* 8003FE68 0003BCA8  80 BD 00 04 */	lwz r5, 0x4(r29)
-/* 8003FE6C 0003BCAC  48 00 00 10 */	b lbl_8003FE7C
-.global lbl_8003FE70
-lbl_8003FE70:
-/* 8003FE70 0003BCB0  48 00 CF C1 */	bl SCGetLanguage
-/* 8003FE74 0003BCB4  54 60 15 BA */	rlwinm r0, r3, 2, 22, 29
-/* 8003FE78 0003BCB8  7C BD 00 2E */	lwzx r5, r29, r0
-.global lbl_8003FE7C
-lbl_8003FE7C:
-/* 8003FE7C 0003BCBC  93 E1 00 08 */	stw r31, 0x8(r1)
-/* 8003FE80 0003BCC0  38 61 00 0C */	addi r3, r1, 0xc
-/* 8003FE84 0003BCC4  38 81 00 08 */	addi r4, r1, 0x8
-/* 8003FE88 0003BCC8  93 C1 00 0C */	stw r30, 0xc(r1)
-/* 8003FE8C 0003BCCC  4B FD FE 25 */	bl OSFatal
-/* 8003FE90 0003BCD0  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 8003FE94 0003BCD4  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 8003FE98 0003BCD8  83 C1 00 18 */	lwz r30, 0x18(r1)
-/* 8003FE9C 0003BCDC  83 A1 00 14 */	lwz r29, 0x14(r1)
-/* 8003FEA0 0003BCE0  7C 08 03 A6 */	mtlr r0
-/* 8003FEA4 0003BCE4  38 21 00 20 */	addi r1, r1, 0x20
-/* 8003FEA8 0003BCE8  4E 80 00 20 */	blr
-/* 8003FEAC 0003BCEC  00 00 00 00 */	.4byte 0x00000000
-.global DVDSetAutoFatalMessaging
-DVDSetAutoFatalMessaging:
-/* 8003FEB0 0003BCF0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8003FEB4 0003BCF4  7C 08 02 A6 */	mflr r0
-/* 8003FEB8 0003BCF8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8003FEBC 0003BCFC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8003FEC0 0003BD00  7C 7F 1B 78 */	mr r31, r3
-/* 8003FEC4 0003BD04  4B FE 19 5D */	bl OSDisableInterrupts
-/* 8003FEC8 0003BD08  80 AD E6 E8 */	lwz r5, FatalFunc@sda21(r13)
-/* 8003FECC 0003BD0C  2C 1F 00 00 */	cmpwi r31, 0x0
-/* 8003FED0 0003BD10  38 80 00 00 */	li r4, 0x0
-/* 8003FED4 0003BD14  7C 05 00 D0 */	neg r0, r5
-/* 8003FED8 0003BD18  7C 00 2B 78 */	or r0, r0, r5
-/* 8003FEDC 0003BD1C  54 1F 0F FE */	srwi r31, r0, 31
-/* 8003FEE0 0003BD20  41 82 00 0C */	beq lbl_8003FEEC
-/* 8003FEE4 0003BD24  3C 80 80 04 */	lis r4, __DVDShowFatalMessage@ha
-/* 8003FEE8 0003BD28  38 84 FD E0 */	addi r4, r4, __DVDShowFatalMessage@l
-.global lbl_8003FEEC
-lbl_8003FEEC:
-/* 8003FEEC 0003BD2C  90 8D E6 E8 */	stw r4, FatalFunc@sda21(r13)
-/* 8003FEF0 0003BD30  4B FE 19 71 */	bl OSRestoreInterrupts
-/* 8003FEF4 0003BD34  7F E3 FB 78 */	mr r3, r31
-/* 8003FEF8 0003BD38  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8003FEFC 0003BD3C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8003FF00 0003BD40  7C 08 03 A6 */	mtlr r0
-/* 8003FF04 0003BD44  38 21 00 10 */	addi r1, r1, 0x10
-/* 8003FF08 0003BD48  4E 80 00 20 */	blr
-/* 8003FF0C 0003BD4C  00 00 00 00 */	.4byte 0x00000000
-.global __DVDGetAutoFatalMessaging
-__DVDGetAutoFatalMessaging:
-/* 8003FF10 0003BD50  80 6D E6 E8 */	lwz r3, FatalFunc@sda21(r13)
-/* 8003FF14 0003BD54  7C 03 00 D0 */	neg r0, r3
-/* 8003FF18 0003BD58  7C 00 1B 78 */	or r0, r0, r3
-/* 8003FF1C 0003BD5C  54 03 0F FE */	srwi r3, r0, 31
-/* 8003FF20 0003BD60  4E 80 00 20 */	blr
-/* 8003FF24 0003BD64  00 00 00 00 */	.4byte 0x00000000
-/* 8003FF28 0003BD68  00 00 00 00 */	.4byte 0x00000000
-/* 8003FF2C 0003BD6C  00 00 00 00 */	.4byte 0x00000000
-.global __DVDPrintFatalMessage
-__DVDPrintFatalMessage:
-/* 8003FF30 0003BD70  81 8D E6 E8 */	lwz r12, FatalFunc@sda21(r13)
-/* 8003FF34 0003BD74  2C 0C 00 00 */	cmpwi r12, 0x0
-/* 8003FF38 0003BD78  4D 82 00 20 */	beqlr
-/* 8003FF3C 0003BD7C  7D 89 03 A6 */	mtctr r12
-/* 8003FF40 0003BD80  4E 80 04 20 */	bctr
-/* 8003FF44 0003BD84  4E 80 00 20 */	blr
-/* 8003FF48 0003BD88  00 00 00 00 */	.4byte 0x00000000
-/* 8003FF4C 0003BD8C  00 00 00 00 */	.4byte 0x00000000
diff --git a/asm/dvd/dvdFatal_80407850.s b/asm/dvd/dvdFatal_80407850.s
deleted file mode 100644
index 7fa80899..00000000
--- a/asm/dvd/dvdFatal_80407850.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global __DVDErrorMessageDefault
-__DVDErrorMessageDefault:
-
-	.4byte "@1462_804316D8"
-	.4byte "@1463"
-	.4byte "@1464"
-	.4byte "@1465_804318D0"
-	.4byte "@1466"
-	.4byte "@1467"
-	.4byte "@1468"
-
-.global __DVDErrorMessageEurope
-__DVDErrorMessageEurope:
-
-	.4byte "@1462_804316D8"
-	.4byte "@1469"
-	.4byte "@1464"
-	.4byte "@1470"
-	.4byte "@1471"
-	.4byte "@1467"
-	.4byte "@1468"
diff --git a/asm/dvd/dvdFatal_805565f0.s b/asm/dvd/dvdFatal_805565f0.s
deleted file mode 100644
index 4845a463..00000000
--- a/asm/dvd/dvdFatal_805565f0.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __DVDErrorMessageChinaKorea
-__DVDErrorMessageChinaKorea:
-
-	.4byte "@1472"
-	.4byte "@1473"
diff --git a/asm/dvd/dvdFatal_8055cb08.s b/asm/dvd/dvdFatal_8055cb08.s
deleted file mode 100644
index adc313b3..00000000
--- a/asm/dvd/dvdFatal_8055cb08.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global FatalFunc
-FatalFunc:
-	.skip 0x8
diff --git a/asm/dvd/dvdFatal_8055e698.s b/asm/dvd/dvdFatal_8055e698.s
deleted file mode 100644
index 5807d542..00000000
--- a/asm/dvd/dvdFatal_8055e698.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "@1482"
-"@1482":
-
-	.4byte 0xFFFFFF00
-	.4byte 0
diff --git a/asm/dvd/dvd_80431260.s b/asm/dvd/dvd_80431260.s
deleted file mode 100644
index 6885fb23..00000000
--- a/asm/dvd/dvd_80431260.s
+++ /dev/null
@@ -1,316 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@1_80431260"
-"@1_80431260":
-
-	.4byte 0x3C3C2052
-	.4byte 0x564C5F53
-	.4byte 0x444B202D
-	.4byte 0x20445644
-	.4byte 0x20097265
-	.4byte 0x6C656173
-	.4byte 0x65206275
-	.4byte 0x696C643A
-	.4byte 0x20417567
-	.4byte 0x20323320
-	.4byte 0x32303130
-	.4byte 0x2031373A
-	.4byte 0x33303A30
-	.4byte 0x35202830
-	.4byte 0x78343330
-	.4byte 0x325F3134
-	.4byte 0x3529203E
-	.4byte 0x3E000000
-
-.global "@4255_804312A8"
-"@4255_804312A8":
-
-	.4byte 0x44564443
-	.4byte 0x68616E67
-	.4byte 0x65446973
-	.4byte 0x6B28293A
-	.4byte 0x20465354
-	.4byte 0x20696E20
-	.4byte 0x74686520
-	.4byte 0x6E657720
-	.4byte 0x64697363
-	.4byte 0x20697320
-	.4byte 0x746F6F20
-	.4byte 0x6269672E
-	.4byte 0x20202000
-
-.global "@4490"
-"@4490":
-
-	.4byte lbl_8003C448
-	.4byte lbl_8003C43C
-	.4byte lbl_8003C43C
-	.4byte lbl_8003C448
-	.4byte lbl_8003C3E8
-	.4byte lbl_8003C3E8
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C3E8
-	.4byte lbl_8003C448
-	.4byte lbl_8003C3E8
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C41C
-	.4byte lbl_8003C3E8
-	.4byte lbl_8003C3E8
-	.4byte lbl_8003C424
-	.4byte lbl_8003C424
-	.4byte lbl_8003C3E8
-	.4byte lbl_8003C424
-	.4byte lbl_8003C448
-	.4byte lbl_8003C448
-	.4byte lbl_8003C3E8
-	.4byte lbl_8003C3E8
-
-.global "@4658"
-"@4658":
-
-	.4byte lbl_8003D790
-	.4byte lbl_8003D324
-	.4byte lbl_8003D44C
-	.4byte lbl_8003D468
-	.4byte lbl_8003D324
-	.4byte lbl_8003D300
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D498
-	.4byte lbl_8003D4B8
-	.4byte lbl_8003D480
-	.4byte lbl_8003D4DC
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D790
-	.4byte lbl_8003D4FC
-	.4byte lbl_8003D514
-	.4byte lbl_8003D63C
-	.4byte lbl_8003D668
-	.4byte lbl_8003D690
-	.4byte lbl_8003D6A0
-	.4byte lbl_8003D680
-	.4byte lbl_8003D790
-	.4byte lbl_8003D6BC
-	.4byte lbl_8003D6E8
-	.4byte lbl_8003D75C
-
-.global "@4657"
-"@4657":
-
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D258
-	.4byte lbl_8003D258
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D258
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D258
-	.4byte lbl_8003D258
-	.4byte lbl_8003D258
-	.4byte lbl_8003D258
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D258
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D258
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D2DC
-	.4byte lbl_8003D258
-	.4byte lbl_8003D258
-
-.global ImmCommand
-ImmCommand:
-
-	.4byte 0xFFFFFFFF
-	.4byte 0xFFFFFFFF
-	.4byte 0xFFFFFFFF
-
-.global "@5033_804314EC"
-"@5033_804314EC":
-
-	.4byte lbl_8003E704
-	.4byte lbl_8003E6A4
-	.4byte lbl_8003E6A4
-	.4byte lbl_8003E704
-	.4byte lbl_8003E684
-	.4byte lbl_8003E684
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E684
-	.4byte lbl_8003E704
-	.4byte lbl_8003E684
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E684
-	.4byte lbl_8003E684
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E684
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E704
-	.4byte lbl_8003E684
-	.4byte lbl_8003E684
-
-.global "@5032_80431598"
-"@5032_80431598":
-
-	.4byte lbl_8003E590
-	.4byte lbl_8003E590
-	.4byte lbl_8003E5B0
-	.4byte lbl_8003E614
-	.4byte lbl_8003E660
-	.4byte lbl_8003E730
-	.4byte lbl_8003E730
-	.4byte lbl_8003E730
-	.4byte lbl_8003E730
-	.4byte lbl_8003E87C
-	.4byte lbl_8003E87C
-	.4byte lbl_8003E590
-	.4byte lbl_8003E730
-	.4byte lbl_8003E82C
-
-.global "@5040"
-"@5040":
-
-	.4byte lbl_8003E948
-	.4byte lbl_8003E948
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E948
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E948
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E948
-	.4byte lbl_8003E948
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E948
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E93C
-	.4byte lbl_8003E948
-	.4byte lbl_8003E948
-
-.global "@5139"
-"@5139":
-
-	.4byte lbl_8003EBAC
-	.4byte lbl_8003EBDC
-	.4byte lbl_8003EB7C
-	.4byte lbl_8003EB7C
-	.4byte lbl_8003EBAC
-	.4byte lbl_8003EBAC
-	.4byte lbl_8003EBAC
-	.4byte lbl_8003EBAC
-	.4byte lbl_8003EBAC
-	.4byte lbl_8003EBDC
-	.4byte lbl_8003EB7C
-	.4byte lbl_8003EB7C
-	.4byte lbl_8003EBAC
-	.4byte lbl_8003EBAC
-	.4byte 0
diff --git a/asm/dvd/dvd_8049ae00.s b/asm/dvd/dvd_8049ae00.s
deleted file mode 100644
index 62f3c068..00000000
--- a/asm/dvd/dvd_8049ae00.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global __DVDTicketViewBuffer
-__DVDTicketViewBuffer:
-	.skip 0x100
-
-.global __DVDTmdBuffer
-__DVDTmdBuffer:
-	.skip 0x4A00
-
-.global BB2
-BB2:
-	.skip 0x20
-
-.global DummyCommandBlock
-DummyCommandBlock:
-	.skip 0x30
-
-.global FatalAlarm
-FatalAlarm:
-	.skip 0x30
-
-.global CoverAlarm
-CoverAlarm:
-	.skip 0x40
-
-.global CurrDiskID
-CurrDiskID:
-	.skip 0x20
-
-.global __DVDGameTocBuffer
-__DVDGameTocBuffer:
-	.skip 0x20
-
-.global __DVDPartInfoBuffer
-__DVDPartInfoBuffer:
-	.skip 0x20
-
-.global ResetAlarm
-ResetAlarm:
-	.skip 0x30
-
-.global __DVDStopMotorCommandBlock
-__DVDStopMotorCommandBlock:
-	.skip 0x60
diff --git a/asm/dvd/dvd_805565d8.s b/asm/dvd/dvd_805565d8.s
deleted file mode 100644
index 2a66b2a6..00000000
--- a/asm/dvd/dvd_805565d8.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __DVDVersion
-__DVDVersion:
-
-	.4byte "@1_80431260"
-
-.global autoInvalidation
-autoInvalidation:
-
-	.4byte 0x00000001
-
-.global checkOptionalCommand
-checkOptionalCommand:
-
-	.4byte defaultOptionalCommandChecker
-
-.global "@4254_805565E4"
-"@4254_805565E4":
-
-	.4byte 0x6476642E
-	.4byte 0x63000000
-
-.global DmaCommand
-DmaCommand:
-
-	.4byte 0xFFFFFFFF
diff --git a/asm/dvd/dvd_8055ca60.s b/asm/dvd/dvd_8055ca60.s
deleted file mode 100644
index 000c6920..00000000
--- a/asm/dvd/dvd_8055ca60.s
+++ /dev/null
@@ -1,138 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global CommandInfoCounter
-CommandInfoCounter:
-	.skip 0x4
-
-.global PauseFlag
-PauseFlag:
-	.skip 0x4
-
-.global PausingFlag
-PausingFlag:
-	.skip 0x4
-
-.global FatalErrorFlag
-FatalErrorFlag:
-	.skip 0x4
-
-.global Canceling
-Canceling:
-	.skip 0x4
-
-.global ResumeFromHere
-ResumeFromHere:
-	.skip 0x4
-
-.global NumInternalRetry
-NumInternalRetry:
-	.skip 0x4
-
-.global FirstTimeInBootrom
-FirstTimeInBootrom:
-	.skip 0x4
-
-.global Breaking
-Breaking:
-	.skip 0x4
-
-.global WaitingForCoverOpen
-WaitingForCoverOpen:
-	.skip 0x4
-
-.global WaitingForCoverClose
-WaitingForCoverClose:
-	.skip 0x4
-
-.global MotorStopped
-MotorStopped:
-	.skip 0x4
-
-.global ChangedDisc
-ChangedDisc:
-	.skip 0x4
-
-.global PreparingCover
-PreparingCover:
-	.skip 0x4
-
-.global __DVDLayoutFormat
-__DVDLayoutFormat:
-	.skip 0x4
-
-.global DVDInitialized
-DVDInitialized:
-	.skip 0x4
-
-.global __BS2DVDLowIntType
-__BS2DVDLowIntType:
-	.skip 0x4
-
-.global Prepared_8055CAA4
-Prepared_8055CAA4:
-	.skip 0x4
-
-.global BootGameInfo
-BootGameInfo:
-	.skip 0x4
-
-.global PartInfo
-PartInfo:
-	.skip 0x4
-
-.global GameToc
-GameToc:
-	.skip 0x10
-
-.global __DVDNumTmdBytes
-__DVDNumTmdBytes:
-	.skip 0x8
-
-.global LastResetEnd
-LastResetEnd:
-	.skip 0x4
-
-.global lbl_8055CACC
-lbl_8055CACC:
-	.skip 0x4
-
-.global MotorState
-MotorState:
-	.skip 0x4
-
-.global ResetRequired
-ResetRequired:
-	.skip 0x4
-
-.global LastError
-LastError:
-	.skip 0x4
-
-.global CancelLastError
-CancelLastError:
-	.skip 0x4
-
-.global CancelCallback
-CancelCallback:
-	.skip 0x4
-
-.global CurrCommand
-CurrCommand:
-	.skip 0x4
-
-.global bootInfo
-bootInfo:
-	.skip 0x4
-
-.global IDShouldBe
-IDShouldBe:
-	.skip 0x4
-
-.global executing
-executing:
-	.skip 0x4
-
-.global LastState
-LastState:
-	.skip 0x4
diff --git a/asm/dvd/dvd_broadway_800401e0.s b/asm/dvd/dvd_broadway.s
similarity index 88%
rename from asm/dvd/dvd_broadway_800401e0.s
rename to asm/dvd/dvd_broadway.s
index 3fb3b9f4..c10316f3 100644
--- a/asm/dvd/dvd_broadway_800401e0.s
+++ b/asm/dvd/dvd_broadway.s
@@ -2943,3 +2943,1061 @@ lbl_80042840:
 /* 80042854 0003E694  4E 80 00 20 */	blr
 /* 80042858 0003E698  00 00 00 00 */	.4byte 0x00000000
 /* 8004285C 0003E69C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@3815"
+"@3815":
+
+	.4byte 0x28646F54
+	.4byte 0x72616E73
+	.4byte 0x61637469
+	.4byte 0x6F6E4361
+	.4byte 0x6C6C6261
+	.4byte 0x636B2920
+	.4byte 0x4572726F
+	.4byte 0x72202D20
+	.4byte 0x636F6E74
+	.4byte 0x65787420
+	.4byte 0x6D616E67
+	.4byte 0x6C656421
+	.4byte 0x0A000000
+	.4byte 0x28646F43
+	.4byte 0x6F766572
+	.4byte 0x43616C6C
+	.4byte 0x6261636B
+	.4byte 0x29204572
+	.4byte 0x726F7220
+	.4byte 0x2D20636F
+	.4byte 0x6E746578
+	.4byte 0x74206D61
+	.4byte 0x6E676C65
+	.4byte 0x64210A00
+
+.global "@3832"
+"@3832":
+
+	.4byte 0x28445644
+	.4byte 0x4C6F7746
+	.4byte 0x696E6973
+	.4byte 0x68292045
+	.4byte 0x72726F72
+	.4byte 0x3A20494F
+	.4byte 0x535F436C
+	.4byte 0x6F736520
+	.4byte 0x6661696C
+	.4byte 0x65640A00
+	.4byte 0x49504343
+	.4byte 0x6C74496E
+	.4byte 0x69742072
+	.4byte 0x65747572
+	.4byte 0x6E656420
+	.4byte 0x6572726F
+	.4byte 0x723A2025
+	.4byte 0x640A0000
+	.4byte 0x28646472
+	.4byte 0x416C6C6F
+	.4byte 0x63416C69
+	.4byte 0x676E6564
+	.4byte 0x33322920
+	.4byte 0x4E6F7420
+	.4byte 0x656E6F75
+	.4byte 0x67682073
+	.4byte 0x70616365
+	.4byte 0x20746F20
+	.4byte 0x616C6C6F
+	.4byte 0x63617465
+	.4byte 0x20256420
+	.4byte 0x62797465
+	.4byte 0x730A0000
+	.4byte 0x416C6C6F
+	.4byte 0x63617469
+	.4byte 0x6F6E206F
+	.4byte 0x66206469
+	.4byte 0x436F6D6D
+	.4byte 0x616E6420
+	.4byte 0x626C6F63
+	.4byte 0x6B732066
+	.4byte 0x61696C65
+	.4byte 0x640A0000
+	.4byte 0x416C6C6F
+	.4byte 0x63617469
+	.4byte 0x6F6E206F
+	.4byte 0x66207061
+	.4byte 0x74684275
+	.4byte 0x66206661
+	.4byte 0x696C6564
+	.4byte 0x0A000000
+	.4byte 0x28445644
+	.4byte 0x4C6F7749
+	.4byte 0x6E697429
+	.4byte 0x20457272
+	.4byte 0x6F723A20
+	.4byte 0x494F535F
+	.4byte 0x4F70656E
+	.4byte 0x20666169
+	.4byte 0x6C656420
+	.4byte 0x2D207061
+	.4byte 0x74686E61
+	.4byte 0x6D652027
+	.4byte 0x2F646576
+	.4byte 0x2F646927
+	.4byte 0x20646F65
+	.4byte 0x73206E6F
+	.4byte 0x74206578
+	.4byte 0x6973740A
+	.4byte 0
+	.4byte 0x28445644
+	.4byte 0x4C6F7749
+	.4byte 0x6E697429
+	.4byte 0x20457272
+	.4byte 0x6F723A20
+	.4byte 0x494F535F
+	.4byte 0x4F70656E
+	.4byte 0x20666169
+	.4byte 0x6C656420
+	.4byte 0x2D206361
+	.4byte 0x6C6C696E
+	.4byte 0x67207468
+	.4byte 0x72656164
+	.4byte 0x206C6163
+	.4byte 0x6B732070
+	.4byte 0x65726D69
+	.4byte 0x7373696F
+	.4byte 0x6E0A0000
+	.4byte 0x28445644
+	.4byte 0x4C6F7749
+	.4byte 0x6E697429
+	.4byte 0x20457272
+	.4byte 0x6F723A20
+	.4byte 0x494F535F
+	.4byte 0x4F70656E
+	.4byte 0x20666169
+	.4byte 0x6C656420
+	.4byte 0x2D20636F
+	.4byte 0x6E6E6563
+	.4byte 0x74696F6E
+	.4byte 0x206C696D
+	.4byte 0x69742068
+	.4byte 0x61732062
+	.4byte 0x65656E20
+	.4byte 0x72656163
+	.4byte 0x6865640A
+	.4byte 0
+	.4byte 0x28445644
+	.4byte 0x4C6F7749
+	.4byte 0x6E697429
+	.4byte 0x20494F53
+	.4byte 0x5F4F7065
+	.4byte 0x6E206661
+	.4byte 0x696C6564
+	.4byte 0x2C206572
+	.4byte 0x726F7263
+	.4byte 0x6F646520
+	.4byte 0x3D202564
+	.4byte 0x0A000000
+	.4byte 0
+	.4byte 0x286E6577
+	.4byte 0x436F6E74
+	.4byte 0x65787429
+	.4byte 0x20455252
+	.4byte 0x4F523A20
+	.4byte 0x66726565
+	.4byte 0x44766443
+	.4byte 0x6F6E7465
+	.4byte 0x78742E69
+	.4byte 0x6E557365
+	.4byte 0x20282325
+	.4byte 0x64292069
+	.4byte 0x73207472
+	.4byte 0x75650A00
+	.4byte 0x286E6577
+	.4byte 0x436F6E74
+	.4byte 0x65787429
+	.4byte 0x204E6F77
+	.4byte 0x20737069
+	.4byte 0x6E6E696E
+	.4byte 0x6720696E
+	.4byte 0x20696E66
+	.4byte 0x696E6974
+	.4byte 0x65206C6F
+	.4byte 0x6F700A00
+	.4byte 0
+	.4byte 0x286E6577
+	.4byte 0x436F6E74
+	.4byte 0x65787429
+	.4byte 0x20536F6D
+	.4byte 0x65746869
+	.4byte 0x6E67206F
+	.4byte 0x76657277
+	.4byte 0x726F7465
+	.4byte 0x20746865
+	.4byte 0x20636F6E
+	.4byte 0x74657874
+	.4byte 0x206D6167
+	.4byte 0x6963202D
+	.4byte 0x20737069
+	.4byte 0x6E6E696E
+	.4byte 0x67200A00
+	.4byte 0x40404040
+	.4byte 0x40402057
+	.4byte 0x41524E49
+	.4byte 0x4E47202D
+	.4byte 0x2043616C
+	.4byte 0x6C696E67
+	.4byte 0x20445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616444
+	.4byte 0x69736B49
+	.4byte 0x64207769
+	.4byte 0x7468204E
+	.4byte 0x554C4C20
+	.4byte 0x7074720A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616444
+	.4byte 0x69736B49
+	.4byte 0x44292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x28445644
+	.4byte 0x4C6F774F
+	.4byte 0x70656E50
+	.4byte 0x61727469
+	.4byte 0x74696F6E
+	.4byte 0x29206554
+	.4byte 0x69636B65
+	.4byte 0x74206D65
+	.4byte 0x6D6F7279
+	.4byte 0x20697320
+	.4byte 0x756E616C
+	.4byte 0x69676E65
+	.4byte 0x640A0000
+	.4byte 0
+	.4byte 0x28445644
+	.4byte 0x4C6F774F
+	.4byte 0x70656E50
+	.4byte 0x61727469
+	.4byte 0x74696F6E
+	.4byte 0x29206365
+	.4byte 0x72746966
+	.4byte 0x69636174
+	.4byte 0x6573206D
+	.4byte 0x656D6F72
+	.4byte 0x79206973
+	.4byte 0x20756E61
+	.4byte 0x6C69676E
+	.4byte 0x65640A00
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F774F
+	.4byte 0x70656E50
+	.4byte 0x61727469
+	.4byte 0x74696F6E
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C76
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x4456444C
+	.4byte 0x6F774F70
+	.4byte 0x656E5061
+	.4byte 0x72746974
+	.4byte 0x696F6E57
+	.4byte 0x69746854
+	.4byte 0x6D64416E
+	.4byte 0x64546963
+	.4byte 0x6B657400
+	.4byte 0x28257329
+	.4byte 0x20655469
+	.4byte 0x636B6574
+	.4byte 0x206D656D
+	.4byte 0x6F727920
+	.4byte 0x69732075
+	.4byte 0x6E616C69
+	.4byte 0x676E6564
+	.4byte 0x0A000000
+	.4byte 0x28257329
+	.4byte 0x20746D64
+	.4byte 0x20706172
+	.4byte 0x616D6574
+	.4byte 0x65722063
+	.4byte 0x616E6E6F
+	.4byte 0x74206265
+	.4byte 0x204E554C
+	.4byte 0x4C0A0000
+	.4byte 0x28257329
+	.4byte 0x20746D64
+	.4byte 0x206D656D
+	.4byte 0x6F727920
+	.4byte 0x69732075
+	.4byte 0x6E616C69
+	.4byte 0x676E6564
+	.4byte 0x0A000000
+	.4byte 0x28257329
+	.4byte 0x20655469
+	.4byte 0x636B6574
+	.4byte 0x20706172
+	.4byte 0x616D6574
+	.4byte 0x65722063
+	.4byte 0x616E6E6F
+	.4byte 0x74206265
+	.4byte 0x204E554C
+	.4byte 0x4C0A0000
+	.4byte 0
+	.4byte 0x4456444C
+	.4byte 0x6F774F70
+	.4byte 0x656E5061
+	.4byte 0x72746974
+	.4byte 0x696F6E57
+	.4byte 0x69746854
+	.4byte 0x6D64416E
+	.4byte 0x64546963
+	.4byte 0x6B657456
+	.4byte 0x69657700
+	.4byte 0x28257329
+	.4byte 0x20655469
+	.4byte 0x636B6574
+	.4byte 0x56696577
+	.4byte 0x20706172
+	.4byte 0x616D6574
+	.4byte 0x65722063
+	.4byte 0x616E6E6F
+	.4byte 0x74206265
+	.4byte 0x204E554C
+	.4byte 0x4C0A0000
+	.4byte 0x28257329
+	.4byte 0x20655469
+	.4byte 0x636B6574
+	.4byte 0x56696577
+	.4byte 0x206D656D
+	.4byte 0x6F727920
+	.4byte 0x69732075
+	.4byte 0x6E616C69
+	.4byte 0x676E6564
+	.4byte 0x0A000000
+	.4byte 0x4456444C
+	.4byte 0x6F774765
+	.4byte 0x744E6F44
+	.4byte 0x69736342
+	.4byte 0x75666665
+	.4byte 0x7253697A
+	.4byte 0x65730000
+	.4byte 0x28257329
+	.4byte 0x20457272
+	.4byte 0x6F723A20
+	.4byte 0x4E554C4C
+	.4byte 0x20706F69
+	.4byte 0x6E746572
+	.4byte 0x20617267
+	.4byte 0x756D656E
+	.4byte 0x740A0000
+	.4byte 0x28257329
+	.4byte 0x206E756D
+	.4byte 0x546D6442
+	.4byte 0x79746573
+	.4byte 0x206D656D
+	.4byte 0x6F727920
+	.4byte 0x69732075
+	.4byte 0x6E616C69
+	.4byte 0x676E6564
+	.4byte 0x0A000000
+	.4byte 0x28257329
+	.4byte 0x20636572
+	.4byte 0x74696669
+	.4byte 0x63617465
+	.4byte 0x73206D65
+	.4byte 0x6D6F7279
+	.4byte 0x20697320
+	.4byte 0x756E616C
+	.4byte 0x69676E65
+	.4byte 0x640A0000
+	.4byte 0x40404020
+	.4byte 0x28257329
+	.4byte 0x20494F53
+	.4byte 0x5F496F63
+	.4byte 0x746C7641
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x4456444C
+	.4byte 0x6F774765
+	.4byte 0x744E6F44
+	.4byte 0x6973634F
+	.4byte 0x70656E50
+	.4byte 0x61727469
+	.4byte 0x74696F6E
+	.4byte 0x50617261
+	.4byte 0x6D730000
+	.4byte 0x28257329
+	.4byte 0x20706F69
+	.4byte 0x6E746572
+	.4byte 0x20617267
+	.4byte 0x756D656E
+	.4byte 0x74206973
+	.4byte 0x20756E61
+	.4byte 0x6C69676E
+	.4byte 0x65640A00
+	.4byte 0x4456444C
+	.4byte 0x6F774E6F
+	.4byte 0x44697363
+	.4byte 0x4F70656E
+	.4byte 0x50617274
+	.4byte 0x6974696F
+	.4byte 0x6E000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7743
+	.4byte 0x6C6F7365
+	.4byte 0x50617274
+	.4byte 0x6974696F
+	.4byte 0x6E292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7755
+	.4byte 0x6E656E63
+	.4byte 0x72797074
+	.4byte 0x65645265
+	.4byte 0x61642920
+	.4byte 0x494F535F
+	.4byte 0x496F6374
+	.4byte 0x6C417379
+	.4byte 0x6E632072
+	.4byte 0x65747572
+	.4byte 0x6E656420
+	.4byte 0x6572726F
+	.4byte 0x723A2025
+	.4byte 0x640A0000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7753
+	.4byte 0x746F704D
+	.4byte 0x6F746F72
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7757
+	.4byte 0x61697446
+	.4byte 0x6F72436F
+	.4byte 0x76657243
+	.4byte 0x6C6F7365
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7749
+	.4byte 0x6E717569
+	.4byte 0x72792920
+	.4byte 0x494F535F
+	.4byte 0x496F6374
+	.4byte 0x6C417379
+	.4byte 0x6E632072
+	.4byte 0x65747572
+	.4byte 0x6E656420
+	.4byte 0x6572726F
+	.4byte 0x723A2025
+	.4byte 0x640A0000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65717565
+	.4byte 0x73744572
+	.4byte 0x726F7229
+	.4byte 0x20494F53
+	.4byte 0x5F496F63
+	.4byte 0x746C4173
+	.4byte 0x796E6320
+	.4byte 0x72657475
+	.4byte 0x726E6564
+	.4byte 0x20657272
+	.4byte 0x6F723A20
+	.4byte 0x25640A00
+	.4byte 0x28445644
+	.4byte 0x4C6F7753
+	.4byte 0x65745370
+	.4byte 0x696E7570
+	.4byte 0x466C6167
+	.4byte 0x293A2053
+	.4byte 0x796E6368
+	.4byte 0x2066756E
+	.4byte 0x6374696F
+	.4byte 0x6E732063
+	.4byte 0x616E2774
+	.4byte 0x20626520
+	.4byte 0x63616C6C
+	.4byte 0x65642069
+	.4byte 0x6E206361
+	.4byte 0x6C6C6261
+	.4byte 0x636B730A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F774E
+	.4byte 0x6F746966
+	.4byte 0x79526573
+	.4byte 0x65742920
+	.4byte 0x494F535F
+	.4byte 0x496F6374
+	.4byte 0x6C417379
+	.4byte 0x6E632072
+	.4byte 0x65747572
+	.4byte 0x6E656420
+	.4byte 0x6572726F
+	.4byte 0x723A2025
+	.4byte 0x640A0000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65736574
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7741
+	.4byte 0x7564696F
+	.4byte 0x42756666
+	.4byte 0x6572436F
+	.4byte 0x6E666967
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x28445644
+	.4byte 0x4C6F7747
+	.4byte 0x6574436F
+	.4byte 0x76657253
+	.4byte 0x74617475
+	.4byte 0x73293A20
+	.4byte 0x53796E63
+	.4byte 0x68206675
+	.4byte 0x6E637469
+	.4byte 0x6F6E7320
+	.4byte 0x63616E27
+	.4byte 0x74206265
+	.4byte 0x2063616C
+	.4byte 0x6C656420
+	.4byte 0x696E2063
+	.4byte 0x616C6C62
+	.4byte 0x61636B73
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7747
+	.4byte 0x6574436F
+	.4byte 0x76657253
+	.4byte 0x74617475
+	.4byte 0x73292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616444
+	.4byte 0x56442920
+	.4byte 0x494F535F
+	.4byte 0x496F6374
+	.4byte 0x6C417379
+	.4byte 0x6E632072
+	.4byte 0x65747572
+	.4byte 0x6E656420
+	.4byte 0x6572726F
+	.4byte 0x723A2025
+	.4byte 0x640A0000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616444
+	.4byte 0x5644436F
+	.4byte 0x6E666967
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616444
+	.4byte 0x7664436F
+	.4byte 0x70797269
+	.4byte 0x67687429
+	.4byte 0x20494F53
+	.4byte 0x5F496F63
+	.4byte 0x746C4173
+	.4byte 0x796E6320
+	.4byte 0x72657475
+	.4byte 0x726E6564
+	.4byte 0x20657272
+	.4byte 0x6F723A20
+	.4byte 0x25640A00
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616444
+	.4byte 0x76645068
+	.4byte 0x79736963
+	.4byte 0x616C2920
+	.4byte 0x494F535F
+	.4byte 0x496F6374
+	.4byte 0x6C417379
+	.4byte 0x6E632072
+	.4byte 0x65747572
+	.4byte 0x6E656420
+	.4byte 0x6572726F
+	.4byte 0x723A2025
+	.4byte 0x640A0000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616444
+	.4byte 0x76644469
+	.4byte 0x73634B65
+	.4byte 0x79292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65706F72
+	.4byte 0x744B6579
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F774F
+	.4byte 0x66667365
+	.4byte 0x74292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7753
+	.4byte 0x746F704C
+	.4byte 0x61736572
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616444
+	.4byte 0x69736B42
+	.4byte 0x63612920
+	.4byte 0x494F535F
+	.4byte 0x496F6374
+	.4byte 0x6C417379
+	.4byte 0x6E632072
+	.4byte 0x65747572
+	.4byte 0x6E656420
+	.4byte 0x6572726F
+	.4byte 0x723A2025
+	.4byte 0x640A0000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7753
+	.4byte 0x65724D65
+	.4byte 0x6173436F
+	.4byte 0x6E74726F
+	.4byte 0x6C292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65717565
+	.4byte 0x73744469
+	.4byte 0x73635374
+	.4byte 0x61747573
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65717565
+	.4byte 0x73745265
+	.4byte 0x7472794E
+	.4byte 0x756D6265
+	.4byte 0x72292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7753
+	.4byte 0x65744D61
+	.4byte 0x78526F74
+	.4byte 0x6174696F
+	.4byte 0x6E292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616429
+	.4byte 0x3A204552
+	.4byte 0x524F5220
+	.4byte 0x2D206465
+	.4byte 0x73744164
+	.4byte 0x64722062
+	.4byte 0x75666665
+	.4byte 0x72206973
+	.4byte 0x206E6F74
+	.4byte 0x20333220
+	.4byte 0x62797465
+	.4byte 0x20616C69
+	.4byte 0x676E6564
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7752
+	.4byte 0x65616429
+	.4byte 0x20494F53
+	.4byte 0x5F496F63
+	.4byte 0x746C4173
+	.4byte 0x796E6320
+	.4byte 0x72657475
+	.4byte 0x726E6564
+	.4byte 0x20657272
+	.4byte 0x6F723A20
+	.4byte 0x25640A00
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7753
+	.4byte 0x65656B29
+	.4byte 0x20494F53
+	.4byte 0x5F496F63
+	.4byte 0x746C4173
+	.4byte 0x796E6320
+	.4byte 0x72657475
+	.4byte 0x726E6564
+	.4byte 0x20657272
+	.4byte 0x6F723A20
+	.4byte 0x25640A00
+	.4byte 0x28445644
+	.4byte 0x4C6F7747
+	.4byte 0x6574436F
+	.4byte 0x76657252
+	.4byte 0x6567293A
+	.4byte 0x2053796E
+	.4byte 0x63682066
+	.4byte 0x756E6374
+	.4byte 0x696F6E73
+	.4byte 0x2063616E
+	.4byte 0x27742062
+	.4byte 0x65206361
+	.4byte 0x6C6C6564
+	.4byte 0x20696E20
+	.4byte 0x63616C6C
+	.4byte 0x6261636B
+	.4byte 0x730A0000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7747
+	.4byte 0x6574436F
+	.4byte 0x76657252
+	.4byte 0x65672920
+	.4byte 0x494F535F
+	.4byte 0x496F6374
+	.4byte 0x6C207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7750
+	.4byte 0x72657061
+	.4byte 0x7265436F
+	.4byte 0x76657252
+	.4byte 0x65677369
+	.4byte 0x74657229
+	.4byte 0x20494F53
+	.4byte 0x5F496F63
+	.4byte 0x746C4173
+	.4byte 0x796E6320
+	.4byte 0x72657475
+	.4byte 0x726E6564
+	.4byte 0x20657272
+	.4byte 0x6F723A20
+	.4byte 0x25640A00
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7750
+	.4byte 0x72657061
+	.4byte 0x72655374
+	.4byte 0x61747573
+	.4byte 0x52656773
+	.4byte 0x69746572
+	.4byte 0x2920494F
+	.4byte 0x535F496F
+	.4byte 0x63746C41
+	.4byte 0x73796E63
+	.4byte 0x20726574
+	.4byte 0x75726E65
+	.4byte 0x64206572
+	.4byte 0x726F723A
+	.4byte 0x2025640A
+	.4byte 0
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7750
+	.4byte 0x72657061
+	.4byte 0x7265436F
+	.4byte 0x6E74726F
+	.4byte 0x6C526567
+	.4byte 0x69737465
+	.4byte 0x72292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7743
+	.4byte 0x6C656172
+	.4byte 0x436F7665
+	.4byte 0x72496E74
+	.4byte 0x65727275
+	.4byte 0x70742920
+	.4byte 0x494F535F
+	.4byte 0x496F6374
+	.4byte 0x6C417379
+	.4byte 0x6E632072
+	.4byte 0x65747572
+	.4byte 0x6E656420
+	.4byte 0x6572726F
+	.4byte 0x723A2025
+	.4byte 0x640A0000
+	.4byte 0x40404020
+	.4byte 0x28445644
+	.4byte 0x4C6F7745
+	.4byte 0x6E61626C
+	.4byte 0x65447664
+	.4byte 0x56696465
+	.4byte 0x6F292049
+	.4byte 0x4F535F49
+	.4byte 0x6F63746C
+	.4byte 0x4173796E
+	.4byte 0x63207265
+	.4byte 0x7475726E
+	.4byte 0x65642065
+	.4byte 0x72726F72
+	.4byte 0x3A202564
+	.4byte 0x0A000000
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global dvdContexts
+dvdContexts:
+	.skip 0x80
+
+.global diRegValCache
+diRegValCache:
+	.skip 0x20
+
+.global registerBuf
+registerBuf:
+	.skip 0x20
+
+.global ioVec
+ioVec:
+	.skip 0xC0
+
+.global statusRegister
+statusRegister:
+	.skip 0x20
+
+.global controlRegister
+controlRegister:
+	.skip 0x20
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global DiFD
+DiFD:
+
+	.4byte 0xFFFFFFFF
+	.4byte 0
+
+.global "@3856"
+"@3856":
+
+	.4byte 0x2F646576
+	.4byte 0x2F646900
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global requestInProgress
+requestInProgress:
+	.skip 0x1
+
+.global callbackInProgress
+callbackInProgress:
+	.skip 0x3
+
+.global freeCommandBuf
+freeCommandBuf:
+	.skip 0x4
+
+.global freeDvdContext
+freeDvdContext:
+	.skip 0x4
+
+.global dvdContextsInited
+dvdContextsInited:
+	.skip 0x1
+
+.global DVDLowInitCalled
+DVDLowInitCalled:
+	.skip 0x3
+
+.global spinUpValue
+spinUpValue:
+	.skip 0x4
+
+.global readLength
+readLength:
+	.skip 0x4
+
+.global pathBuf
+pathBuf:
+	.skip 0x4
+
+.global diCommand
+diCommand:
+	.skip 0x4
+
+.global breakRequested
+breakRequested:
+	.skip 0x8
diff --git a/asm/dvd/dvd_broadway_80432038.s b/asm/dvd/dvd_broadway_80432038.s
deleted file mode 100644
index a8b64ab7..00000000
--- a/asm/dvd/dvd_broadway_80432038.s
+++ /dev/null
@@ -1,972 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@3815"
-"@3815":
-
-	.4byte 0x28646F54
-	.4byte 0x72616E73
-	.4byte 0x61637469
-	.4byte 0x6F6E4361
-	.4byte 0x6C6C6261
-	.4byte 0x636B2920
-	.4byte 0x4572726F
-	.4byte 0x72202D20
-	.4byte 0x636F6E74
-	.4byte 0x65787420
-	.4byte 0x6D616E67
-	.4byte 0x6C656421
-	.4byte 0x0A000000
-	.4byte 0x28646F43
-	.4byte 0x6F766572
-	.4byte 0x43616C6C
-	.4byte 0x6261636B
-	.4byte 0x29204572
-	.4byte 0x726F7220
-	.4byte 0x2D20636F
-	.4byte 0x6E746578
-	.4byte 0x74206D61
-	.4byte 0x6E676C65
-	.4byte 0x64210A00
-
-.global "@3832"
-"@3832":
-
-	.4byte 0x28445644
-	.4byte 0x4C6F7746
-	.4byte 0x696E6973
-	.4byte 0x68292045
-	.4byte 0x72726F72
-	.4byte 0x3A20494F
-	.4byte 0x535F436C
-	.4byte 0x6F736520
-	.4byte 0x6661696C
-	.4byte 0x65640A00
-	.4byte 0x49504343
-	.4byte 0x6C74496E
-	.4byte 0x69742072
-	.4byte 0x65747572
-	.4byte 0x6E656420
-	.4byte 0x6572726F
-	.4byte 0x723A2025
-	.4byte 0x640A0000
-	.4byte 0x28646472
-	.4byte 0x416C6C6F
-	.4byte 0x63416C69
-	.4byte 0x676E6564
-	.4byte 0x33322920
-	.4byte 0x4E6F7420
-	.4byte 0x656E6F75
-	.4byte 0x67682073
-	.4byte 0x70616365
-	.4byte 0x20746F20
-	.4byte 0x616C6C6F
-	.4byte 0x63617465
-	.4byte 0x20256420
-	.4byte 0x62797465
-	.4byte 0x730A0000
-	.4byte 0x416C6C6F
-	.4byte 0x63617469
-	.4byte 0x6F6E206F
-	.4byte 0x66206469
-	.4byte 0x436F6D6D
-	.4byte 0x616E6420
-	.4byte 0x626C6F63
-	.4byte 0x6B732066
-	.4byte 0x61696C65
-	.4byte 0x640A0000
-	.4byte 0x416C6C6F
-	.4byte 0x63617469
-	.4byte 0x6F6E206F
-	.4byte 0x66207061
-	.4byte 0x74684275
-	.4byte 0x66206661
-	.4byte 0x696C6564
-	.4byte 0x0A000000
-	.4byte 0x28445644
-	.4byte 0x4C6F7749
-	.4byte 0x6E697429
-	.4byte 0x20457272
-	.4byte 0x6F723A20
-	.4byte 0x494F535F
-	.4byte 0x4F70656E
-	.4byte 0x20666169
-	.4byte 0x6C656420
-	.4byte 0x2D207061
-	.4byte 0x74686E61
-	.4byte 0x6D652027
-	.4byte 0x2F646576
-	.4byte 0x2F646927
-	.4byte 0x20646F65
-	.4byte 0x73206E6F
-	.4byte 0x74206578
-	.4byte 0x6973740A
-	.4byte 0
-	.4byte 0x28445644
-	.4byte 0x4C6F7749
-	.4byte 0x6E697429
-	.4byte 0x20457272
-	.4byte 0x6F723A20
-	.4byte 0x494F535F
-	.4byte 0x4F70656E
-	.4byte 0x20666169
-	.4byte 0x6C656420
-	.4byte 0x2D206361
-	.4byte 0x6C6C696E
-	.4byte 0x67207468
-	.4byte 0x72656164
-	.4byte 0x206C6163
-	.4byte 0x6B732070
-	.4byte 0x65726D69
-	.4byte 0x7373696F
-	.4byte 0x6E0A0000
-	.4byte 0x28445644
-	.4byte 0x4C6F7749
-	.4byte 0x6E697429
-	.4byte 0x20457272
-	.4byte 0x6F723A20
-	.4byte 0x494F535F
-	.4byte 0x4F70656E
-	.4byte 0x20666169
-	.4byte 0x6C656420
-	.4byte 0x2D20636F
-	.4byte 0x6E6E6563
-	.4byte 0x74696F6E
-	.4byte 0x206C696D
-	.4byte 0x69742068
-	.4byte 0x61732062
-	.4byte 0x65656E20
-	.4byte 0x72656163
-	.4byte 0x6865640A
-	.4byte 0
-	.4byte 0x28445644
-	.4byte 0x4C6F7749
-	.4byte 0x6E697429
-	.4byte 0x20494F53
-	.4byte 0x5F4F7065
-	.4byte 0x6E206661
-	.4byte 0x696C6564
-	.4byte 0x2C206572
-	.4byte 0x726F7263
-	.4byte 0x6F646520
-	.4byte 0x3D202564
-	.4byte 0x0A000000
-	.4byte 0
-	.4byte 0x286E6577
-	.4byte 0x436F6E74
-	.4byte 0x65787429
-	.4byte 0x20455252
-	.4byte 0x4F523A20
-	.4byte 0x66726565
-	.4byte 0x44766443
-	.4byte 0x6F6E7465
-	.4byte 0x78742E69
-	.4byte 0x6E557365
-	.4byte 0x20282325
-	.4byte 0x64292069
-	.4byte 0x73207472
-	.4byte 0x75650A00
-	.4byte 0x286E6577
-	.4byte 0x436F6E74
-	.4byte 0x65787429
-	.4byte 0x204E6F77
-	.4byte 0x20737069
-	.4byte 0x6E6E696E
-	.4byte 0x6720696E
-	.4byte 0x20696E66
-	.4byte 0x696E6974
-	.4byte 0x65206C6F
-	.4byte 0x6F700A00
-	.4byte 0
-	.4byte 0x286E6577
-	.4byte 0x436F6E74
-	.4byte 0x65787429
-	.4byte 0x20536F6D
-	.4byte 0x65746869
-	.4byte 0x6E67206F
-	.4byte 0x76657277
-	.4byte 0x726F7465
-	.4byte 0x20746865
-	.4byte 0x20636F6E
-	.4byte 0x74657874
-	.4byte 0x206D6167
-	.4byte 0x6963202D
-	.4byte 0x20737069
-	.4byte 0x6E6E696E
-	.4byte 0x67200A00
-	.4byte 0x40404040
-	.4byte 0x40402057
-	.4byte 0x41524E49
-	.4byte 0x4E47202D
-	.4byte 0x2043616C
-	.4byte 0x6C696E67
-	.4byte 0x20445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616444
-	.4byte 0x69736B49
-	.4byte 0x64207769
-	.4byte 0x7468204E
-	.4byte 0x554C4C20
-	.4byte 0x7074720A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616444
-	.4byte 0x69736B49
-	.4byte 0x44292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x28445644
-	.4byte 0x4C6F774F
-	.4byte 0x70656E50
-	.4byte 0x61727469
-	.4byte 0x74696F6E
-	.4byte 0x29206554
-	.4byte 0x69636B65
-	.4byte 0x74206D65
-	.4byte 0x6D6F7279
-	.4byte 0x20697320
-	.4byte 0x756E616C
-	.4byte 0x69676E65
-	.4byte 0x640A0000
-	.4byte 0
-	.4byte 0x28445644
-	.4byte 0x4C6F774F
-	.4byte 0x70656E50
-	.4byte 0x61727469
-	.4byte 0x74696F6E
-	.4byte 0x29206365
-	.4byte 0x72746966
-	.4byte 0x69636174
-	.4byte 0x6573206D
-	.4byte 0x656D6F72
-	.4byte 0x79206973
-	.4byte 0x20756E61
-	.4byte 0x6C69676E
-	.4byte 0x65640A00
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F774F
-	.4byte 0x70656E50
-	.4byte 0x61727469
-	.4byte 0x74696F6E
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C76
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x4456444C
-	.4byte 0x6F774F70
-	.4byte 0x656E5061
-	.4byte 0x72746974
-	.4byte 0x696F6E57
-	.4byte 0x69746854
-	.4byte 0x6D64416E
-	.4byte 0x64546963
-	.4byte 0x6B657400
-	.4byte 0x28257329
-	.4byte 0x20655469
-	.4byte 0x636B6574
-	.4byte 0x206D656D
-	.4byte 0x6F727920
-	.4byte 0x69732075
-	.4byte 0x6E616C69
-	.4byte 0x676E6564
-	.4byte 0x0A000000
-	.4byte 0x28257329
-	.4byte 0x20746D64
-	.4byte 0x20706172
-	.4byte 0x616D6574
-	.4byte 0x65722063
-	.4byte 0x616E6E6F
-	.4byte 0x74206265
-	.4byte 0x204E554C
-	.4byte 0x4C0A0000
-	.4byte 0x28257329
-	.4byte 0x20746D64
-	.4byte 0x206D656D
-	.4byte 0x6F727920
-	.4byte 0x69732075
-	.4byte 0x6E616C69
-	.4byte 0x676E6564
-	.4byte 0x0A000000
-	.4byte 0x28257329
-	.4byte 0x20655469
-	.4byte 0x636B6574
-	.4byte 0x20706172
-	.4byte 0x616D6574
-	.4byte 0x65722063
-	.4byte 0x616E6E6F
-	.4byte 0x74206265
-	.4byte 0x204E554C
-	.4byte 0x4C0A0000
-	.4byte 0
-	.4byte 0x4456444C
-	.4byte 0x6F774F70
-	.4byte 0x656E5061
-	.4byte 0x72746974
-	.4byte 0x696F6E57
-	.4byte 0x69746854
-	.4byte 0x6D64416E
-	.4byte 0x64546963
-	.4byte 0x6B657456
-	.4byte 0x69657700
-	.4byte 0x28257329
-	.4byte 0x20655469
-	.4byte 0x636B6574
-	.4byte 0x56696577
-	.4byte 0x20706172
-	.4byte 0x616D6574
-	.4byte 0x65722063
-	.4byte 0x616E6E6F
-	.4byte 0x74206265
-	.4byte 0x204E554C
-	.4byte 0x4C0A0000
-	.4byte 0x28257329
-	.4byte 0x20655469
-	.4byte 0x636B6574
-	.4byte 0x56696577
-	.4byte 0x206D656D
-	.4byte 0x6F727920
-	.4byte 0x69732075
-	.4byte 0x6E616C69
-	.4byte 0x676E6564
-	.4byte 0x0A000000
-	.4byte 0x4456444C
-	.4byte 0x6F774765
-	.4byte 0x744E6F44
-	.4byte 0x69736342
-	.4byte 0x75666665
-	.4byte 0x7253697A
-	.4byte 0x65730000
-	.4byte 0x28257329
-	.4byte 0x20457272
-	.4byte 0x6F723A20
-	.4byte 0x4E554C4C
-	.4byte 0x20706F69
-	.4byte 0x6E746572
-	.4byte 0x20617267
-	.4byte 0x756D656E
-	.4byte 0x740A0000
-	.4byte 0x28257329
-	.4byte 0x206E756D
-	.4byte 0x546D6442
-	.4byte 0x79746573
-	.4byte 0x206D656D
-	.4byte 0x6F727920
-	.4byte 0x69732075
-	.4byte 0x6E616C69
-	.4byte 0x676E6564
-	.4byte 0x0A000000
-	.4byte 0x28257329
-	.4byte 0x20636572
-	.4byte 0x74696669
-	.4byte 0x63617465
-	.4byte 0x73206D65
-	.4byte 0x6D6F7279
-	.4byte 0x20697320
-	.4byte 0x756E616C
-	.4byte 0x69676E65
-	.4byte 0x640A0000
-	.4byte 0x40404020
-	.4byte 0x28257329
-	.4byte 0x20494F53
-	.4byte 0x5F496F63
-	.4byte 0x746C7641
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x4456444C
-	.4byte 0x6F774765
-	.4byte 0x744E6F44
-	.4byte 0x6973634F
-	.4byte 0x70656E50
-	.4byte 0x61727469
-	.4byte 0x74696F6E
-	.4byte 0x50617261
-	.4byte 0x6D730000
-	.4byte 0x28257329
-	.4byte 0x20706F69
-	.4byte 0x6E746572
-	.4byte 0x20617267
-	.4byte 0x756D656E
-	.4byte 0x74206973
-	.4byte 0x20756E61
-	.4byte 0x6C69676E
-	.4byte 0x65640A00
-	.4byte 0x4456444C
-	.4byte 0x6F774E6F
-	.4byte 0x44697363
-	.4byte 0x4F70656E
-	.4byte 0x50617274
-	.4byte 0x6974696F
-	.4byte 0x6E000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7743
-	.4byte 0x6C6F7365
-	.4byte 0x50617274
-	.4byte 0x6974696F
-	.4byte 0x6E292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7755
-	.4byte 0x6E656E63
-	.4byte 0x72797074
-	.4byte 0x65645265
-	.4byte 0x61642920
-	.4byte 0x494F535F
-	.4byte 0x496F6374
-	.4byte 0x6C417379
-	.4byte 0x6E632072
-	.4byte 0x65747572
-	.4byte 0x6E656420
-	.4byte 0x6572726F
-	.4byte 0x723A2025
-	.4byte 0x640A0000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7753
-	.4byte 0x746F704D
-	.4byte 0x6F746F72
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7757
-	.4byte 0x61697446
-	.4byte 0x6F72436F
-	.4byte 0x76657243
-	.4byte 0x6C6F7365
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7749
-	.4byte 0x6E717569
-	.4byte 0x72792920
-	.4byte 0x494F535F
-	.4byte 0x496F6374
-	.4byte 0x6C417379
-	.4byte 0x6E632072
-	.4byte 0x65747572
-	.4byte 0x6E656420
-	.4byte 0x6572726F
-	.4byte 0x723A2025
-	.4byte 0x640A0000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65717565
-	.4byte 0x73744572
-	.4byte 0x726F7229
-	.4byte 0x20494F53
-	.4byte 0x5F496F63
-	.4byte 0x746C4173
-	.4byte 0x796E6320
-	.4byte 0x72657475
-	.4byte 0x726E6564
-	.4byte 0x20657272
-	.4byte 0x6F723A20
-	.4byte 0x25640A00
-	.4byte 0x28445644
-	.4byte 0x4C6F7753
-	.4byte 0x65745370
-	.4byte 0x696E7570
-	.4byte 0x466C6167
-	.4byte 0x293A2053
-	.4byte 0x796E6368
-	.4byte 0x2066756E
-	.4byte 0x6374696F
-	.4byte 0x6E732063
-	.4byte 0x616E2774
-	.4byte 0x20626520
-	.4byte 0x63616C6C
-	.4byte 0x65642069
-	.4byte 0x6E206361
-	.4byte 0x6C6C6261
-	.4byte 0x636B730A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F774E
-	.4byte 0x6F746966
-	.4byte 0x79526573
-	.4byte 0x65742920
-	.4byte 0x494F535F
-	.4byte 0x496F6374
-	.4byte 0x6C417379
-	.4byte 0x6E632072
-	.4byte 0x65747572
-	.4byte 0x6E656420
-	.4byte 0x6572726F
-	.4byte 0x723A2025
-	.4byte 0x640A0000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65736574
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7741
-	.4byte 0x7564696F
-	.4byte 0x42756666
-	.4byte 0x6572436F
-	.4byte 0x6E666967
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x28445644
-	.4byte 0x4C6F7747
-	.4byte 0x6574436F
-	.4byte 0x76657253
-	.4byte 0x74617475
-	.4byte 0x73293A20
-	.4byte 0x53796E63
-	.4byte 0x68206675
-	.4byte 0x6E637469
-	.4byte 0x6F6E7320
-	.4byte 0x63616E27
-	.4byte 0x74206265
-	.4byte 0x2063616C
-	.4byte 0x6C656420
-	.4byte 0x696E2063
-	.4byte 0x616C6C62
-	.4byte 0x61636B73
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7747
-	.4byte 0x6574436F
-	.4byte 0x76657253
-	.4byte 0x74617475
-	.4byte 0x73292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616444
-	.4byte 0x56442920
-	.4byte 0x494F535F
-	.4byte 0x496F6374
-	.4byte 0x6C417379
-	.4byte 0x6E632072
-	.4byte 0x65747572
-	.4byte 0x6E656420
-	.4byte 0x6572726F
-	.4byte 0x723A2025
-	.4byte 0x640A0000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616444
-	.4byte 0x5644436F
-	.4byte 0x6E666967
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616444
-	.4byte 0x7664436F
-	.4byte 0x70797269
-	.4byte 0x67687429
-	.4byte 0x20494F53
-	.4byte 0x5F496F63
-	.4byte 0x746C4173
-	.4byte 0x796E6320
-	.4byte 0x72657475
-	.4byte 0x726E6564
-	.4byte 0x20657272
-	.4byte 0x6F723A20
-	.4byte 0x25640A00
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616444
-	.4byte 0x76645068
-	.4byte 0x79736963
-	.4byte 0x616C2920
-	.4byte 0x494F535F
-	.4byte 0x496F6374
-	.4byte 0x6C417379
-	.4byte 0x6E632072
-	.4byte 0x65747572
-	.4byte 0x6E656420
-	.4byte 0x6572726F
-	.4byte 0x723A2025
-	.4byte 0x640A0000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616444
-	.4byte 0x76644469
-	.4byte 0x73634B65
-	.4byte 0x79292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65706F72
-	.4byte 0x744B6579
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F774F
-	.4byte 0x66667365
-	.4byte 0x74292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7753
-	.4byte 0x746F704C
-	.4byte 0x61736572
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616444
-	.4byte 0x69736B42
-	.4byte 0x63612920
-	.4byte 0x494F535F
-	.4byte 0x496F6374
-	.4byte 0x6C417379
-	.4byte 0x6E632072
-	.4byte 0x65747572
-	.4byte 0x6E656420
-	.4byte 0x6572726F
-	.4byte 0x723A2025
-	.4byte 0x640A0000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7753
-	.4byte 0x65724D65
-	.4byte 0x6173436F
-	.4byte 0x6E74726F
-	.4byte 0x6C292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65717565
-	.4byte 0x73744469
-	.4byte 0x73635374
-	.4byte 0x61747573
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65717565
-	.4byte 0x73745265
-	.4byte 0x7472794E
-	.4byte 0x756D6265
-	.4byte 0x72292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7753
-	.4byte 0x65744D61
-	.4byte 0x78526F74
-	.4byte 0x6174696F
-	.4byte 0x6E292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616429
-	.4byte 0x3A204552
-	.4byte 0x524F5220
-	.4byte 0x2D206465
-	.4byte 0x73744164
-	.4byte 0x64722062
-	.4byte 0x75666665
-	.4byte 0x72206973
-	.4byte 0x206E6F74
-	.4byte 0x20333220
-	.4byte 0x62797465
-	.4byte 0x20616C69
-	.4byte 0x676E6564
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7752
-	.4byte 0x65616429
-	.4byte 0x20494F53
-	.4byte 0x5F496F63
-	.4byte 0x746C4173
-	.4byte 0x796E6320
-	.4byte 0x72657475
-	.4byte 0x726E6564
-	.4byte 0x20657272
-	.4byte 0x6F723A20
-	.4byte 0x25640A00
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7753
-	.4byte 0x65656B29
-	.4byte 0x20494F53
-	.4byte 0x5F496F63
-	.4byte 0x746C4173
-	.4byte 0x796E6320
-	.4byte 0x72657475
-	.4byte 0x726E6564
-	.4byte 0x20657272
-	.4byte 0x6F723A20
-	.4byte 0x25640A00
-	.4byte 0x28445644
-	.4byte 0x4C6F7747
-	.4byte 0x6574436F
-	.4byte 0x76657252
-	.4byte 0x6567293A
-	.4byte 0x2053796E
-	.4byte 0x63682066
-	.4byte 0x756E6374
-	.4byte 0x696F6E73
-	.4byte 0x2063616E
-	.4byte 0x27742062
-	.4byte 0x65206361
-	.4byte 0x6C6C6564
-	.4byte 0x20696E20
-	.4byte 0x63616C6C
-	.4byte 0x6261636B
-	.4byte 0x730A0000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7747
-	.4byte 0x6574436F
-	.4byte 0x76657252
-	.4byte 0x65672920
-	.4byte 0x494F535F
-	.4byte 0x496F6374
-	.4byte 0x6C207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7750
-	.4byte 0x72657061
-	.4byte 0x7265436F
-	.4byte 0x76657252
-	.4byte 0x65677369
-	.4byte 0x74657229
-	.4byte 0x20494F53
-	.4byte 0x5F496F63
-	.4byte 0x746C4173
-	.4byte 0x796E6320
-	.4byte 0x72657475
-	.4byte 0x726E6564
-	.4byte 0x20657272
-	.4byte 0x6F723A20
-	.4byte 0x25640A00
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7750
-	.4byte 0x72657061
-	.4byte 0x72655374
-	.4byte 0x61747573
-	.4byte 0x52656773
-	.4byte 0x69746572
-	.4byte 0x2920494F
-	.4byte 0x535F496F
-	.4byte 0x63746C41
-	.4byte 0x73796E63
-	.4byte 0x20726574
-	.4byte 0x75726E65
-	.4byte 0x64206572
-	.4byte 0x726F723A
-	.4byte 0x2025640A
-	.4byte 0
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7750
-	.4byte 0x72657061
-	.4byte 0x7265436F
-	.4byte 0x6E74726F
-	.4byte 0x6C526567
-	.4byte 0x69737465
-	.4byte 0x72292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7743
-	.4byte 0x6C656172
-	.4byte 0x436F7665
-	.4byte 0x72496E74
-	.4byte 0x65727275
-	.4byte 0x70742920
-	.4byte 0x494F535F
-	.4byte 0x496F6374
-	.4byte 0x6C417379
-	.4byte 0x6E632072
-	.4byte 0x65747572
-	.4byte 0x6E656420
-	.4byte 0x6572726F
-	.4byte 0x723A2025
-	.4byte 0x640A0000
-	.4byte 0x40404020
-	.4byte 0x28445644
-	.4byte 0x4C6F7745
-	.4byte 0x6E61626C
-	.4byte 0x65447664
-	.4byte 0x56696465
-	.4byte 0x6F292049
-	.4byte 0x4F535F49
-	.4byte 0x6F63746C
-	.4byte 0x4173796E
-	.4byte 0x63207265
-	.4byte 0x7475726E
-	.4byte 0x65642065
-	.4byte 0x72726F72
-	.4byte 0x3A202564
-	.4byte 0x0A000000
diff --git a/asm/dvd/dvd_broadway_8049fd60.s b/asm/dvd/dvd_broadway_8049fd60.s
deleted file mode 100644
index 0e9d2831..00000000
--- a/asm/dvd/dvd_broadway_8049fd60.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global dvdContexts
-dvdContexts:
-	.skip 0x80
-
-.global diRegValCache
-diRegValCache:
-	.skip 0x20
-
-.global registerBuf
-registerBuf:
-	.skip 0x20
-
-.global ioVec
-ioVec:
-	.skip 0xC0
-
-.global statusRegister
-statusRegister:
-	.skip 0x20
-
-.global controlRegister
-controlRegister:
-	.skip 0x20
diff --git a/asm/dvd/dvd_broadway_80556600.s b/asm/dvd/dvd_broadway_80556600.s
deleted file mode 100644
index 71148fc3..00000000
--- a/asm/dvd/dvd_broadway_80556600.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global DiFD
-DiFD:
-
-	.4byte 0xFFFFFFFF
-	.4byte 0
-
-.global "@3856"
-"@3856":
-
-	.4byte 0x2F646576
-	.4byte 0x2F646900
diff --git a/asm/dvd/dvd_broadway_8055cb18.s b/asm/dvd/dvd_broadway_8055cb18.s
deleted file mode 100644
index fbceed1b..00000000
--- a/asm/dvd/dvd_broadway_8055cb18.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global requestInProgress
-requestInProgress:
-	.skip 0x1
-
-.global callbackInProgress
-callbackInProgress:
-	.skip 0x3
-
-.global freeCommandBuf
-freeCommandBuf:
-	.skip 0x4
-
-.global freeDvdContext
-freeDvdContext:
-	.skip 0x4
-
-.global dvdContextsInited
-dvdContextsInited:
-	.skip 0x1
-
-.global DVDLowInitCalled
-DVDLowInitCalled:
-	.skip 0x3
-
-.global spinUpValue
-spinUpValue:
-	.skip 0x4
-
-.global readLength
-readLength:
-	.skip 0x4
-
-.global pathBuf
-pathBuf:
-	.skip 0x4
-
-.global diCommand
-diCommand:
-	.skip 0x4
-
-.global breakRequested
-breakRequested:
-	.skip 0x8
diff --git a/asm/dvd/dvderror_8003f2d0.s b/asm/dvd/dvderror.s
similarity index 97%
rename from asm/dvd/dvderror_8003f2d0.s
rename to asm/dvd/dvderror.s
index da0a0251..a3f92bda 100644
--- a/asm/dvd/dvderror_8003f2d0.s
+++ b/asm/dvd/dvderror.s
@@ -739,3 +739,53 @@ __DVDStoreErrorCode:
 /* 8003FCE4 0003BB24  4E 80 00 20 */	blr
 /* 8003FCE8 0003BB28  00 00 00 00 */	.4byte 0x00000000
 /* 8003FCEC 0003BB2C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@1459"
+"@1459":
+
+	.4byte 0x2F736861
+	.4byte 0x72656432
+	.4byte 0x2F746573
+	.4byte 0x74322F64
+	.4byte 0x76646572
+	.4byte 0x726F722E
+	.4byte 0x64617400
+
+.global "@1478"
+"@1478":
+
+	.4byte 0x2F736861
+	.4byte 0x72656432
+	.4byte 0x2F746573
+	.4byte 0x74320000
+	.4byte 0
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global NandInfo
+NandInfo:
+	.skip 0x8C
+
+.global NandCb
+NandCb:
+	.skip 0xD4
+
+.global __ErrorInfo
+__ErrorInfo:
+	.skip 0x100
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global ExistFlag
+ExistFlag:
+	.skip 0x4
+
+.global NextOffset
+NextOffset:
+	.skip 0x4
+
+.global Callback_8055CB00
+Callback_8055CB00:
+	.skip 0x8
diff --git a/asm/dvd/dvderror_804316a8.s b/asm/dvd/dvderror_804316a8.s
deleted file mode 100644
index d93dfbb4..00000000
--- a/asm/dvd/dvderror_804316a8.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@1459"
-"@1459":
-
-	.4byte 0x2F736861
-	.4byte 0x72656432
-	.4byte 0x2F746573
-	.4byte 0x74322F64
-	.4byte 0x76646572
-	.4byte 0x726F722E
-	.4byte 0x64617400
-
-.global "@1478"
-"@1478":
-
-	.4byte 0x2F736861
-	.4byte 0x72656432
-	.4byte 0x2F746573
-	.4byte 0x74320000
-	.4byte 0
diff --git a/asm/dvd/dvderror_8049fae0.s b/asm/dvd/dvderror_8049fae0.s
deleted file mode 100644
index e321ec28..00000000
--- a/asm/dvd/dvderror_8049fae0.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global NandInfo
-NandInfo:
-	.skip 0x8C
-
-.global NandCb
-NandCb:
-	.skip 0xD4
-
-.global __ErrorInfo
-__ErrorInfo:
-	.skip 0x100
diff --git a/asm/dvd/dvderror_8055caf8.s b/asm/dvd/dvderror_8055caf8.s
deleted file mode 100644
index 23b5c1fa..00000000
--- a/asm/dvd/dvderror_8055caf8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global ExistFlag
-ExistFlag:
-	.skip 0x4
-
-.global NextOffset
-NextOffset:
-	.skip 0x4
-
-.global Callback_8055CB00
-Callback_8055CB00:
-	.skip 0x8
diff --git a/asm/dvd/dvdfs_800398f0.s b/asm/dvd/dvdfs.s
similarity index 92%
rename from asm/dvd/dvdfs_800398f0.s
rename to asm/dvd/dvdfs.s
index 80c79bbb..f09732db 100644
--- a/asm/dvd/dvdfs_800398f0.s
+++ b/asm/dvd/dvdfs.s
@@ -697,3 +697,151 @@ cbForReadSync:
 /* 8003A134 00035F74  4B FE B7 CC */	b OSWakeupThread
 /* 8003A138 00035F78  00 00 00 00 */	.4byte 0x00000000
 /* 8003A13C 00035F7C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@1638_804310F8"
+"@1638_804310F8":
+
+	.4byte 0x44564443
+	.4byte 0x6F6E7665
+	.4byte 0x7274456E
+	.4byte 0x7472796E
+	.4byte 0x756D546F
+	.4byte 0x50617468
+	.4byte 0x28706F73
+	.4byte 0x7369626C
+	.4byte 0x79204456
+	.4byte 0x444F7065
+	.4byte 0x6E206F72
+	.4byte 0x20445644
+	.4byte 0x4368616E
+	.4byte 0x67654469
+	.4byte 0x72206F72
+	.4byte 0x20445644
+	.4byte 0x4F70656E
+	.4byte 0x44697229
+	.4byte 0x3A207370
+	.4byte 0x65636966
+	.4byte 0x69656420
+	.4byte 0x64697265
+	.4byte 0x63746F72
+	.4byte 0x79206F72
+	.4byte 0x2066696C
+	.4byte 0x65202825
+	.4byte 0x73292064
+	.4byte 0x6F65736E
+	.4byte 0x2774206D
+	.4byte 0x61746368
+	.4byte 0x20737461
+	.4byte 0x6E646172
+	.4byte 0x6420382E
+	.4byte 0x3320666F
+	.4byte 0x726D6174
+	.4byte 0x2E205468
+	.4byte 0x69732069
+	.4byte 0x73206120
+	.4byte 0x74656D70
+	.4byte 0x6F726172
+	.4byte 0x79207265
+	.4byte 0x73747269
+	.4byte 0x6374696F
+	.4byte 0x6E20616E
+	.4byte 0x64207769
+	.4byte 0x6C6C2062
+	.4byte 0x65207265
+	.4byte 0x6D6F7665
+	.4byte 0x6420736F
+	.4byte 0x6F6E0A00
+
+.global "@1688_804311C0"
+"@1688_804311C0":
+
+	.4byte 0x5761726E
+	.4byte 0x696E673A
+	.4byte 0x20445644
+	.4byte 0x4F70656E
+	.4byte 0x28293A20
+	.4byte 0x66696C65
+	.4byte 0x20272573
+	.4byte 0x27207761
+	.4byte 0x73206E6F
+	.4byte 0x7420666F
+	.4byte 0x756E6420
+	.4byte 0x756E6465
+	.4byte 0x72202573
+	.4byte 0x2E0A0000
+
+.global "@1762_804311F8"
+"@1762_804311F8":
+
+	.4byte 0x44564452
+	.4byte 0x65616441
+	.4byte 0x73796E63
+	.4byte 0x28293A20
+	.4byte 0x73706563
+	.4byte 0x69666965
+	.4byte 0x64206172
+	.4byte 0x65612069
+	.4byte 0x73206F75
+	.4byte 0x74206F66
+	.4byte 0x20746865
+	.4byte 0x2066696C
+	.4byte 0x65202000
+
+.global "@1787_8043122C"
+"@1787_8043122C":
+
+	.4byte 0x44564452
+	.4byte 0x65616428
+	.4byte 0x293A2073
+	.4byte 0x70656369
+	.4byte 0x66696564
+	.4byte 0x20617265
+	.4byte 0x61206973
+	.4byte 0x206F7574
+	.4byte 0x206F6620
+	.4byte 0x74686520
+	.4byte 0x66696C65
+	.4byte 0x20200000
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __DVDLongFileNameFlag
+__DVDLongFileNameFlag:
+
+	.4byte 0x00000001
+	.4byte 0
+
+.global "@1637_805565D0"
+"@1637_805565D0":
+
+	.4byte 0x64766466
+	.4byte 0x732E6300
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global currentDirectory
+currentDirectory:
+	.skip 0x8
+
+.global __DVDThreadQueue
+__DVDThreadQueue:
+	.skip 0x8
+
+.global MaxEntryNum
+MaxEntryNum:
+	.skip 0x4
+
+.global FstStringStart
+FstStringStart:
+	.skip 0x4
+
+.global FstStart
+FstStart:
+	.skip 0x4
+
+.global BootInfo_8055CA4C
+BootInfo_8055CA4C:
+	.skip 0x14
diff --git a/asm/dvd/dvdfs_804310f8.s b/asm/dvd/dvdfs_804310f8.s
deleted file mode 100644
index e070fc77..00000000
--- a/asm/dvd/dvdfs_804310f8.s
+++ /dev/null
@@ -1,108 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@1638_804310F8"
-"@1638_804310F8":
-
-	.4byte 0x44564443
-	.4byte 0x6F6E7665
-	.4byte 0x7274456E
-	.4byte 0x7472796E
-	.4byte 0x756D546F
-	.4byte 0x50617468
-	.4byte 0x28706F73
-	.4byte 0x7369626C
-	.4byte 0x79204456
-	.4byte 0x444F7065
-	.4byte 0x6E206F72
-	.4byte 0x20445644
-	.4byte 0x4368616E
-	.4byte 0x67654469
-	.4byte 0x72206F72
-	.4byte 0x20445644
-	.4byte 0x4F70656E
-	.4byte 0x44697229
-	.4byte 0x3A207370
-	.4byte 0x65636966
-	.4byte 0x69656420
-	.4byte 0x64697265
-	.4byte 0x63746F72
-	.4byte 0x79206F72
-	.4byte 0x2066696C
-	.4byte 0x65202825
-	.4byte 0x73292064
-	.4byte 0x6F65736E
-	.4byte 0x2774206D
-	.4byte 0x61746368
-	.4byte 0x20737461
-	.4byte 0x6E646172
-	.4byte 0x6420382E
-	.4byte 0x3320666F
-	.4byte 0x726D6174
-	.4byte 0x2E205468
-	.4byte 0x69732069
-	.4byte 0x73206120
-	.4byte 0x74656D70
-	.4byte 0x6F726172
-	.4byte 0x79207265
-	.4byte 0x73747269
-	.4byte 0x6374696F
-	.4byte 0x6E20616E
-	.4byte 0x64207769
-	.4byte 0x6C6C2062
-	.4byte 0x65207265
-	.4byte 0x6D6F7665
-	.4byte 0x6420736F
-	.4byte 0x6F6E0A00
-
-.global "@1688_804311C0"
-"@1688_804311C0":
-
-	.4byte 0x5761726E
-	.4byte 0x696E673A
-	.4byte 0x20445644
-	.4byte 0x4F70656E
-	.4byte 0x28293A20
-	.4byte 0x66696C65
-	.4byte 0x20272573
-	.4byte 0x27207761
-	.4byte 0x73206E6F
-	.4byte 0x7420666F
-	.4byte 0x756E6420
-	.4byte 0x756E6465
-	.4byte 0x72202573
-	.4byte 0x2E0A0000
-
-.global "@1762_804311F8"
-"@1762_804311F8":
-
-	.4byte 0x44564452
-	.4byte 0x65616441
-	.4byte 0x73796E63
-	.4byte 0x28293A20
-	.4byte 0x73706563
-	.4byte 0x69666965
-	.4byte 0x64206172
-	.4byte 0x65612069
-	.4byte 0x73206F75
-	.4byte 0x74206F66
-	.4byte 0x20746865
-	.4byte 0x2066696C
-	.4byte 0x65202000
-
-.global "@1787_8043122C"
-"@1787_8043122C":
-
-	.4byte 0x44564452
-	.4byte 0x65616428
-	.4byte 0x293A2073
-	.4byte 0x70656369
-	.4byte 0x66696564
-	.4byte 0x20617265
-	.4byte 0x61206973
-	.4byte 0x206F7574
-	.4byte 0x206F6620
-	.4byte 0x74686520
-	.4byte 0x66696C65
-	.4byte 0x20200000
-	.4byte 0
diff --git a/asm/dvd/dvdfs_805565c8.s b/asm/dvd/dvdfs_805565c8.s
deleted file mode 100644
index bb42cf1a..00000000
--- a/asm/dvd/dvdfs_805565c8.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __DVDLongFileNameFlag
-__DVDLongFileNameFlag:
-
-	.4byte 0x00000001
-	.4byte 0
-
-.global "@1637_805565D0"
-"@1637_805565D0":
-
-	.4byte 0x64766466
-	.4byte 0x732E6300
diff --git a/asm/dvd/dvdfs_8055ca30.s b/asm/dvd/dvdfs_8055ca30.s
deleted file mode 100644
index b7df8ddc..00000000
--- a/asm/dvd/dvdfs_8055ca30.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global currentDirectory
-currentDirectory:
-	.skip 0x8
-
-.global __DVDThreadQueue
-__DVDThreadQueue:
-	.skip 0x8
-
-.global MaxEntryNum
-MaxEntryNum:
-	.skip 0x4
-
-.global FstStringStart
-FstStringStart:
-	.skip 0x4
-
-.global FstStart
-FstStart:
-	.skip 0x4
-
-.global BootInfo_8055CA4C
-BootInfo_8055CA4C:
-	.skip 0x14
diff --git a/asm/dvd/dvdidutils_8003fcf0.s b/asm/dvd/dvdidutils.s
similarity index 100%
rename from asm/dvd/dvdidutils_8003fcf0.s
rename to asm/dvd/dvdidutils.s
diff --git a/asm/dvd/dvdqueue_8003f050.s b/asm/dvd/dvdqueue.s
similarity index 98%
rename from asm/dvd/dvdqueue_8003f050.s
rename to asm/dvd/dvdqueue.s
index b0bfa2c7..207f9cdc 100644
--- a/asm/dvd/dvdqueue_8003f050.s
+++ b/asm/dvd/dvdqueue.s
@@ -197,3 +197,9 @@ lbl_8003F2BC:
 /* 8003F2C4 0003B104  7C 08 03 A6 */	mtlr r0
 /* 8003F2C8 0003B108  38 21 00 10 */	addi r1, r1, 0x10
 /* 8003F2CC 0003B10C  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global WaitingQueue
+WaitingQueue:
+	.skip 0x30
diff --git a/asm/dvd/dvdqueue_8049fab0.s b/asm/dvd/dvdqueue_8049fab0.s
deleted file mode 100644
index b55d5fed..00000000
--- a/asm/dvd/dvdqueue_8049fab0.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global WaitingQueue
-WaitingQueue:
-	.skip 0x30
diff --git a/obj_files.mk b/obj_files.mk
index 2161effc..96af630c 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -180,16 +180,17 @@ $(BUILD_DIR)/asm/gx/GXDisplayList.o \
 $(BUILD_DIR)/asm/gx/GXTransform.o \
 $(BUILD_DIR)/asm/gx/GXPerf.o \
 \
+$(BUILD_DIR)/asm/dvd/dvdfs.o \
+$(BUILD_DIR)/asm/dvd/dvd.o \
+$(BUILD_DIR)/asm/dvd/dvdqueue.o \
+$(BUILD_DIR)/asm/dvd/dvderror.o \
+$(BUILD_DIR)/asm/dvd/dvdidutils.o \
+$(BUILD_DIR)/asm/dvd/dvdFatal.o \
+$(BUILD_DIR)/asm/dvd/dvdDeviceError.o \
+$(BUILD_DIR)/asm/dvd/dvd_broadway.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/dvd/dvdfs_800398f0.o \
-$(BUILD_DIR)/asm/dvd/dvd_8003a140.o \
-$(BUILD_DIR)/asm/dvd/dvdqueue_8003f050.o \
-$(BUILD_DIR)/asm/dvd/dvderror_8003f2d0.o \
-$(BUILD_DIR)/asm/dvd/dvdidutils_8003fcf0.o \
-$(BUILD_DIR)/asm/dvd/dvdFatal_8003fde0.o \
-$(BUILD_DIR)/asm/dvd/dvdDeviceError_8003ff50.o \
-$(BUILD_DIR)/asm/dvd/dvd_broadway_800401e0.o \
 $(BUILD_DIR)/asm/ai/ai_80042860.o \
 $(BUILD_DIR)/asm/ax/AX_80042e10.o \
 $(BUILD_DIR)/asm/ax/AXAlloc_80042e80.o \
@@ -2991,8 +2992,6 @@ $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \
 $(BUILD_DIR)/asm/src/Alarm_80406528.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \
-$(BUILD_DIR)/asm/dvd/dvdFatal_80407850.o \
-$(BUILD_DIR)/asm/dvd/dvdDeviceError_80407888.o \
 $(BUILD_DIR)/asm/nand/nand_804078a8.o \
 $(BUILD_DIR)/asm/nand/NANDCore_804078f0.o \
 $(BUILD_DIR)/asm/nand/NANDErrorMessage_80407a38.o \
@@ -3223,12 +3222,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/dvd/dvdfs_804310f8.o \
-$(BUILD_DIR)/asm/dvd/dvd_80431260.o \
-$(BUILD_DIR)/asm/dvd/dvderror_804316a8.o \
-$(BUILD_DIR)/asm/dvd/dvdFatal_804316d8.o \
-$(BUILD_DIR)/asm/dvd/dvdDeviceError_80431ea0.o \
-$(BUILD_DIR)/asm/dvd/dvd_broadway_80432038.o \
 $(BUILD_DIR)/asm/ai/ai_80432f40.o \
 $(BUILD_DIR)/asm/ax/AX_80432f88.o \
 $(BUILD_DIR)/asm/ax/AXVPB_80432fd0.o \
@@ -5030,11 +5023,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/dvd/dvd_8049ae00.o \
-$(BUILD_DIR)/asm/dvd/dvdqueue_8049fab0.o \
-$(BUILD_DIR)/asm/dvd/dvderror_8049fae0.o \
-$(BUILD_DIR)/asm/dvd/dvdDeviceError_8049fd40.o \
-$(BUILD_DIR)/asm/dvd/dvd_broadway_8049fd60.o \
 $(BUILD_DIR)/asm/ax/AXAlloc_8049ff20.o \
 $(BUILD_DIR)/asm/ax/AXAux_804a0020.o \
 $(BUILD_DIR)/asm/ax/AXCL_804a31a0.o \
@@ -5172,11 +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/dvd/dvdfs_805565c8.o \
-$(BUILD_DIR)/asm/dvd/dvd_805565d8.o \
-$(BUILD_DIR)/asm/dvd/dvdFatal_805565f0.o \
-$(BUILD_DIR)/asm/dvd/dvdDeviceError_805565f8.o \
-$(BUILD_DIR)/asm/dvd/dvd_broadway_80556600.o \
 $(BUILD_DIR)/asm/ai/ai_80556610.o \
 $(BUILD_DIR)/asm/ax/AX_80556618.o \
 $(BUILD_DIR)/asm/ax/DSPCode_80556620.o \
@@ -5618,12 +5601,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/dvd/dvdfs_8055ca30.o \
-$(BUILD_DIR)/asm/dvd/dvd_8055ca60.o \
-$(BUILD_DIR)/asm/dvd/dvderror_8055caf8.o \
-$(BUILD_DIR)/asm/dvd/dvdFatal_8055cb08.o \
-$(BUILD_DIR)/asm/dvd/dvdDeviceError_8055cb10.o \
-$(BUILD_DIR)/asm/dvd/dvd_broadway_8055cb18.o \
 $(BUILD_DIR)/asm/ai/ai_8055cb40.o \
 $(BUILD_DIR)/asm/ax/AX_8055cb80.o \
 $(BUILD_DIR)/asm/ax/AXAlloc_8055cb88.o \
@@ -5843,8 +5820,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
 $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
 $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
 $(BUILD_DIR)/asm/src/Alarm_8055df68.o \
-$(BUILD_DIR)/asm/dvd/dvdFatal_8055e698.o \
-$(BUILD_DIR)/asm/dvd/dvdDeviceError_8055e6a0.o \
 $(BUILD_DIR)/asm/ax/AXVPB_8055e6a8.o \
 $(BUILD_DIR)/asm/axfx/AXFXReverbHi_8055e6c8.o \
 $(BUILD_DIR)/asm/axfx/AXFXReverbHiExp_8055e6d0.o \