From e505a04024be69d9197b3536ce02165d8b1b0f49 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:22:20 +0100
Subject: [PATCH] merge nand

---
 .../{NANDCheck_8004a910.s => NANDCheck.s}     |  96 ++++
 asm/nand/NANDCheck_804364d0.s                 |  82 ---
 asm/nand/NANDCheck_80556660.s                 |  14 -
 asm/nand/{NANDCore_800497b0.s => NANDCore.s}  | 240 +++++++++
 asm/nand/NANDCore_804078f0.s                  |  88 ----
 asm/nand/NANDCore_80436380.s                  | 102 ----
 asm/nand/NANDCore_804b5820.s                  |   6 -
 asm/nand/NANDCore_80556640.s                  |  38 --
 asm/nand/NANDCore_8055cce0.s                  |   6 -
 ...rMessage_804365c8.s => NANDErrorMessage.s} | 471 ++++++++++++++++++
 asm/nand/NANDErrorMessage_8004b130.s          | 247 ---------
 asm/nand/NANDErrorMessage_80407a38.s          | 180 -------
 asm/nand/NANDErrorMessage_8055ccf0.s          |   6 -
 asm/nand/NANDErrorMessage_8055e710.s          |  38 --
 .../{NANDLogging_8004aae0.s => NANDLogging.s} |  56 +++
 asm/nand/NANDLogging_80436580.s               |  28 --
 asm/nand/NANDLogging_804b5880.s               |   6 -
 asm/nand/NANDLogging_80556670.s               |  12 -
 asm/nand/NANDLogging_8055cce8.s               |  10 -
 ...NDOpenClose_800492a0.s => NANDOpenClose.s} |   0
 asm/nand/{nand_80047e40.s => nand.s}          |  36 ++
 asm/nand/nand_804078a8.s                      |  24 -
 asm/nand/nand_80556638.s                      |  12 -
 obj_files.mk                                  |  30 +-
 24 files changed, 906 insertions(+), 922 deletions(-)
 rename asm/nand/{NANDCheck_8004a910.s => NANDCheck.s} (83%)
 delete mode 100644 asm/nand/NANDCheck_804364d0.s
 delete mode 100644 asm/nand/NANDCheck_80556660.s
 rename asm/nand/{NANDCore_800497b0.s => NANDCore.s} (94%)
 delete mode 100644 asm/nand/NANDCore_804078f0.s
 delete mode 100644 asm/nand/NANDCore_80436380.s
 delete mode 100644 asm/nand/NANDCore_804b5820.s
 delete mode 100644 asm/nand/NANDCore_80556640.s
 delete mode 100644 asm/nand/NANDCore_8055cce0.s
 rename asm/nand/{NANDErrorMessage_804365c8.s => NANDErrorMessage.s} (68%)
 delete mode 100644 asm/nand/NANDErrorMessage_8004b130.s
 delete mode 100644 asm/nand/NANDErrorMessage_80407a38.s
 delete mode 100644 asm/nand/NANDErrorMessage_8055ccf0.s
 delete mode 100644 asm/nand/NANDErrorMessage_8055e710.s
 rename asm/nand/{NANDLogging_8004aae0.s => NANDLogging.s} (96%)
 delete mode 100644 asm/nand/NANDLogging_80436580.s
 delete mode 100644 asm/nand/NANDLogging_804b5880.s
 delete mode 100644 asm/nand/NANDLogging_80556670.s
 delete mode 100644 asm/nand/NANDLogging_8055cce8.s
 rename asm/nand/{NANDOpenClose_800492a0.s => NANDOpenClose.s} (100%)
 rename asm/nand/{nand_80047e40.s => nand.s} (99%)
 delete mode 100644 asm/nand/nand_804078a8.s
 delete mode 100644 asm/nand/nand_80556638.s

diff --git a/asm/nand/NANDCheck_8004a910.s b/asm/nand/NANDCheck.s
similarity index 83%
rename from asm/nand/NANDCheck_8004a910.s
rename to asm/nand/NANDCheck.s
index ef84ca5f..dc5c1a5d 100644
--- a/asm/nand/NANDCheck_8004a910.s
+++ b/asm/nand/NANDCheck.s
@@ -147,3 +147,99 @@ lbl_8004AABC:
 /* 8004AAD4 00046914  4E 80 00 20 */	blr
 /* 8004AAD8 00046918  00 00 00 00 */	.4byte 0x00000000
 /* 8004AADC 0004691C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@2294"
+"@2294":
+
+	.4byte 0x2F746974
+	.4byte 0x6C652F30
+	.4byte 0x30303130
+	.4byte 0x30303000
+
+.global "@2295"
+"@2295":
+
+	.4byte 0x2F746974
+	.4byte 0x6C652F30
+	.4byte 0x30303130
+	.4byte 0x30303100
+
+.global "@2296"
+"@2296":
+
+	.4byte 0x2F746974
+	.4byte 0x6C652F30
+	.4byte 0x30303130
+	.4byte 0x30303300
+
+.global "@2297"
+"@2297":
+
+	.4byte 0x2F746974
+	.4byte 0x6C652F30
+	.4byte 0x30303130
+	.4byte 0x30303400
+
+.global "@2298"
+"@2298":
+
+	.4byte 0x2F746974
+	.4byte 0x6C652F30
+	.4byte 0x30303130
+	.4byte 0x30303500
+
+.global "@2299"
+"@2299":
+
+	.4byte 0x2F746974
+	.4byte 0x6C652F30
+	.4byte 0x30303130
+	.4byte 0x30303600
+
+.global "@2300"
+"@2300":
+
+	.4byte 0x2F746974
+	.4byte 0x6C652F30
+	.4byte 0x30303130
+	.4byte 0x30303700
+
+.global "@2301"
+"@2301":
+
+	.4byte 0x2F736861
+	.4byte 0x72656432
+	.4byte 0x2F746974
+	.4byte 0x6C650000
+
+.global USER_DIR_LIST
+USER_DIR_LIST:
+
+	.4byte "@2292"
+	.4byte "@2293"
+	.4byte "@2294"
+	.4byte "@2295"
+	.4byte "@2296"
+	.4byte "@2297"
+	.4byte "@2298"
+	.4byte "@2299"
+	.4byte "@2300"
+	.4byte "@2301"
+	.4byte 0
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@2292"
+"@2292":
+
+	.4byte 0x2F6D6574
+	.4byte 0x61000000
+
+.global "@2293"
+"@2293":
+
+	.4byte 0x2F746963
+	.4byte 0x6B657400
diff --git a/asm/nand/NANDCheck_804364d0.s b/asm/nand/NANDCheck_804364d0.s
deleted file mode 100644
index cd746f5d..00000000
--- a/asm/nand/NANDCheck_804364d0.s
+++ /dev/null
@@ -1,82 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@2294"
-"@2294":
-
-	.4byte 0x2F746974
-	.4byte 0x6C652F30
-	.4byte 0x30303130
-	.4byte 0x30303000
-
-.global "@2295"
-"@2295":
-
-	.4byte 0x2F746974
-	.4byte 0x6C652F30
-	.4byte 0x30303130
-	.4byte 0x30303100
-
-.global "@2296"
-"@2296":
-
-	.4byte 0x2F746974
-	.4byte 0x6C652F30
-	.4byte 0x30303130
-	.4byte 0x30303300
-
-.global "@2297"
-"@2297":
-
-	.4byte 0x2F746974
-	.4byte 0x6C652F30
-	.4byte 0x30303130
-	.4byte 0x30303400
-
-.global "@2298"
-"@2298":
-
-	.4byte 0x2F746974
-	.4byte 0x6C652F30
-	.4byte 0x30303130
-	.4byte 0x30303500
-
-.global "@2299"
-"@2299":
-
-	.4byte 0x2F746974
-	.4byte 0x6C652F30
-	.4byte 0x30303130
-	.4byte 0x30303600
-
-.global "@2300"
-"@2300":
-
-	.4byte 0x2F746974
-	.4byte 0x6C652F30
-	.4byte 0x30303130
-	.4byte 0x30303700
-
-.global "@2301"
-"@2301":
-
-	.4byte 0x2F736861
-	.4byte 0x72656432
-	.4byte 0x2F746974
-	.4byte 0x6C650000
-
-.global USER_DIR_LIST
-USER_DIR_LIST:
-
-	.4byte "@2292"
-	.4byte "@2293"
-	.4byte "@2294"
-	.4byte "@2295"
-	.4byte "@2296"
-	.4byte "@2297"
-	.4byte "@2298"
-	.4byte "@2299"
-	.4byte "@2300"
-	.4byte "@2301"
-	.4byte 0
-	.4byte 0
diff --git a/asm/nand/NANDCheck_80556660.s b/asm/nand/NANDCheck_80556660.s
deleted file mode 100644
index 29e18fe6..00000000
--- a/asm/nand/NANDCheck_80556660.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@2292"
-"@2292":
-
-	.4byte 0x2F6D6574
-	.4byte 0x61000000
-
-.global "@2293"
-"@2293":
-
-	.4byte 0x2F746963
-	.4byte 0x6B657400
diff --git a/asm/nand/NANDCore_800497b0.s b/asm/nand/NANDCore.s
similarity index 94%
rename from asm/nand/NANDCore_800497b0.s
rename to asm/nand/NANDCore.s
index c4bb35df..40a2f562 100644
--- a/asm/nand/NANDCore_800497b0.s
+++ b/asm/nand/NANDCore.s
@@ -1378,3 +1378,243 @@ nandGetHomeDir:
 /* 8004A904 00046744  38 63 58 20 */	addi r3, r3, s_homeDir@l
 /* 8004A908 00046748  4E 80 00 20 */	blr
 /* 8004A90C 0004674C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global "@3073"
+"@3073":
+
+	.4byte 0
+	.4byte 0
+	.4byte 0xFFFFFF9A
+	.4byte 0xFFFFFFFF
+	.4byte 0xFFFFFF99
+	.4byte 0xFFFFFFFC
+	.4byte 0xFFFFFF8E
+	.4byte 0xFFFFFFFB
+	.4byte 0xFFFFFF97
+	.4byte 0xFFFFFFFA
+	.4byte 0xFFFFFF8C
+	.4byte 0xFFFFFFF1
+	.4byte 0xFFFFFF9B
+	.4byte 0xFFFFFFF8
+	.4byte 0xFFFFFF94
+	.4byte 0xFFFFFFF7
+	.4byte 0xFFFFFF93
+	.4byte 0xFFFFFFF6
+	.4byte 0xFFFFFF95
+	.4byte 0xFFFFFFF5
+	.4byte 0xFFFFFF92
+	.4byte 0xFFFFFFF0
+	.4byte 0xFFFFFF96
+	.4byte 0xFFFFFFF4
+	.4byte 0xFFFFFF8D
+	.4byte 0xFFFFFFF3
+	.4byte 0xFFFFFF98
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFF91
+	.4byte 0xFFFFFFF2
+	.4byte 0xFFFFFF8B
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFF8A
+	.4byte 0xFFFFFFFD
+	.4byte 0xFFFFFF89
+	.4byte 0xFFFFFF80
+	.4byte 0xFFFFFFFF
+	.4byte 0xFFFFFFFF
+	.4byte 0xFFFFFFFE
+	.4byte 0xFFFFFFFA
+	.4byte 0xFFFFFFFD
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFFC
+	.4byte 0xFFFFFFF8
+	.4byte 0xFFFFFFFB
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFFA
+	.4byte 0xFFFFFFF4
+	.4byte 0xFFFFFFF9
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFF8
+	.4byte 0xFFFFFFFD
+	.4byte 0xFFFFFFF7
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFF6
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFF5
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFF4
+	.4byte 0xFFFFFFFB
+	.4byte 0xFFFFFFF3
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFF2
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFF1
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFF0
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFEF
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFEE
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFED
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFEC
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFEB
+	.4byte 0xFFFFFFC0
+	.4byte 0xFFFFFFEA
+	.4byte 0xFFFFFFFE
+	.4byte 0xFFFFFFE9
+	.4byte 0xFFFFFFC0
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@2807_80436380"
+"@2807_80436380":
+
+	.4byte 0x3C3C2052
+	.4byte 0x564C5F53
+	.4byte 0x444B202D
+	.4byte 0x204E414E
+	.4byte 0x44200972
+	.4byte 0x656C6561
+	.4byte 0x73652062
+	.4byte 0x75696C64
+	.4byte 0x3A204175
+	.4byte 0x67203233
+	.4byte 0x20323031
+	.4byte 0x30203137
+	.4byte 0x3A33333A
+	.4byte 0x34362028
+	.4byte 0x30783433
+	.4byte 0x30325F31
+	.4byte 0x34352920
+	.4byte 0x3E3E0000
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+
+.global s_currentDir
+s_currentDir:
+
+	.4byte 0x2F000000
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte 0
+	.4byte nandOnShutdown
+	.4byte 0x000000FF
+	.4byte 0
+	.4byte 0
+
+.global "@3814"
+"@3814":
+
+	.4byte 0x2F736861
+	.4byte 0x72656432
+	.4byte 0
+
+.global "@3818"
+"@3818":
+
+	.4byte 0x2F736861
+	.4byte 0x72656432
+	.4byte 0x2F000000
+	.4byte 0x49534653
+	.4byte 0x20657272
+	.4byte 0x6F722063
+	.4byte 0x6F64653A
+	.4byte 0x20256400
+	.4byte 0x43415554
+	.4byte 0x494F4E21
+	.4byte 0x2020556E
+	.4byte 0x65787065
+	.4byte 0x63746564
+	.4byte 0x20657272
+	.4byte 0x6F722063
+	.4byte 0x6F646520
+	.4byte 0x5B25645D
+	.4byte 0x20776173
+	.4byte 0x20666F75
+	.4byte 0x6E642E0A
+	.4byte 0
+	.4byte 0x49534653
+	.4byte 0x20756E65
+	.4byte 0x78706563
+	.4byte 0x74656420
+	.4byte 0x6572726F
+	.4byte 0x7220636F
+	.4byte 0x64653A20
+	.4byte 0x25640000
+	.4byte 0x4661696C
+	.4byte 0x65642074
+	.4byte 0x6F207365
+	.4byte 0x7420686F
+	.4byte 0x6D652064
+	.4byte 0x69726563
+	.4byte 0x746F7279
+	.4byte 0x2E0A0000
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global s_homeDir
+s_homeDir:
+	.skip 0x60
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __NANDVersion
+__NANDVersion:
+
+	.4byte "@2807_80436380"
+
+.global "@3783"
+"@3783":
+
+	.4byte 0x2F000000
+
+.global "@3784"
+"@3784":
+
+	.4byte 0
+
+.global "@3797"
+"@3797":
+
+	.4byte 0x2E000000
+
+.global "@3798"
+"@3798":
+
+	.4byte 0x2E2E0000
+
+.global "@3799"
+"@3799":
+
+	.4byte 0x2F257300
+
+.global "@3800"
+"@3800":
+
+	.4byte 0x25732F25
+	.4byte 0x73000000
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global s_libState
+s_libState:
+	.skip 0x8
diff --git a/asm/nand/NANDCore_804078f0.s b/asm/nand/NANDCore_804078f0.s
deleted file mode 100644
index b54201ba..00000000
--- a/asm/nand/NANDCore_804078f0.s
+++ /dev/null
@@ -1,88 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global "@3073"
-"@3073":
-
-	.4byte 0
-	.4byte 0
-	.4byte 0xFFFFFF9A
-	.4byte 0xFFFFFFFF
-	.4byte 0xFFFFFF99
-	.4byte 0xFFFFFFFC
-	.4byte 0xFFFFFF8E
-	.4byte 0xFFFFFFFB
-	.4byte 0xFFFFFF97
-	.4byte 0xFFFFFFFA
-	.4byte 0xFFFFFF8C
-	.4byte 0xFFFFFFF1
-	.4byte 0xFFFFFF9B
-	.4byte 0xFFFFFFF8
-	.4byte 0xFFFFFF94
-	.4byte 0xFFFFFFF7
-	.4byte 0xFFFFFF93
-	.4byte 0xFFFFFFF6
-	.4byte 0xFFFFFF95
-	.4byte 0xFFFFFFF5
-	.4byte 0xFFFFFF92
-	.4byte 0xFFFFFFF0
-	.4byte 0xFFFFFF96
-	.4byte 0xFFFFFFF4
-	.4byte 0xFFFFFF8D
-	.4byte 0xFFFFFFF3
-	.4byte 0xFFFFFF98
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFF91
-	.4byte 0xFFFFFFF2
-	.4byte 0xFFFFFF8B
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFF8A
-	.4byte 0xFFFFFFFD
-	.4byte 0xFFFFFF89
-	.4byte 0xFFFFFF80
-	.4byte 0xFFFFFFFF
-	.4byte 0xFFFFFFFF
-	.4byte 0xFFFFFFFE
-	.4byte 0xFFFFFFFA
-	.4byte 0xFFFFFFFD
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFFC
-	.4byte 0xFFFFFFF8
-	.4byte 0xFFFFFFFB
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFFA
-	.4byte 0xFFFFFFF4
-	.4byte 0xFFFFFFF9
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFF8
-	.4byte 0xFFFFFFFD
-	.4byte 0xFFFFFFF7
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFF6
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFF5
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFF4
-	.4byte 0xFFFFFFFB
-	.4byte 0xFFFFFFF3
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFF2
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFF1
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFF0
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFEF
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFEE
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFED
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFEC
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFEB
-	.4byte 0xFFFFFFC0
-	.4byte 0xFFFFFFEA
-	.4byte 0xFFFFFFFE
-	.4byte 0xFFFFFFE9
-	.4byte 0xFFFFFFC0
diff --git a/asm/nand/NANDCore_80436380.s b/asm/nand/NANDCore_80436380.s
deleted file mode 100644
index cf2c2005..00000000
--- a/asm/nand/NANDCore_80436380.s
+++ /dev/null
@@ -1,102 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@2807_80436380"
-"@2807_80436380":
-
-	.4byte 0x3C3C2052
-	.4byte 0x564C5F53
-	.4byte 0x444B202D
-	.4byte 0x204E414E
-	.4byte 0x44200972
-	.4byte 0x656C6561
-	.4byte 0x73652062
-	.4byte 0x75696C64
-	.4byte 0x3A204175
-	.4byte 0x67203233
-	.4byte 0x20323031
-	.4byte 0x30203137
-	.4byte 0x3A33333A
-	.4byte 0x34362028
-	.4byte 0x30783433
-	.4byte 0x30325F31
-	.4byte 0x34352920
-	.4byte 0x3E3E0000
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-
-.global s_currentDir
-s_currentDir:
-
-	.4byte 0x2F000000
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte 0
-	.4byte nandOnShutdown
-	.4byte 0x000000FF
-	.4byte 0
-	.4byte 0
-
-.global "@3814"
-"@3814":
-
-	.4byte 0x2F736861
-	.4byte 0x72656432
-	.4byte 0
-
-.global "@3818"
-"@3818":
-
-	.4byte 0x2F736861
-	.4byte 0x72656432
-	.4byte 0x2F000000
-	.4byte 0x49534653
-	.4byte 0x20657272
-	.4byte 0x6F722063
-	.4byte 0x6F64653A
-	.4byte 0x20256400
-	.4byte 0x43415554
-	.4byte 0x494F4E21
-	.4byte 0x2020556E
-	.4byte 0x65787065
-	.4byte 0x63746564
-	.4byte 0x20657272
-	.4byte 0x6F722063
-	.4byte 0x6F646520
-	.4byte 0x5B25645D
-	.4byte 0x20776173
-	.4byte 0x20666F75
-	.4byte 0x6E642E0A
-	.4byte 0
-	.4byte 0x49534653
-	.4byte 0x20756E65
-	.4byte 0x78706563
-	.4byte 0x74656420
-	.4byte 0x6572726F
-	.4byte 0x7220636F
-	.4byte 0x64653A20
-	.4byte 0x25640000
-	.4byte 0x4661696C
-	.4byte 0x65642074
-	.4byte 0x6F207365
-	.4byte 0x7420686F
-	.4byte 0x6D652064
-	.4byte 0x69726563
-	.4byte 0x746F7279
-	.4byte 0x2E0A0000
diff --git a/asm/nand/NANDCore_804b5820.s b/asm/nand/NANDCore_804b5820.s
deleted file mode 100644
index 769a0f31..00000000
--- a/asm/nand/NANDCore_804b5820.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global s_homeDir
-s_homeDir:
-	.skip 0x60
diff --git a/asm/nand/NANDCore_80556640.s b/asm/nand/NANDCore_80556640.s
deleted file mode 100644
index 28d22c5a..00000000
--- a/asm/nand/NANDCore_80556640.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __NANDVersion
-__NANDVersion:
-
-	.4byte "@2807_80436380"
-
-.global "@3783"
-"@3783":
-
-	.4byte 0x2F000000
-
-.global "@3784"
-"@3784":
-
-	.4byte 0
-
-.global "@3797"
-"@3797":
-
-	.4byte 0x2E000000
-
-.global "@3798"
-"@3798":
-
-	.4byte 0x2E2E0000
-
-.global "@3799"
-"@3799":
-
-	.4byte 0x2F257300
-
-.global "@3800"
-"@3800":
-
-	.4byte 0x25732F25
-	.4byte 0x73000000
diff --git a/asm/nand/NANDCore_8055cce0.s b/asm/nand/NANDCore_8055cce0.s
deleted file mode 100644
index cbe119d7..00000000
--- a/asm/nand/NANDCore_8055cce0.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global s_libState
-s_libState:
-	.skip 0x8
diff --git a/asm/nand/NANDErrorMessage_804365c8.s b/asm/nand/NANDErrorMessage.s
similarity index 68%
rename from asm/nand/NANDErrorMessage_804365c8.s
rename to asm/nand/NANDErrorMessage.s
index 21f53296..604f0f5f 100644
--- a/asm/nand/NANDErrorMessage_804365c8.s
+++ b/asm/nand/NANDErrorMessage.s
@@ -1,5 +1,432 @@
 .include "macros.inc"
 
+.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
+.global __NANDShowErrorMessage
+__NANDShowErrorMessage:
+/* 8004B130 00046F70  94 21 FC E0 */	stwu r1, -0x320(r1)
+/* 8004B134 00046F74  7C 08 02 A6 */	mflr r0
+/* 8004B138 00046F78  90 01 03 24 */	stw r0, 0x324(r1)
+/* 8004B13C 00046F7C  93 E1 03 1C */	stw r31, 0x31c(r1)
+/* 8004B140 00046F80  7C 7F 1B 78 */	mr r31, r3
+/* 8004B144 00046F84  93 C1 03 18 */	stw r30, 0x318(r1)
+/* 8004B148 00046F88  3B C0 00 00 */	li r30, 0x0
+/* 8004B14C 00046F8C  93 A1 03 14 */	stw r29, 0x314(r1)
+/* 8004B150 00046F90  83 A2 87 B8 */	lwz r29, "@1888"@sda21(r2)
+/* 8004B154 00046F94  48 00 1C DD */	bl SCGetLanguage
+/* 8004B158 00046F98  54 60 06 3F */	clrlwi. r0, r3, 24
+/* 8004B15C 00046F9C  40 82 00 10 */	bne lbl_8004B16C
+/* 8004B160 00046FA0  38 60 00 01 */	li r3, 0x1
+/* 8004B164 00046FA4  4B FD 56 6D */	bl OSSetFontEncode
+/* 8004B168 00046FA8  48 00 00 0C */	b lbl_8004B174
+.global lbl_8004B16C
+lbl_8004B16C:
+/* 8004B16C 00046FAC  38 60 00 00 */	li r3, 0x0
+/* 8004B170 00046FB0  4B FD 56 61 */	bl OSSetFontEncode
+.global lbl_8004B174
+lbl_8004B174:
+/* 8004B174 00046FB4  48 00 22 7D */	bl SCGetProductGameRegion
+/* 8004B178 00046FB8  7C 63 07 74 */	extsb r3, r3
+/* 8004B17C 00046FBC  38 03 FF FC */	addi r0, r3, -0x4
+/* 8004B180 00046FC0  28 00 00 01 */	cmplwi r0, 0x1
+/* 8004B184 00046FC4  40 81 01 3C */	ble lbl_8004B2C0
+/* 8004B188 00046FC8  2C 03 00 02 */	cmpwi r3, 0x2
+/* 8004B18C 00046FCC  41 82 00 9C */	beq lbl_8004B228
+/* 8004B190 00046FD0  3C 60 80 40 */	lis r3, "@1868"@ha
+/* 8004B194 00046FD4  38 00 00 1F */	li r0, 0x1f
+/* 8004B198 00046FD8  38 63 7B 50 */	addi r3, r3, "@1868"@l
+/* 8004B19C 00046FDC  38 A1 02 04 */	addi r5, r1, 0x204
+/* 8004B1A0 00046FE0  38 83 FF FC */	addi r4, r3, -0x4
+/* 8004B1A4 00046FE4  38 C0 00 00 */	li r6, 0x0
+/* 8004B1A8 00046FE8  7C 09 03 A6 */	mtctr r0
+/* 8004B1AC 00046FEC  60 00 00 00 */	nop
+.global lbl_8004B1B0
+lbl_8004B1B0:
+/* 8004B1B0 00046FF0  80 64 00 04 */	lwz r3, 0x4(r4)
+/* 8004B1B4 00046FF4  84 04 00 08 */	lwzu r0, 0x8(r4)
+/* 8004B1B8 00046FF8  90 65 00 04 */	stw r3, 0x4(r5)
+/* 8004B1BC 00046FFC  94 05 00 08 */	stwu r0, 0x8(r5)
+/* 8004B1C0 00047000  42 00 FF F0 */	bdnz lbl_8004B1B0
+/* 8004B1C4 00047004  80 04 00 04 */	lwz r0, 0x4(r4)
+/* 8004B1C8 00047008  90 05 00 04 */	stw r0, 0x4(r5)
+/* 8004B1CC 0004700C  48 00 00 44 */	b lbl_8004B210
+.global lbl_8004B1D0
+lbl_8004B1D0:
+/* 8004B1D0 00047010  54 C0 06 3E */	clrlwi r0, r6, 24
+/* 8004B1D4 00047014  38 61 02 08 */	addi r3, r1, 0x208
+/* 8004B1D8 00047018  1C 80 00 0C */	mulli r4, r0, 0xc
+/* 8004B1DC 0004701C  7C 63 22 14 */	add r3, r3, r4
+/* 8004B1E0 00047020  80 03 00 04 */	lwz r0, 0x4(r3)
+/* 8004B1E4 00047024  2C 00 00 00 */	cmpwi r0, 0x0
+/* 8004B1E8 00047028  40 82 00 24 */	bne lbl_8004B20C
+/* 8004B1EC 0004702C  80 03 00 00 */	lwz r0, 0x0(r3)
+/* 8004B1F0 00047030  7C 1F 00 00 */	cmpw r31, r0
+/* 8004B1F4 00047034  40 82 00 10 */	bne lbl_8004B204
+/* 8004B1F8 00047038  38 61 02 10 */	addi r3, r1, 0x210
+/* 8004B1FC 0004703C  7F E3 20 2E */	lwzx r31, r3, r4
+/* 8004B200 00047040  48 00 01 54 */	b lbl_8004B354
+.global lbl_8004B204
+lbl_8004B204:
+/* 8004B204 00047044  38 C6 00 01 */	addi r6, r6, 0x1
+/* 8004B208 00047048  48 00 00 08 */	b lbl_8004B210
+.global lbl_8004B20C
+lbl_8004B20C:
+/* 8004B20C 0004704C  38 C6 00 07 */	addi r6, r6, 0x7
+.global lbl_8004B210
+lbl_8004B210:
+/* 8004B210 00047050  54 C0 06 3E */	clrlwi r0, r6, 24
+/* 8004B214 00047054  28 00 00 15 */	cmplwi r0, 0x15
+/* 8004B218 00047058  41 80 FF B8 */	blt lbl_8004B1D0
+/* 8004B21C 0004705C  3F E0 80 40 */	lis r31, __NANDUnknownErrorMessageDefault@ha
+/* 8004B220 00047060  3B FF 7B 18 */	addi r31, r31, __NANDUnknownErrorMessageDefault@l
+/* 8004B224 00047064  48 00 01 30 */	b lbl_8004B354
+.global lbl_8004B228
+lbl_8004B228:
+/* 8004B228 00047068  3C 60 80 40 */	lis r3, "@1868"@ha
+/* 8004B22C 0004706C  38 00 00 1F */	li r0, 0x1f
+/* 8004B230 00047070  38 63 7B 50 */	addi r3, r3, "@1868"@l
+/* 8004B234 00047074  38 A1 01 08 */	addi r5, r1, 0x108
+/* 8004B238 00047078  38 83 FF FC */	addi r4, r3, -0x4
+/* 8004B23C 0004707C  38 C0 00 00 */	li r6, 0x0
+/* 8004B240 00047080  7C 09 03 A6 */	mtctr r0
+/* 8004B244 00047084  60 00 00 00 */	nop
+.global lbl_8004B248
+lbl_8004B248:
+/* 8004B248 00047088  80 64 00 04 */	lwz r3, 0x4(r4)
+/* 8004B24C 0004708C  84 04 00 08 */	lwzu r0, 0x8(r4)
+/* 8004B250 00047090  90 65 00 04 */	stw r3, 0x4(r5)
+/* 8004B254 00047094  94 05 00 08 */	stwu r0, 0x8(r5)
+/* 8004B258 00047098  42 00 FF F0 */	bdnz lbl_8004B248
+/* 8004B25C 0004709C  80 04 00 04 */	lwz r0, 0x4(r4)
+/* 8004B260 000470A0  90 05 00 04 */	stw r0, 0x4(r5)
+/* 8004B264 000470A4  48 00 00 44 */	b lbl_8004B2A8
+.global lbl_8004B268
+lbl_8004B268:
+/* 8004B268 000470A8  54 C0 06 3E */	clrlwi r0, r6, 24
+/* 8004B26C 000470AC  38 61 01 0C */	addi r3, r1, 0x10c
+/* 8004B270 000470B0  1C 80 00 0C */	mulli r4, r0, 0xc
+/* 8004B274 000470B4  7C 63 22 14 */	add r3, r3, r4
+/* 8004B278 000470B8  80 03 00 04 */	lwz r0, 0x4(r3)
+/* 8004B27C 000470BC  2C 00 00 01 */	cmpwi r0, 0x1
+/* 8004B280 000470C0  40 82 00 24 */	bne lbl_8004B2A4
+/* 8004B284 000470C4  80 03 00 00 */	lwz r0, 0x0(r3)
+/* 8004B288 000470C8  7C 1F 00 00 */	cmpw r31, r0
+/* 8004B28C 000470CC  40 82 00 10 */	bne lbl_8004B29C
+/* 8004B290 000470D0  38 61 01 14 */	addi r3, r1, 0x114
+/* 8004B294 000470D4  7F E3 20 2E */	lwzx r31, r3, r4
+/* 8004B298 000470D8  48 00 00 BC */	b lbl_8004B354
+.global lbl_8004B29C
+lbl_8004B29C:
+/* 8004B29C 000470DC  38 C6 00 01 */	addi r6, r6, 0x1
+/* 8004B2A0 000470E0  48 00 00 08 */	b lbl_8004B2A8
+.global lbl_8004B2A4
+lbl_8004B2A4:
+/* 8004B2A4 000470E4  38 C6 00 07 */	addi r6, r6, 0x7
+.global lbl_8004B2A8
+lbl_8004B2A8:
+/* 8004B2A8 000470E8  54 C0 06 3E */	clrlwi r0, r6, 24
+/* 8004B2AC 000470EC  28 00 00 15 */	cmplwi r0, 0x15
+/* 8004B2B0 000470F0  41 80 FF B8 */	blt lbl_8004B268
+/* 8004B2B4 000470F4  3F E0 80 40 */	lis r31, __NANDUnknownErrorMessageDefault@ha
+/* 8004B2B8 000470F8  3B FF 7B 18 */	addi r31, r31, __NANDUnknownErrorMessageDefault@l
+/* 8004B2BC 000470FC  48 00 00 98 */	b lbl_8004B354
+.global lbl_8004B2C0
+lbl_8004B2C0:
+/* 8004B2C0 00047100  3C 60 80 40 */	lis r3, "@1868"@ha
+/* 8004B2C4 00047104  38 00 00 1F */	li r0, 0x1f
+/* 8004B2C8 00047108  38 63 7B 50 */	addi r3, r3, "@1868"@l
+/* 8004B2CC 0004710C  38 A1 00 0C */	addi r5, r1, 0xc
+/* 8004B2D0 00047110  38 83 FF FC */	addi r4, r3, -0x4
+/* 8004B2D4 00047114  38 C0 00 00 */	li r6, 0x0
+/* 8004B2D8 00047118  7C 09 03 A6 */	mtctr r0
+/* 8004B2DC 0004711C  60 00 00 00 */	nop
+.global lbl_8004B2E0
+lbl_8004B2E0:
+/* 8004B2E0 00047120  80 64 00 04 */	lwz r3, 0x4(r4)
+/* 8004B2E4 00047124  84 04 00 08 */	lwzu r0, 0x8(r4)
+/* 8004B2E8 00047128  90 65 00 04 */	stw r3, 0x4(r5)
+/* 8004B2EC 0004712C  94 05 00 08 */	stwu r0, 0x8(r5)
+/* 8004B2F0 00047130  42 00 FF F0 */	bdnz lbl_8004B2E0
+/* 8004B2F4 00047134  80 04 00 04 */	lwz r0, 0x4(r4)
+/* 8004B2F8 00047138  90 05 00 04 */	stw r0, 0x4(r5)
+/* 8004B2FC 0004713C  48 00 00 44 */	b lbl_8004B340
+.global lbl_8004B300
+lbl_8004B300:
+/* 8004B300 00047140  54 C0 06 3E */	clrlwi r0, r6, 24
+/* 8004B304 00047144  38 61 00 10 */	addi r3, r1, 0x10
+/* 8004B308 00047148  1C 80 00 0C */	mulli r4, r0, 0xc
+/* 8004B30C 0004714C  7C 63 22 14 */	add r3, r3, r4
+/* 8004B310 00047150  80 03 00 04 */	lwz r0, 0x4(r3)
+/* 8004B314 00047154  2C 00 00 02 */	cmpwi r0, 0x2
+/* 8004B318 00047158  40 82 00 24 */	bne lbl_8004B33C
+/* 8004B31C 0004715C  80 03 00 00 */	lwz r0, 0x0(r3)
+/* 8004B320 00047160  7C 1F 00 00 */	cmpw r31, r0
+/* 8004B324 00047164  40 82 00 10 */	bne lbl_8004B334
+/* 8004B328 00047168  38 61 00 18 */	addi r3, r1, 0x18
+/* 8004B32C 0004716C  7F E3 20 2E */	lwzx r31, r3, r4
+/* 8004B330 00047170  48 00 00 24 */	b lbl_8004B354
+.global lbl_8004B334
+lbl_8004B334:
+/* 8004B334 00047174  38 C6 00 01 */	addi r6, r6, 0x1
+/* 8004B338 00047178  48 00 00 08 */	b lbl_8004B340
+.global lbl_8004B33C
+lbl_8004B33C:
+/* 8004B33C 0004717C  38 C6 00 07 */	addi r6, r6, 0x7
+.global lbl_8004B340
+lbl_8004B340:
+/* 8004B340 00047180  54 C0 06 3E */	clrlwi r0, r6, 24
+/* 8004B344 00047184  28 00 00 15 */	cmplwi r0, 0x15
+/* 8004B348 00047188  41 80 FF B8 */	blt lbl_8004B300
+/* 8004B34C 0004718C  3F E0 80 40 */	lis r31, __NANDUnknownErrorMessageDefault@ha
+/* 8004B350 00047190  3B FF 7B 18 */	addi r31, r31, __NANDUnknownErrorMessageDefault@l
+.global lbl_8004B354
+lbl_8004B354:
+/* 8004B354 00047194  48 00 1A DD */	bl SCGetLanguage
+/* 8004B358 00047198  54 60 06 3E */	clrlwi r0, r3, 24
+/* 8004B35C 0004719C  28 00 00 06 */	cmplwi r0, 0x6
+/* 8004B360 000471A0  40 81 00 0C */	ble lbl_8004B36C
+/* 8004B364 000471A4  80 BF 00 04 */	lwz r5, 0x4(r31)
+/* 8004B368 000471A8  48 00 00 10 */	b lbl_8004B378
+.global lbl_8004B36C
+lbl_8004B36C:
+/* 8004B36C 000471AC  48 00 1A C5 */	bl SCGetLanguage
+/* 8004B370 000471B0  54 60 15 BA */	rlwinm r0, r3, 2, 22, 29
+/* 8004B374 000471B4  7C BF 00 2E */	lwzx r5, r31, r0
+.global lbl_8004B378
+lbl_8004B378:
+/* 8004B378 000471B8  93 C1 00 08 */	stw r30, 0x8(r1)
+/* 8004B37C 000471BC  38 61 00 0C */	addi r3, r1, 0xc
+/* 8004B380 000471C0  38 81 00 08 */	addi r4, r1, 0x8
+/* 8004B384 000471C4  93 A1 00 0C */	stw r29, 0xc(r1)
+/* 8004B388 000471C8  4B FD 49 29 */	bl OSFatal
+/* 8004B38C 000471CC  80 01 03 24 */	lwz r0, 0x324(r1)
+/* 8004B390 000471D0  83 E1 03 1C */	lwz r31, 0x31c(r1)
+/* 8004B394 000471D4  83 C1 03 18 */	lwz r30, 0x318(r1)
+/* 8004B398 000471D8  83 A1 03 14 */	lwz r29, 0x314(r1)
+/* 8004B39C 000471DC  7C 08 03 A6 */	mtlr r0
+/* 8004B3A0 000471E0  38 21 03 20 */	addi r1, r1, 0x320
+/* 8004B3A4 000471E4  4E 80 00 20 */	blr
+/* 8004B3A8 000471E8  00 00 00 00 */	.4byte 0x00000000
+/* 8004B3AC 000471EC  00 00 00 00 */	.4byte 0x00000000
+.global NANDSetAutoErrorMessaging
+NANDSetAutoErrorMessaging:
+/* 8004B3B0 000471F0  94 21 FF F0 */	stwu r1, -0x10(r1)
+/* 8004B3B4 000471F4  7C 08 02 A6 */	mflr r0
+/* 8004B3B8 000471F8  90 01 00 14 */	stw r0, 0x14(r1)
+/* 8004B3BC 000471FC  93 E1 00 0C */	stw r31, 0xc(r1)
+/* 8004B3C0 00047200  7C 7F 1B 78 */	mr r31, r3
+/* 8004B3C4 00047204  4B FD 64 5D */	bl OSDisableInterrupts
+/* 8004B3C8 00047208  80 AD E8 D0 */	lwz r5, NANDErrorFunc@sda21(r13)
+/* 8004B3CC 0004720C  2C 1F 00 00 */	cmpwi r31, 0x0
+/* 8004B3D0 00047210  38 80 00 00 */	li r4, 0x0
+/* 8004B3D4 00047214  7C 05 00 D0 */	neg r0, r5
+/* 8004B3D8 00047218  7C 00 2B 78 */	or r0, r0, r5
+/* 8004B3DC 0004721C  54 1F 0F FE */	srwi r31, r0, 31
+/* 8004B3E0 00047220  41 82 00 0C */	beq lbl_8004B3EC
+/* 8004B3E4 00047224  3C 80 80 05 */	lis r4, __NANDShowErrorMessage@ha
+/* 8004B3E8 00047228  38 84 B1 30 */	addi r4, r4, __NANDShowErrorMessage@l
+.global lbl_8004B3EC
+lbl_8004B3EC:
+/* 8004B3EC 0004722C  90 8D E8 D0 */	stw r4, NANDErrorFunc@sda21(r13)
+/* 8004B3F0 00047230  4B FD 64 71 */	bl OSRestoreInterrupts
+/* 8004B3F4 00047234  7F E3 FB 78 */	mr r3, r31
+/* 8004B3F8 00047238  83 E1 00 0C */	lwz r31, 0xc(r1)
+/* 8004B3FC 0004723C  80 01 00 14 */	lwz r0, 0x14(r1)
+/* 8004B400 00047240  7C 08 03 A6 */	mtlr r0
+/* 8004B404 00047244  38 21 00 10 */	addi r1, r1, 0x10
+/* 8004B408 00047248  4E 80 00 20 */	blr
+/* 8004B40C 0004724C  00 00 00 00 */	.4byte 0x00000000
+.global __NANDPrintErrorMessage
+__NANDPrintErrorMessage:
+/* 8004B410 00047250  81 8D E8 D0 */	lwz r12, NANDErrorFunc@sda21(r13)
+/* 8004B414 00047254  2C 0C 00 00 */	cmpwi r12, 0x0
+/* 8004B418 00047258  4D 82 00 20 */	beqlr
+/* 8004B41C 0004725C  7D 89 03 A6 */	mtctr r12
+/* 8004B420 00047260  4E 80 04 20 */	bctr
+/* 8004B424 00047264  4E 80 00 20 */	blr
+/* 8004B428 00047268  00 00 00 00 */	.4byte 0x00000000
+/* 8004B42C 0004726C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global __NANDMaxBlocksErrorMessageDefault
+__NANDMaxBlocksErrorMessageDefault:
+
+	.4byte "@1805_804365C8"
+	.4byte "@1806"
+	.4byte "@1807"
+	.4byte "@1808_8043670C"
+	.4byte "@1809"
+	.4byte "@1810"
+	.4byte "@1811_804368BC"
+
+.global __NANDMaxBlocksErrorMessageEurope
+__NANDMaxBlocksErrorMessageEurope:
+
+	.4byte "@1805_804365C8"
+	.4byte "@1812_80436934"
+	.4byte "@1807"
+	.4byte "@1813_804369AC"
+	.4byte "@1814_80436A38"
+	.4byte "@1810"
+	.4byte "@1811_804368BC"
+
+.global __NANDMaxFilesErrorMessageDefault
+__NANDMaxFilesErrorMessageDefault:
+
+	.4byte "@1817_80436BB4"
+	.4byte "@1806"
+	.4byte "@1807"
+	.4byte "@1818"
+	.4byte "@1819"
+	.4byte "@1820"
+	.4byte "@1821"
+
+.global __NANDMaxFilesErrorMessageEurope
+__NANDMaxFilesErrorMessageEurope:
+
+	.4byte "@1817_80436BB4"
+	.4byte "@1812_80436934"
+	.4byte "@1807"
+	.4byte "@1813_804369AC"
+	.4byte "@1814_80436A38"
+	.4byte "@1820"
+	.4byte "@1821"
+
+.global __NANDCorruptErrorMessageDefault
+__NANDCorruptErrorMessageDefault:
+
+	.4byte "@1824"
+	.4byte "@1825"
+	.4byte "@1826"
+	.4byte "@1827_8043706C"
+	.4byte "@1828_804370E8"
+	.4byte "@1829_80437168"
+	.4byte "@1830_804371E8"
+
+.global __NANDCorruptErrorMessageEurope
+__NANDCorruptErrorMessageEurope:
+
+	.4byte "@1824"
+	.4byte "@1831"
+	.4byte "@1832_804372B8"
+	.4byte "@1833_80437338"
+	.4byte "@1834_804373AC"
+	.4byte "@1829_80437168"
+	.4byte "@1830_804371E8"
+
+.global __NANDBusyErrorMessageDefault
+__NANDBusyErrorMessageDefault:
+
+	.4byte "@1837_80437504"
+	.4byte "@1838_80437574"
+	.4byte "@1839"
+	.4byte "@1840"
+	.4byte "@1841"
+	.4byte "@1842"
+	.4byte "@1843"
+
+.global __NANDBusyErrorMessageEurope
+__NANDBusyErrorMessageEurope:
+
+	.4byte "@1837_80437504"
+	.4byte "@1844"
+	.4byte "@1839"
+	.4byte "@1845"
+	.4byte "@1846"
+	.4byte "@1842"
+	.4byte "@1843"
+
+.global __NANDUnknownErrorMessageDefault
+__NANDUnknownErrorMessageDefault:
+
+	.4byte "@1849_80437AD4"
+	.4byte "@1850_80437B48"
+	.4byte "@1851_80437BB0"
+	.4byte "@1852_80437C4C"
+	.4byte "@1853_80437D00"
+	.4byte "@1854"
+	.4byte "@1855"
+
+.global __NANDUnknownErrorMessageEurope
+__NANDUnknownErrorMessageEurope:
+
+	.4byte "@1849_80437AD4"
+	.4byte "@1856"
+	.4byte "@1851_80437BB0"
+	.4byte "@1857"
+	.4byte "@1858"
+	.4byte "@1854"
+	.4byte "@1855"
+
+.global "@1868"
+"@1868":
+
+	.4byte 0xFFFFFF94
+	.4byte 0
+	.4byte __NANDMaxBlocksErrorMessageDefault
+	.4byte 0xFFFFFF95
+	.4byte 0
+	.4byte __NANDMaxFilesErrorMessageDefault
+	.4byte 0xFFFFFF99
+	.4byte 0
+	.4byte __NANDCorruptErrorMessageDefault
+	.4byte 0xFFFFFF8A
+	.4byte 0
+	.4byte __NANDBusyErrorMessageDefault
+	.4byte 0xFFFFFFEA
+	.4byte 0
+	.4byte __NANDBusyErrorMessageDefault
+	.4byte 0xFFFFFF8B
+	.4byte 0
+	.4byte __NANDUnknownErrorMessageDefault
+	.4byte 0xFFFFFFF7
+	.4byte 0
+	.4byte __NANDUnknownErrorMessageDefault
+	.4byte 0xFFFFFF94
+	.4byte 0x00000001
+	.4byte __NANDMaxBlocksErrorMessageEurope
+	.4byte 0xFFFFFF95
+	.4byte 0x00000001
+	.4byte __NANDMaxFilesErrorMessageEurope
+	.4byte 0xFFFFFF99
+	.4byte 0x00000001
+	.4byte __NANDCorruptErrorMessageEurope
+	.4byte 0xFFFFFF8A
+	.4byte 0x00000001
+	.4byte __NANDBusyErrorMessageEurope
+	.4byte 0xFFFFFFEA
+	.4byte 0x00000001
+	.4byte __NANDBusyErrorMessageEurope
+	.4byte 0xFFFFFF8B
+	.4byte 0x00000001
+	.4byte __NANDUnknownErrorMessageEurope
+	.4byte 0xFFFFFFF7
+	.4byte 0x00000001
+	.4byte __NANDUnknownErrorMessageEurope
+	.4byte 0xFFFFFF94
+	.4byte 0x00000002
+	.4byte __NANDMaxBlocksErrorMessageChinaKorea
+	.4byte 0xFFFFFF95
+	.4byte 0x00000002
+	.4byte __NANDMaxFilesErrorMessageChinaKorea
+	.4byte 0xFFFFFF99
+	.4byte 0x00000002
+	.4byte __NANDCorruptErrorMessageChinaKorea
+	.4byte 0xFFFFFF8A
+	.4byte 0x00000002
+	.4byte __NANDBusyErrorMessageChinaKorea
+	.4byte 0xFFFFFFEA
+	.4byte 0x00000002
+	.4byte __NANDBusyErrorMessageChinaKorea
+	.4byte 0xFFFFFF8B
+	.4byte 0x00000002
+	.4byte __NANDUnknownErrorMessageChinaKorea
+	.4byte 0xFFFFFFF7
+	.4byte 0x00000002
+	.4byte __NANDUnknownErrorMessageChinaKorea
+	.4byte 0
+.include "macros.inc"
+
 .section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
 .global "@1805_804365C8"
 "@1805_804365C8":
@@ -2028,3 +2455,47 @@
 	.4byte 0x6F722064
 	.4byte 0x65746169
 	.4byte 0x6C732E00
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global NANDErrorFunc
+NANDErrorFunc:
+	.skip 0x8
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global __NANDMaxBlocksErrorMessageChinaKorea
+__NANDMaxBlocksErrorMessageChinaKorea:
+
+	.4byte "@1815"
+	.4byte "@1816_80436B3C"
+
+.global __NANDMaxFilesErrorMessageChinaKorea
+__NANDMaxFilesErrorMessageChinaKorea:
+
+	.4byte "@1822_80436E4C"
+	.4byte "@1823"
+
+.global __NANDCorruptErrorMessageChinaKorea
+__NANDCorruptErrorMessageChinaKorea:
+
+	.4byte "@1835"
+	.4byte "@1836"
+
+.global __NANDBusyErrorMessageChinaKorea
+__NANDBusyErrorMessageChinaKorea:
+
+	.4byte "@1847_804379EC"
+	.4byte "@1848_80437A70"
+
+.global __NANDUnknownErrorMessageChinaKorea
+__NANDUnknownErrorMessageChinaKorea:
+
+	.4byte "@1859"
+	.4byte "@1860"
+
+.global "@1888"
+"@1888":
+
+	.4byte 0xFFFFFF00
+	.4byte 0
diff --git a/asm/nand/NANDErrorMessage_8004b130.s b/asm/nand/NANDErrorMessage_8004b130.s
deleted file mode 100644
index 6979b246..00000000
--- a/asm/nand/NANDErrorMessage_8004b130.s
+++ /dev/null
@@ -1,247 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006A00 - 0x80406260 ; 0x003FF860
-.global __NANDShowErrorMessage
-__NANDShowErrorMessage:
-/* 8004B130 00046F70  94 21 FC E0 */	stwu r1, -0x320(r1)
-/* 8004B134 00046F74  7C 08 02 A6 */	mflr r0
-/* 8004B138 00046F78  90 01 03 24 */	stw r0, 0x324(r1)
-/* 8004B13C 00046F7C  93 E1 03 1C */	stw r31, 0x31c(r1)
-/* 8004B140 00046F80  7C 7F 1B 78 */	mr r31, r3
-/* 8004B144 00046F84  93 C1 03 18 */	stw r30, 0x318(r1)
-/* 8004B148 00046F88  3B C0 00 00 */	li r30, 0x0
-/* 8004B14C 00046F8C  93 A1 03 14 */	stw r29, 0x314(r1)
-/* 8004B150 00046F90  83 A2 87 B8 */	lwz r29, "@1888"@sda21(r2)
-/* 8004B154 00046F94  48 00 1C DD */	bl SCGetLanguage
-/* 8004B158 00046F98  54 60 06 3F */	clrlwi. r0, r3, 24
-/* 8004B15C 00046F9C  40 82 00 10 */	bne lbl_8004B16C
-/* 8004B160 00046FA0  38 60 00 01 */	li r3, 0x1
-/* 8004B164 00046FA4  4B FD 56 6D */	bl OSSetFontEncode
-/* 8004B168 00046FA8  48 00 00 0C */	b lbl_8004B174
-.global lbl_8004B16C
-lbl_8004B16C:
-/* 8004B16C 00046FAC  38 60 00 00 */	li r3, 0x0
-/* 8004B170 00046FB0  4B FD 56 61 */	bl OSSetFontEncode
-.global lbl_8004B174
-lbl_8004B174:
-/* 8004B174 00046FB4  48 00 22 7D */	bl SCGetProductGameRegion
-/* 8004B178 00046FB8  7C 63 07 74 */	extsb r3, r3
-/* 8004B17C 00046FBC  38 03 FF FC */	addi r0, r3, -0x4
-/* 8004B180 00046FC0  28 00 00 01 */	cmplwi r0, 0x1
-/* 8004B184 00046FC4  40 81 01 3C */	ble lbl_8004B2C0
-/* 8004B188 00046FC8  2C 03 00 02 */	cmpwi r3, 0x2
-/* 8004B18C 00046FCC  41 82 00 9C */	beq lbl_8004B228
-/* 8004B190 00046FD0  3C 60 80 40 */	lis r3, "@1868"@ha
-/* 8004B194 00046FD4  38 00 00 1F */	li r0, 0x1f
-/* 8004B198 00046FD8  38 63 7B 50 */	addi r3, r3, "@1868"@l
-/* 8004B19C 00046FDC  38 A1 02 04 */	addi r5, r1, 0x204
-/* 8004B1A0 00046FE0  38 83 FF FC */	addi r4, r3, -0x4
-/* 8004B1A4 00046FE4  38 C0 00 00 */	li r6, 0x0
-/* 8004B1A8 00046FE8  7C 09 03 A6 */	mtctr r0
-/* 8004B1AC 00046FEC  60 00 00 00 */	nop
-.global lbl_8004B1B0
-lbl_8004B1B0:
-/* 8004B1B0 00046FF0  80 64 00 04 */	lwz r3, 0x4(r4)
-/* 8004B1B4 00046FF4  84 04 00 08 */	lwzu r0, 0x8(r4)
-/* 8004B1B8 00046FF8  90 65 00 04 */	stw r3, 0x4(r5)
-/* 8004B1BC 00046FFC  94 05 00 08 */	stwu r0, 0x8(r5)
-/* 8004B1C0 00047000  42 00 FF F0 */	bdnz lbl_8004B1B0
-/* 8004B1C4 00047004  80 04 00 04 */	lwz r0, 0x4(r4)
-/* 8004B1C8 00047008  90 05 00 04 */	stw r0, 0x4(r5)
-/* 8004B1CC 0004700C  48 00 00 44 */	b lbl_8004B210
-.global lbl_8004B1D0
-lbl_8004B1D0:
-/* 8004B1D0 00047010  54 C0 06 3E */	clrlwi r0, r6, 24
-/* 8004B1D4 00047014  38 61 02 08 */	addi r3, r1, 0x208
-/* 8004B1D8 00047018  1C 80 00 0C */	mulli r4, r0, 0xc
-/* 8004B1DC 0004701C  7C 63 22 14 */	add r3, r3, r4
-/* 8004B1E0 00047020  80 03 00 04 */	lwz r0, 0x4(r3)
-/* 8004B1E4 00047024  2C 00 00 00 */	cmpwi r0, 0x0
-/* 8004B1E8 00047028  40 82 00 24 */	bne lbl_8004B20C
-/* 8004B1EC 0004702C  80 03 00 00 */	lwz r0, 0x0(r3)
-/* 8004B1F0 00047030  7C 1F 00 00 */	cmpw r31, r0
-/* 8004B1F4 00047034  40 82 00 10 */	bne lbl_8004B204
-/* 8004B1F8 00047038  38 61 02 10 */	addi r3, r1, 0x210
-/* 8004B1FC 0004703C  7F E3 20 2E */	lwzx r31, r3, r4
-/* 8004B200 00047040  48 00 01 54 */	b lbl_8004B354
-.global lbl_8004B204
-lbl_8004B204:
-/* 8004B204 00047044  38 C6 00 01 */	addi r6, r6, 0x1
-/* 8004B208 00047048  48 00 00 08 */	b lbl_8004B210
-.global lbl_8004B20C
-lbl_8004B20C:
-/* 8004B20C 0004704C  38 C6 00 07 */	addi r6, r6, 0x7
-.global lbl_8004B210
-lbl_8004B210:
-/* 8004B210 00047050  54 C0 06 3E */	clrlwi r0, r6, 24
-/* 8004B214 00047054  28 00 00 15 */	cmplwi r0, 0x15
-/* 8004B218 00047058  41 80 FF B8 */	blt lbl_8004B1D0
-/* 8004B21C 0004705C  3F E0 80 40 */	lis r31, __NANDUnknownErrorMessageDefault@ha
-/* 8004B220 00047060  3B FF 7B 18 */	addi r31, r31, __NANDUnknownErrorMessageDefault@l
-/* 8004B224 00047064  48 00 01 30 */	b lbl_8004B354
-.global lbl_8004B228
-lbl_8004B228:
-/* 8004B228 00047068  3C 60 80 40 */	lis r3, "@1868"@ha
-/* 8004B22C 0004706C  38 00 00 1F */	li r0, 0x1f
-/* 8004B230 00047070  38 63 7B 50 */	addi r3, r3, "@1868"@l
-/* 8004B234 00047074  38 A1 01 08 */	addi r5, r1, 0x108
-/* 8004B238 00047078  38 83 FF FC */	addi r4, r3, -0x4
-/* 8004B23C 0004707C  38 C0 00 00 */	li r6, 0x0
-/* 8004B240 00047080  7C 09 03 A6 */	mtctr r0
-/* 8004B244 00047084  60 00 00 00 */	nop
-.global lbl_8004B248
-lbl_8004B248:
-/* 8004B248 00047088  80 64 00 04 */	lwz r3, 0x4(r4)
-/* 8004B24C 0004708C  84 04 00 08 */	lwzu r0, 0x8(r4)
-/* 8004B250 00047090  90 65 00 04 */	stw r3, 0x4(r5)
-/* 8004B254 00047094  94 05 00 08 */	stwu r0, 0x8(r5)
-/* 8004B258 00047098  42 00 FF F0 */	bdnz lbl_8004B248
-/* 8004B25C 0004709C  80 04 00 04 */	lwz r0, 0x4(r4)
-/* 8004B260 000470A0  90 05 00 04 */	stw r0, 0x4(r5)
-/* 8004B264 000470A4  48 00 00 44 */	b lbl_8004B2A8
-.global lbl_8004B268
-lbl_8004B268:
-/* 8004B268 000470A8  54 C0 06 3E */	clrlwi r0, r6, 24
-/* 8004B26C 000470AC  38 61 01 0C */	addi r3, r1, 0x10c
-/* 8004B270 000470B0  1C 80 00 0C */	mulli r4, r0, 0xc
-/* 8004B274 000470B4  7C 63 22 14 */	add r3, r3, r4
-/* 8004B278 000470B8  80 03 00 04 */	lwz r0, 0x4(r3)
-/* 8004B27C 000470BC  2C 00 00 01 */	cmpwi r0, 0x1
-/* 8004B280 000470C0  40 82 00 24 */	bne lbl_8004B2A4
-/* 8004B284 000470C4  80 03 00 00 */	lwz r0, 0x0(r3)
-/* 8004B288 000470C8  7C 1F 00 00 */	cmpw r31, r0
-/* 8004B28C 000470CC  40 82 00 10 */	bne lbl_8004B29C
-/* 8004B290 000470D0  38 61 01 14 */	addi r3, r1, 0x114
-/* 8004B294 000470D4  7F E3 20 2E */	lwzx r31, r3, r4
-/* 8004B298 000470D8  48 00 00 BC */	b lbl_8004B354
-.global lbl_8004B29C
-lbl_8004B29C:
-/* 8004B29C 000470DC  38 C6 00 01 */	addi r6, r6, 0x1
-/* 8004B2A0 000470E0  48 00 00 08 */	b lbl_8004B2A8
-.global lbl_8004B2A4
-lbl_8004B2A4:
-/* 8004B2A4 000470E4  38 C6 00 07 */	addi r6, r6, 0x7
-.global lbl_8004B2A8
-lbl_8004B2A8:
-/* 8004B2A8 000470E8  54 C0 06 3E */	clrlwi r0, r6, 24
-/* 8004B2AC 000470EC  28 00 00 15 */	cmplwi r0, 0x15
-/* 8004B2B0 000470F0  41 80 FF B8 */	blt lbl_8004B268
-/* 8004B2B4 000470F4  3F E0 80 40 */	lis r31, __NANDUnknownErrorMessageDefault@ha
-/* 8004B2B8 000470F8  3B FF 7B 18 */	addi r31, r31, __NANDUnknownErrorMessageDefault@l
-/* 8004B2BC 000470FC  48 00 00 98 */	b lbl_8004B354
-.global lbl_8004B2C0
-lbl_8004B2C0:
-/* 8004B2C0 00047100  3C 60 80 40 */	lis r3, "@1868"@ha
-/* 8004B2C4 00047104  38 00 00 1F */	li r0, 0x1f
-/* 8004B2C8 00047108  38 63 7B 50 */	addi r3, r3, "@1868"@l
-/* 8004B2CC 0004710C  38 A1 00 0C */	addi r5, r1, 0xc
-/* 8004B2D0 00047110  38 83 FF FC */	addi r4, r3, -0x4
-/* 8004B2D4 00047114  38 C0 00 00 */	li r6, 0x0
-/* 8004B2D8 00047118  7C 09 03 A6 */	mtctr r0
-/* 8004B2DC 0004711C  60 00 00 00 */	nop
-.global lbl_8004B2E0
-lbl_8004B2E0:
-/* 8004B2E0 00047120  80 64 00 04 */	lwz r3, 0x4(r4)
-/* 8004B2E4 00047124  84 04 00 08 */	lwzu r0, 0x8(r4)
-/* 8004B2E8 00047128  90 65 00 04 */	stw r3, 0x4(r5)
-/* 8004B2EC 0004712C  94 05 00 08 */	stwu r0, 0x8(r5)
-/* 8004B2F0 00047130  42 00 FF F0 */	bdnz lbl_8004B2E0
-/* 8004B2F4 00047134  80 04 00 04 */	lwz r0, 0x4(r4)
-/* 8004B2F8 00047138  90 05 00 04 */	stw r0, 0x4(r5)
-/* 8004B2FC 0004713C  48 00 00 44 */	b lbl_8004B340
-.global lbl_8004B300
-lbl_8004B300:
-/* 8004B300 00047140  54 C0 06 3E */	clrlwi r0, r6, 24
-/* 8004B304 00047144  38 61 00 10 */	addi r3, r1, 0x10
-/* 8004B308 00047148  1C 80 00 0C */	mulli r4, r0, 0xc
-/* 8004B30C 0004714C  7C 63 22 14 */	add r3, r3, r4
-/* 8004B310 00047150  80 03 00 04 */	lwz r0, 0x4(r3)
-/* 8004B314 00047154  2C 00 00 02 */	cmpwi r0, 0x2
-/* 8004B318 00047158  40 82 00 24 */	bne lbl_8004B33C
-/* 8004B31C 0004715C  80 03 00 00 */	lwz r0, 0x0(r3)
-/* 8004B320 00047160  7C 1F 00 00 */	cmpw r31, r0
-/* 8004B324 00047164  40 82 00 10 */	bne lbl_8004B334
-/* 8004B328 00047168  38 61 00 18 */	addi r3, r1, 0x18
-/* 8004B32C 0004716C  7F E3 20 2E */	lwzx r31, r3, r4
-/* 8004B330 00047170  48 00 00 24 */	b lbl_8004B354
-.global lbl_8004B334
-lbl_8004B334:
-/* 8004B334 00047174  38 C6 00 01 */	addi r6, r6, 0x1
-/* 8004B338 00047178  48 00 00 08 */	b lbl_8004B340
-.global lbl_8004B33C
-lbl_8004B33C:
-/* 8004B33C 0004717C  38 C6 00 07 */	addi r6, r6, 0x7
-.global lbl_8004B340
-lbl_8004B340:
-/* 8004B340 00047180  54 C0 06 3E */	clrlwi r0, r6, 24
-/* 8004B344 00047184  28 00 00 15 */	cmplwi r0, 0x15
-/* 8004B348 00047188  41 80 FF B8 */	blt lbl_8004B300
-/* 8004B34C 0004718C  3F E0 80 40 */	lis r31, __NANDUnknownErrorMessageDefault@ha
-/* 8004B350 00047190  3B FF 7B 18 */	addi r31, r31, __NANDUnknownErrorMessageDefault@l
-.global lbl_8004B354
-lbl_8004B354:
-/* 8004B354 00047194  48 00 1A DD */	bl SCGetLanguage
-/* 8004B358 00047198  54 60 06 3E */	clrlwi r0, r3, 24
-/* 8004B35C 0004719C  28 00 00 06 */	cmplwi r0, 0x6
-/* 8004B360 000471A0  40 81 00 0C */	ble lbl_8004B36C
-/* 8004B364 000471A4  80 BF 00 04 */	lwz r5, 0x4(r31)
-/* 8004B368 000471A8  48 00 00 10 */	b lbl_8004B378
-.global lbl_8004B36C
-lbl_8004B36C:
-/* 8004B36C 000471AC  48 00 1A C5 */	bl SCGetLanguage
-/* 8004B370 000471B0  54 60 15 BA */	rlwinm r0, r3, 2, 22, 29
-/* 8004B374 000471B4  7C BF 00 2E */	lwzx r5, r31, r0
-.global lbl_8004B378
-lbl_8004B378:
-/* 8004B378 000471B8  93 C1 00 08 */	stw r30, 0x8(r1)
-/* 8004B37C 000471BC  38 61 00 0C */	addi r3, r1, 0xc
-/* 8004B380 000471C0  38 81 00 08 */	addi r4, r1, 0x8
-/* 8004B384 000471C4  93 A1 00 0C */	stw r29, 0xc(r1)
-/* 8004B388 000471C8  4B FD 49 29 */	bl OSFatal
-/* 8004B38C 000471CC  80 01 03 24 */	lwz r0, 0x324(r1)
-/* 8004B390 000471D0  83 E1 03 1C */	lwz r31, 0x31c(r1)
-/* 8004B394 000471D4  83 C1 03 18 */	lwz r30, 0x318(r1)
-/* 8004B398 000471D8  83 A1 03 14 */	lwz r29, 0x314(r1)
-/* 8004B39C 000471DC  7C 08 03 A6 */	mtlr r0
-/* 8004B3A0 000471E0  38 21 03 20 */	addi r1, r1, 0x320
-/* 8004B3A4 000471E4  4E 80 00 20 */	blr
-/* 8004B3A8 000471E8  00 00 00 00 */	.4byte 0x00000000
-/* 8004B3AC 000471EC  00 00 00 00 */	.4byte 0x00000000
-.global NANDSetAutoErrorMessaging
-NANDSetAutoErrorMessaging:
-/* 8004B3B0 000471F0  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 8004B3B4 000471F4  7C 08 02 A6 */	mflr r0
-/* 8004B3B8 000471F8  90 01 00 14 */	stw r0, 0x14(r1)
-/* 8004B3BC 000471FC  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 8004B3C0 00047200  7C 7F 1B 78 */	mr r31, r3
-/* 8004B3C4 00047204  4B FD 64 5D */	bl OSDisableInterrupts
-/* 8004B3C8 00047208  80 AD E8 D0 */	lwz r5, NANDErrorFunc@sda21(r13)
-/* 8004B3CC 0004720C  2C 1F 00 00 */	cmpwi r31, 0x0
-/* 8004B3D0 00047210  38 80 00 00 */	li r4, 0x0
-/* 8004B3D4 00047214  7C 05 00 D0 */	neg r0, r5
-/* 8004B3D8 00047218  7C 00 2B 78 */	or r0, r0, r5
-/* 8004B3DC 0004721C  54 1F 0F FE */	srwi r31, r0, 31
-/* 8004B3E0 00047220  41 82 00 0C */	beq lbl_8004B3EC
-/* 8004B3E4 00047224  3C 80 80 05 */	lis r4, __NANDShowErrorMessage@ha
-/* 8004B3E8 00047228  38 84 B1 30 */	addi r4, r4, __NANDShowErrorMessage@l
-.global lbl_8004B3EC
-lbl_8004B3EC:
-/* 8004B3EC 0004722C  90 8D E8 D0 */	stw r4, NANDErrorFunc@sda21(r13)
-/* 8004B3F0 00047230  4B FD 64 71 */	bl OSRestoreInterrupts
-/* 8004B3F4 00047234  7F E3 FB 78 */	mr r3, r31
-/* 8004B3F8 00047238  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 8004B3FC 0004723C  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 8004B400 00047240  7C 08 03 A6 */	mtlr r0
-/* 8004B404 00047244  38 21 00 10 */	addi r1, r1, 0x10
-/* 8004B408 00047248  4E 80 00 20 */	blr
-/* 8004B40C 0004724C  00 00 00 00 */	.4byte 0x00000000
-.global __NANDPrintErrorMessage
-__NANDPrintErrorMessage:
-/* 8004B410 00047250  81 8D E8 D0 */	lwz r12, NANDErrorFunc@sda21(r13)
-/* 8004B414 00047254  2C 0C 00 00 */	cmpwi r12, 0x0
-/* 8004B418 00047258  4D 82 00 20 */	beqlr
-/* 8004B41C 0004725C  7D 89 03 A6 */	mtctr r12
-/* 8004B420 00047260  4E 80 04 20 */	bctr
-/* 8004B424 00047264  4E 80 00 20 */	blr
-/* 8004B428 00047268  00 00 00 00 */	.4byte 0x00000000
-/* 8004B42C 0004726C  00 00 00 00 */	.4byte 0x00000000
diff --git a/asm/nand/NANDErrorMessage_80407a38.s b/asm/nand/NANDErrorMessage_80407a38.s
deleted file mode 100644
index 55328828..00000000
--- a/asm/nand/NANDErrorMessage_80407a38.s
+++ /dev/null
@@ -1,180 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global __NANDMaxBlocksErrorMessageDefault
-__NANDMaxBlocksErrorMessageDefault:
-
-	.4byte "@1805_804365C8"
-	.4byte "@1806"
-	.4byte "@1807"
-	.4byte "@1808_8043670C"
-	.4byte "@1809"
-	.4byte "@1810"
-	.4byte "@1811_804368BC"
-
-.global __NANDMaxBlocksErrorMessageEurope
-__NANDMaxBlocksErrorMessageEurope:
-
-	.4byte "@1805_804365C8"
-	.4byte "@1812_80436934"
-	.4byte "@1807"
-	.4byte "@1813_804369AC"
-	.4byte "@1814_80436A38"
-	.4byte "@1810"
-	.4byte "@1811_804368BC"
-
-.global __NANDMaxFilesErrorMessageDefault
-__NANDMaxFilesErrorMessageDefault:
-
-	.4byte "@1817_80436BB4"
-	.4byte "@1806"
-	.4byte "@1807"
-	.4byte "@1818"
-	.4byte "@1819"
-	.4byte "@1820"
-	.4byte "@1821"
-
-.global __NANDMaxFilesErrorMessageEurope
-__NANDMaxFilesErrorMessageEurope:
-
-	.4byte "@1817_80436BB4"
-	.4byte "@1812_80436934"
-	.4byte "@1807"
-	.4byte "@1813_804369AC"
-	.4byte "@1814_80436A38"
-	.4byte "@1820"
-	.4byte "@1821"
-
-.global __NANDCorruptErrorMessageDefault
-__NANDCorruptErrorMessageDefault:
-
-	.4byte "@1824"
-	.4byte "@1825"
-	.4byte "@1826"
-	.4byte "@1827_8043706C"
-	.4byte "@1828_804370E8"
-	.4byte "@1829_80437168"
-	.4byte "@1830_804371E8"
-
-.global __NANDCorruptErrorMessageEurope
-__NANDCorruptErrorMessageEurope:
-
-	.4byte "@1824"
-	.4byte "@1831"
-	.4byte "@1832_804372B8"
-	.4byte "@1833_80437338"
-	.4byte "@1834_804373AC"
-	.4byte "@1829_80437168"
-	.4byte "@1830_804371E8"
-
-.global __NANDBusyErrorMessageDefault
-__NANDBusyErrorMessageDefault:
-
-	.4byte "@1837_80437504"
-	.4byte "@1838_80437574"
-	.4byte "@1839"
-	.4byte "@1840"
-	.4byte "@1841"
-	.4byte "@1842"
-	.4byte "@1843"
-
-.global __NANDBusyErrorMessageEurope
-__NANDBusyErrorMessageEurope:
-
-	.4byte "@1837_80437504"
-	.4byte "@1844"
-	.4byte "@1839"
-	.4byte "@1845"
-	.4byte "@1846"
-	.4byte "@1842"
-	.4byte "@1843"
-
-.global __NANDUnknownErrorMessageDefault
-__NANDUnknownErrorMessageDefault:
-
-	.4byte "@1849_80437AD4"
-	.4byte "@1850_80437B48"
-	.4byte "@1851_80437BB0"
-	.4byte "@1852_80437C4C"
-	.4byte "@1853_80437D00"
-	.4byte "@1854"
-	.4byte "@1855"
-
-.global __NANDUnknownErrorMessageEurope
-__NANDUnknownErrorMessageEurope:
-
-	.4byte "@1849_80437AD4"
-	.4byte "@1856"
-	.4byte "@1851_80437BB0"
-	.4byte "@1857"
-	.4byte "@1858"
-	.4byte "@1854"
-	.4byte "@1855"
-
-.global "@1868"
-"@1868":
-
-	.4byte 0xFFFFFF94
-	.4byte 0
-	.4byte __NANDMaxBlocksErrorMessageDefault
-	.4byte 0xFFFFFF95
-	.4byte 0
-	.4byte __NANDMaxFilesErrorMessageDefault
-	.4byte 0xFFFFFF99
-	.4byte 0
-	.4byte __NANDCorruptErrorMessageDefault
-	.4byte 0xFFFFFF8A
-	.4byte 0
-	.4byte __NANDBusyErrorMessageDefault
-	.4byte 0xFFFFFFEA
-	.4byte 0
-	.4byte __NANDBusyErrorMessageDefault
-	.4byte 0xFFFFFF8B
-	.4byte 0
-	.4byte __NANDUnknownErrorMessageDefault
-	.4byte 0xFFFFFFF7
-	.4byte 0
-	.4byte __NANDUnknownErrorMessageDefault
-	.4byte 0xFFFFFF94
-	.4byte 0x00000001
-	.4byte __NANDMaxBlocksErrorMessageEurope
-	.4byte 0xFFFFFF95
-	.4byte 0x00000001
-	.4byte __NANDMaxFilesErrorMessageEurope
-	.4byte 0xFFFFFF99
-	.4byte 0x00000001
-	.4byte __NANDCorruptErrorMessageEurope
-	.4byte 0xFFFFFF8A
-	.4byte 0x00000001
-	.4byte __NANDBusyErrorMessageEurope
-	.4byte 0xFFFFFFEA
-	.4byte 0x00000001
-	.4byte __NANDBusyErrorMessageEurope
-	.4byte 0xFFFFFF8B
-	.4byte 0x00000001
-	.4byte __NANDUnknownErrorMessageEurope
-	.4byte 0xFFFFFFF7
-	.4byte 0x00000001
-	.4byte __NANDUnknownErrorMessageEurope
-	.4byte 0xFFFFFF94
-	.4byte 0x00000002
-	.4byte __NANDMaxBlocksErrorMessageChinaKorea
-	.4byte 0xFFFFFF95
-	.4byte 0x00000002
-	.4byte __NANDMaxFilesErrorMessageChinaKorea
-	.4byte 0xFFFFFF99
-	.4byte 0x00000002
-	.4byte __NANDCorruptErrorMessageChinaKorea
-	.4byte 0xFFFFFF8A
-	.4byte 0x00000002
-	.4byte __NANDBusyErrorMessageChinaKorea
-	.4byte 0xFFFFFFEA
-	.4byte 0x00000002
-	.4byte __NANDBusyErrorMessageChinaKorea
-	.4byte 0xFFFFFF8B
-	.4byte 0x00000002
-	.4byte __NANDUnknownErrorMessageChinaKorea
-	.4byte 0xFFFFFFF7
-	.4byte 0x00000002
-	.4byte __NANDUnknownErrorMessageChinaKorea
-	.4byte 0
diff --git a/asm/nand/NANDErrorMessage_8055ccf0.s b/asm/nand/NANDErrorMessage_8055ccf0.s
deleted file mode 100644
index d80c5022..00000000
--- a/asm/nand/NANDErrorMessage_8055ccf0.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global NANDErrorFunc
-NANDErrorFunc:
-	.skip 0x8
diff --git a/asm/nand/NANDErrorMessage_8055e710.s b/asm/nand/NANDErrorMessage_8055e710.s
deleted file mode 100644
index ba244991..00000000
--- a/asm/nand/NANDErrorMessage_8055e710.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global __NANDMaxBlocksErrorMessageChinaKorea
-__NANDMaxBlocksErrorMessageChinaKorea:
-
-	.4byte "@1815"
-	.4byte "@1816_80436B3C"
-
-.global __NANDMaxFilesErrorMessageChinaKorea
-__NANDMaxFilesErrorMessageChinaKorea:
-
-	.4byte "@1822_80436E4C"
-	.4byte "@1823"
-
-.global __NANDCorruptErrorMessageChinaKorea
-__NANDCorruptErrorMessageChinaKorea:
-
-	.4byte "@1835"
-	.4byte "@1836"
-
-.global __NANDBusyErrorMessageChinaKorea
-__NANDBusyErrorMessageChinaKorea:
-
-	.4byte "@1847_804379EC"
-	.4byte "@1848_80437A70"
-
-.global __NANDUnknownErrorMessageChinaKorea
-__NANDUnknownErrorMessageChinaKorea:
-
-	.4byte "@1859"
-	.4byte "@1860"
-
-.global "@1888"
-"@1888":
-
-	.4byte 0xFFFFFF00
-	.4byte 0
diff --git a/asm/nand/NANDLogging_8004aae0.s b/asm/nand/NANDLogging.s
similarity index 96%
rename from asm/nand/NANDLogging_8004aae0.s
rename to asm/nand/NANDLogging.s
index 70670abb..d3474471 100644
--- a/asm/nand/NANDLogging_8004aae0.s
+++ b/asm/nand/NANDLogging.s
@@ -461,3 +461,59 @@ lbl_8004B10C:
 /* 8004B124 00046F64  00 00 00 00 */	.4byte 0x00000000
 /* 8004B128 00046F68  00 00 00 00 */	.4byte 0x00000000
 /* 8004B12C 00046F6C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@1150"
+"@1150":
+
+	.4byte 0x2F736861
+	.4byte 0x72656432
+	.4byte 0x2F746573
+	.4byte 0x74322F6E
+	.4byte 0x616E6465
+	.4byte 0x72722E6C
+	.4byte 0x6F670000
+
+.global "@1155"
+"@1155":
+
+	.4byte 0x25642025
+	.4byte 0x3034642F
+	.4byte 0x25303264
+	.4byte 0x2F253032
+	.4byte 0x64202530
+	.4byte 0x32643A25
+	.4byte 0x3032643A
+	.4byte 0x25303264
+	.4byte 0x20257320
+	.4byte 0x25730000
+	.4byte 0
+.include "macros.inc"
+
+.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
+.global s_message
+s_message:
+	.skip 0x300
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global s_fd
+s_fd:
+
+	.4byte 0xFFFFFF01
+
+.global s_err
+s_err:
+
+	.4byte 0xFFFFFF8B
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global s_callback
+s_callback:
+	.skip 0x4
+
+.global s_stage
+s_stage:
+	.skip 0x4
diff --git a/asm/nand/NANDLogging_80436580.s b/asm/nand/NANDLogging_80436580.s
deleted file mode 100644
index 8a851418..00000000
--- a/asm/nand/NANDLogging_80436580.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@1150"
-"@1150":
-
-	.4byte 0x2F736861
-	.4byte 0x72656432
-	.4byte 0x2F746573
-	.4byte 0x74322F6E
-	.4byte 0x616E6465
-	.4byte 0x72722E6C
-	.4byte 0x6F670000
-
-.global "@1155"
-"@1155":
-
-	.4byte 0x25642025
-	.4byte 0x3034642F
-	.4byte 0x25303264
-	.4byte 0x2F253032
-	.4byte 0x64202530
-	.4byte 0x32643A25
-	.4byte 0x3032643A
-	.4byte 0x25303264
-	.4byte 0x20257320
-	.4byte 0x25730000
-	.4byte 0
diff --git a/asm/nand/NANDLogging_804b5880.s b/asm/nand/NANDLogging_804b5880.s
deleted file mode 100644
index 44d54202..00000000
--- a/asm/nand/NANDLogging_804b5880.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .bss, "", @nobits  # 0x80496700 - 0x80556420 ; 0x000BFD20
-.global s_message
-s_message:
-	.skip 0x300
diff --git a/asm/nand/NANDLogging_80556670.s b/asm/nand/NANDLogging_80556670.s
deleted file mode 100644
index 97f53599..00000000
--- a/asm/nand/NANDLogging_80556670.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global s_fd
-s_fd:
-
-	.4byte 0xFFFFFF01
-
-.global s_err
-s_err:
-
-	.4byte 0xFFFFFF8B
diff --git a/asm/nand/NANDLogging_8055cce8.s b/asm/nand/NANDLogging_8055cce8.s
deleted file mode 100644
index 63369bf7..00000000
--- a/asm/nand/NANDLogging_8055cce8.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global s_callback
-s_callback:
-	.skip 0x4
-
-.global s_stage
-s_stage:
-	.skip 0x4
diff --git a/asm/nand/NANDOpenClose_800492a0.s b/asm/nand/NANDOpenClose.s
similarity index 100%
rename from asm/nand/NANDOpenClose_800492a0.s
rename to asm/nand/NANDOpenClose.s
diff --git a/asm/nand/nand_80047e40.s b/asm/nand/nand.s
similarity index 99%
rename from asm/nand/nand_80047e40.s
rename to asm/nand/nand.s
index 9a12341d..81ce9221 100644
--- a/asm/nand/nand_80047e40.s
+++ b/asm/nand/nand.s
@@ -1581,3 +1581,39 @@ lbl_8004927C:
 /* 80049294 000450D4  00 00 00 00 */	.4byte 0x00000000
 /* 80049298 000450D8  00 00 00 00 */	.4byte 0x00000000
 /* 8004929C 000450DC  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global "@3188_804078A8"
+"@3188_804078A8":
+
+	.4byte 0x30313233
+	.4byte 0x34353637
+	.4byte 0x38396162
+	.4byte 0x63646566
+	.4byte 0x6768696A
+	.4byte 0x6B6C6D6E
+	.4byte 0x6F707172
+	.4byte 0x73747576
+	.4byte 0x7778797A
+	.4byte 0x41424344
+	.4byte 0x45464748
+	.4byte 0x494A4B4C
+	.4byte 0x4D4E4F50
+	.4byte 0x51525354
+	.4byte 0x55565758
+	.4byte 0x595A2D5F
+	.4byte 0x2E2F0000
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@3665"
+"@3665":
+
+	.4byte 0x2F000000
+
+.global "@3666"
+"@3666":
+
+	.4byte 0x2F257300
diff --git a/asm/nand/nand_804078a8.s b/asm/nand/nand_804078a8.s
deleted file mode 100644
index 727c4f2c..00000000
--- a/asm/nand/nand_804078a8.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global "@3188_804078A8"
-"@3188_804078A8":
-
-	.4byte 0x30313233
-	.4byte 0x34353637
-	.4byte 0x38396162
-	.4byte 0x63646566
-	.4byte 0x6768696A
-	.4byte 0x6B6C6D6E
-	.4byte 0x6F707172
-	.4byte 0x73747576
-	.4byte 0x7778797A
-	.4byte 0x41424344
-	.4byte 0x45464748
-	.4byte 0x494A4B4C
-	.4byte 0x4D4E4F50
-	.4byte 0x51525354
-	.4byte 0x55565758
-	.4byte 0x595A2D5F
-	.4byte 0x2E2F0000
-	.4byte 0
diff --git a/asm/nand/nand_80556638.s b/asm/nand/nand_80556638.s
deleted file mode 100644
index ca288dbc..00000000
--- a/asm/nand/nand_80556638.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@3665"
-"@3665":
-
-	.4byte 0x2F000000
-
-.global "@3666"
-"@3666":
-
-	.4byte 0x2F257300
diff --git a/obj_files.mk b/obj_files.mk
index 31c539a9..782b4f64 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -213,14 +213,15 @@ $(BUILD_DIR)/asm/dsp/dsp.o \
 $(BUILD_DIR)/asm/dsp/dsp_debug.o \
 $(BUILD_DIR)/asm/dsp/dsp_task.o \
 \
+$(BUILD_DIR)/asm/nand/nand.o \
+$(BUILD_DIR)/asm/nand/NANDOpenClose.o \
+$(BUILD_DIR)/asm/nand/NANDCore.o \
+$(BUILD_DIR)/asm/nand/NANDCheck.o \
+$(BUILD_DIR)/asm/nand/NANDLogging.o \
+$(BUILD_DIR)/asm/nand/NANDErrorMessage.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/nand/nand_80047e40.o \
-$(BUILD_DIR)/asm/nand/NANDOpenClose_800492a0.o \
-$(BUILD_DIR)/asm/nand/NANDCore_800497b0.o \
-$(BUILD_DIR)/asm/nand/NANDCheck_8004a910.o \
-$(BUILD_DIR)/asm/nand/NANDLogging_8004aae0.o \
-$(BUILD_DIR)/asm/nand/NANDErrorMessage_8004b130.o \
 $(BUILD_DIR)/asm/sc/scsystem_8004b430.o \
 $(BUILD_DIR)/asm/sc/scapi_8004cce0.o \
 $(BUILD_DIR)/asm/sc/scapi_prdinfo_8004d1f0.o \
@@ -2999,9 +3000,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/nand/nand_804078a8.o \
-$(BUILD_DIR)/asm/nand/NANDCore_804078f0.o \
-$(BUILD_DIR)/asm/nand/NANDErrorMessage_80407a38.o \
 $(BUILD_DIR)/asm/sc/scsystem_80407c50.o \
 $(BUILD_DIR)/asm/wenc/wenc_80407ca8.o \
 $(BUILD_DIR)/asm/wpad/WPAD_80407ce8.o \
@@ -3229,10 +3227,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/nand/NANDCore_80436380.o \
-$(BUILD_DIR)/asm/nand/NANDCheck_804364d0.o \
-$(BUILD_DIR)/asm/nand/NANDLogging_80436580.o \
-$(BUILD_DIR)/asm/nand/NANDErrorMessage_804365c8.o \
 $(BUILD_DIR)/asm/sc/scsystem_804381f8.o \
 $(BUILD_DIR)/asm/sc/scapi_prdinfo_804383f0.o \
 $(BUILD_DIR)/asm/enc/encutility_80438450.o \
@@ -5022,8 +5016,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/nand/NANDCore_804b5820.o \
-$(BUILD_DIR)/asm/nand/NANDLogging_804b5880.o \
 $(BUILD_DIR)/asm/sc/scsystem_804b5b80.o \
 $(BUILD_DIR)/asm/ipc/ipcclt_804bdd20.o \
 $(BUILD_DIR)/asm/ipc/memory_804bde60.o \
@@ -5153,10 +5145,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/nand/nand_80556638.o \
-$(BUILD_DIR)/asm/nand/NANDCore_80556640.o \
-$(BUILD_DIR)/asm/nand/NANDCheck_80556660.o \
-$(BUILD_DIR)/asm/nand/NANDLogging_80556670.o \
 $(BUILD_DIR)/asm/sc/scsystem_80556678.o \
 $(BUILD_DIR)/asm/sc/scapi_prdinfo_80556788.o \
 $(BUILD_DIR)/asm/enc/encutility_80556798.o \
@@ -5589,9 +5577,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/nand/NANDCore_8055cce0.o \
-$(BUILD_DIR)/asm/nand/NANDLogging_8055cce8.o \
-$(BUILD_DIR)/asm/nand/NANDErrorMessage_8055ccf0.o \
 $(BUILD_DIR)/asm/sc/scsystem_8055ccf8.o \
 $(BUILD_DIR)/asm/enc/encutility_8055cd10.o \
 $(BUILD_DIR)/asm/ipc/ipcMain_8055cd18.o \
@@ -5797,7 +5782,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/nand/NANDErrorMessage_8055e710.o \
 $(BUILD_DIR)/asm/wenc/wenc_8055e740.o \
 $(BUILD_DIR)/asm/wpad/WPAD_8055e748.o \
 $(BUILD_DIR)/asm/wpad/WPADHIDParser_8055e750.o \