From 5d01ff1be65d68b1c9162dc6eff9222a907ddcad 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 18:55:13 +0100
Subject: [PATCH] merge namespace file

---
 asm/src/FDGManager_80414518.s                 | 10 ------
 asm/src/FDGManager_804537e0.s                 | 10 ------
 asm/src/FDGManager_80556d10.s                 |  8 -----
 asm/src/FDGManager_8055f650.s                 |  8 -----
 asm/src/FileLoader_80556d18.s                 |  8 -----
 asm/src/Utility_80556d20.s                    |  8 -----
 asm/src/Utility_8055d180.s                    |  6 ----
 .../FDGAccessor.s}                            |  0
 .../{DNOption_80187538.s => file/DNOption.s}  |  0
 .../FDGManager.s}                             | 36 +++++++++++++++++++
 .../FileAccessor.s}                           |  0
 .../FileClearDisableScope.s}                  |  0
 .../FileLoader.s}                             |  8 +++++
 .../FileManager.s}                            |  0
 .../{FileTree_801882bc.s => file/FileTree.s}  |  0
 .../{Utility_80188bf4.s => file/Utility.s}    | 14 ++++++++
 obj_files.mk                                  | 27 ++++++--------
 17 files changed, 69 insertions(+), 74 deletions(-)
 delete mode 100644 asm/src/FDGManager_80414518.s
 delete mode 100644 asm/src/FDGManager_804537e0.s
 delete mode 100644 asm/src/FDGManager_80556d10.s
 delete mode 100644 asm/src/FDGManager_8055f650.s
 delete mode 100644 asm/src/FileLoader_80556d18.s
 delete mode 100644 asm/src/Utility_80556d20.s
 delete mode 100644 asm/src/Utility_8055d180.s
 rename asm/src/{FDGAccessor_801870ec.s => fdg/FDGAccessor.s} (100%)
 rename asm/src/{DNOption_80187538.s => file/DNOption.s} (100%)
 rename asm/src/{FDGManager_80187544.s => file/FDGManager.s} (95%)
 rename asm/src/{FileAccessor_80187a50.s => file/FileAccessor.s} (100%)
 rename asm/src/{FileClearDisableScope_80187b5c.s => file/FileClearDisableScope.s} (100%)
 rename asm/src/{FileLoader_80187c00.s => file/FileLoader.s} (99%)
 rename asm/src/{FileManager_80188204.s => file/FileManager.s} (100%)
 rename asm/src/{FileTree_801882bc.s => file/FileTree.s} (100%)
 rename asm/src/{Utility_80188bf4.s => file/Utility.s} (98%)

diff --git a/asm/src/FDGManager_80414518.s b/asm/src/FDGManager_80414518.s
deleted file mode 100644
index b9b3939b..00000000
--- a/asm/src/FDGManager_80414518.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.include "macros.inc"
-
-.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
-.global "T_PREFIX_EXFLAG__Q24file24@unnamed@FDGManager_cpp@"
-"T_PREFIX_EXFLAG__Q24file24@unnamed@FDGManager_cpp@":
-
-	.4byte 0x3A455846
-	.4byte 0x6C61673A
-	.4byte 0
-	.4byte 0
diff --git a/asm/src/FDGManager_804537e0.s b/asm/src/FDGManager_804537e0.s
deleted file mode 100644
index 7ec0e45a..00000000
--- a/asm/src/FDGManager_804537e0.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@49254_804537E0"
-"@49254_804537E0":
-
-	.4byte 0x6664672F
-	.4byte 0x41726368
-	.4byte 0x6976652E
-	.4byte 0x64617400
diff --git a/asm/src/FDGManager_80556d10.s b/asm/src/FDGManager_80556d10.s
deleted file mode 100644
index 50925423..00000000
--- a/asm/src/FDGManager_80556d10.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "T_FILE_PATH__Q24file24@unnamed@FDGManager_cpp@"
-"T_FILE_PATH__Q24file24@unnamed@FDGManager_cpp@":
-
-	.4byte "@49254_804537E0"
-	.4byte 0
diff --git a/asm/src/FDGManager_8055f650.s b/asm/src/FDGManager_8055f650.s
deleted file mode 100644
index ddbe5364..00000000
--- a/asm/src/FDGManager_8055f650.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
-.global "T_PREFIX_MSG__Q24file24@unnamed@FDGManager_cpp@"
-"T_PREFIX_MSG__Q24file24@unnamed@FDGManager_cpp@":
-
-	.4byte 0x3A4D5347
-	.4byte 0x3A000000
diff --git a/asm/src/FileLoader_80556d18.s b/asm/src/FileLoader_80556d18.s
deleted file mode 100644
index 5f542666..00000000
--- a/asm/src/FileLoader_80556d18.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@49818_80556D18"
-"@49818_80556D18":
-
-	.4byte 0x2E636D70
-	.4byte 0
diff --git a/asm/src/Utility_80556d20.s b/asm/src/Utility_80556d20.s
deleted file mode 100644
index 27a5b279..00000000
--- a/asm/src/Utility_80556d20.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global "@49660"
-"@49660":
-
-	.4byte 0x25732E25
-	.4byte 0x73257300
diff --git a/asm/src/Utility_8055d180.s b/asm/src/Utility_8055d180.s
deleted file mode 100644
index 953bed33..00000000
--- a/asm/src/Utility_8055d180.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global "t_isFileLoadWarningEnable__Q24file21@unnamed@Utility_cpp@"
-"t_isFileLoadWarningEnable__Q24file21@unnamed@Utility_cpp@":
-	.skip 0x8
diff --git a/asm/src/FDGAccessor_801870ec.s b/asm/src/fdg/FDGAccessor.s
similarity index 100%
rename from asm/src/FDGAccessor_801870ec.s
rename to asm/src/fdg/FDGAccessor.s
diff --git a/asm/src/DNOption_80187538.s b/asm/src/file/DNOption.s
similarity index 100%
rename from asm/src/DNOption_80187538.s
rename to asm/src/file/DNOption.s
diff --git a/asm/src/FDGManager_80187544.s b/asm/src/file/FDGManager.s
similarity index 95%
rename from asm/src/FDGManager_80187544.s
rename to asm/src/file/FDGManager.s
index 276adf94..3b8d090c 100644
--- a/asm/src/FDGManager_80187544.s
+++ b/asm/src/file/FDGManager.s
@@ -374,3 +374,39 @@ reset__Q24file10FDGManagerFv:
 /* 80187A44 00183884  7C 08 03 A6 */	mtlr r0
 /* 80187A48 00183888  38 21 00 20 */	addi r1, r1, 0x20
 /* 80187A4C 0018388C  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .rodata, "wa"  # 0x80406560 - 0x80421040 ; 0x0001AAE0
+.global "T_PREFIX_EXFLAG__Q24file24@unnamed@FDGManager_cpp@"
+"T_PREFIX_EXFLAG__Q24file24@unnamed@FDGManager_cpp@":
+
+	.4byte 0x3A455846
+	.4byte 0x6C61673A
+	.4byte 0
+	.4byte 0
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@49254_804537E0"
+"@49254_804537E0":
+
+	.4byte 0x6664672F
+	.4byte 0x41726368
+	.4byte 0x6976652E
+	.4byte 0x64617400
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "T_FILE_PATH__Q24file24@unnamed@FDGManager_cpp@"
+"T_FILE_PATH__Q24file24@unnamed@FDGManager_cpp@":
+
+	.4byte "@49254_804537E0"
+	.4byte 0
+.include "macros.inc"
+
+.section .sdata2, "wa"  # 0x8055DF80 - 0x805643C0 ; 0x00006440
+.global "T_PREFIX_MSG__Q24file24@unnamed@FDGManager_cpp@"
+"T_PREFIX_MSG__Q24file24@unnamed@FDGManager_cpp@":
+
+	.4byte 0x3A4D5347
+	.4byte 0x3A000000
diff --git a/asm/src/FileAccessor_80187a50.s b/asm/src/file/FileAccessor.s
similarity index 100%
rename from asm/src/FileAccessor_80187a50.s
rename to asm/src/file/FileAccessor.s
diff --git a/asm/src/FileClearDisableScope_80187b5c.s b/asm/src/file/FileClearDisableScope.s
similarity index 100%
rename from asm/src/FileClearDisableScope_80187b5c.s
rename to asm/src/file/FileClearDisableScope.s
diff --git a/asm/src/FileLoader_80187c00.s b/asm/src/file/FileLoader.s
similarity index 99%
rename from asm/src/FileLoader_80187c00.s
rename to asm/src/file/FileLoader.s
index 42ac88c5..adc1d865 100644
--- a/asm/src/FileLoader_80187c00.s
+++ b/asm/src/file/FileLoader.s
@@ -450,3 +450,11 @@ lbl_801881EC:
 /* 801881F8 00184038  7C 08 03 A6 */	mtlr r0
 /* 801881FC 0018403C  38 21 00 F0 */	addi r1, r1, 0xf0
 /* 80188200 00184040  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@49818_80556D18"
+"@49818_80556D18":
+
+	.4byte 0x2E636D70
+	.4byte 0
diff --git a/asm/src/FileManager_80188204.s b/asm/src/file/FileManager.s
similarity index 100%
rename from asm/src/FileManager_80188204.s
rename to asm/src/file/FileManager.s
diff --git a/asm/src/FileTree_801882bc.s b/asm/src/file/FileTree.s
similarity index 100%
rename from asm/src/FileTree_801882bc.s
rename to asm/src/file/FileTree.s
diff --git a/asm/src/Utility_80188bf4.s b/asm/src/file/Utility.s
similarity index 98%
rename from asm/src/Utility_80188bf4.s
rename to asm/src/file/Utility.s
index 9d957a7e..68496bc5 100644
--- a/asm/src/Utility_80188bf4.s
+++ b/asm/src/file/Utility.s
@@ -433,3 +433,17 @@ UncompressedFile__Q24file7UtilityFRCQ23mem8MemBlockRQ23mem10IAllocator:
 /* 80189170 00184FB0  7C 08 03 A6 */	mtlr r0
 /* 80189174 00184FB4  38 21 00 20 */	addi r1, r1, 0x20
 /* 80189178 00184FB8  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global "@49660"
+"@49660":
+
+	.4byte 0x25732E25
+	.4byte 0x73257300
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global "t_isFileLoadWarningEnable__Q24file21@unnamed@Utility_cpp@"
+"t_isFileLoadWarningEnable__Q24file21@unnamed@Utility_cpp@":
+	.skip 0x8
diff --git a/obj_files.mk b/obj_files.mk
index c76ce102..df0f8d94 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -687,17 +687,19 @@ $(BUILD_DIR)/asm/src/effect/detail/PtclEffectRes.o \
 $(BUILD_DIR)/asm/src/effect/detail/RequestArg.o \
 $(BUILD_DIR)/asm/src/effect/detail/RequestArgOption.o \
 \
+$(BUILD_DIR)/asm/src/fdg/FDGAccessor.o \
+\
+$(BUILD_DIR)/asm/src/file/DNOption.o \
+$(BUILD_DIR)/asm/src/file/FDGManager.o \
+$(BUILD_DIR)/asm/src/file/FileAccessor.o \
+$(BUILD_DIR)/asm/src/file/FileClearDisableScope.o \
+$(BUILD_DIR)/asm/src/file/FileLoader.o \
+$(BUILD_DIR)/asm/src/file/FileManager.o \
+$(BUILD_DIR)/asm/src/file/FileTree.o \
+$(BUILD_DIR)/asm/src/file/Utility.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/src/FDGAccessor_801870ec.o \
-$(BUILD_DIR)/asm/src/DNOption_80187538.o \
-$(BUILD_DIR)/asm/src/FDGManager_80187544.o \
-$(BUILD_DIR)/asm/src/FileAccessor_80187a50.o \
-$(BUILD_DIR)/asm/src/FileClearDisableScope_80187b5c.o \
-$(BUILD_DIR)/asm/src/FileLoader_80187c00.o \
-$(BUILD_DIR)/asm/src/FileManager_80188204.o \
-$(BUILD_DIR)/asm/src/FileTree_801882bc.o \
-$(BUILD_DIR)/asm/src/Utility_80188bf4.o \
 $(BUILD_DIR)/asm/src/Font_8018917c.o \
 $(BUILD_DIR)/asm/src/FontKindUtil_8018933c.o \
 $(BUILD_DIR)/asm/src/FontLoader_801893fc.o \
@@ -3013,7 +3015,6 @@ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o
 
 # .rodata
 O_FILES += \
-$(BUILD_DIR)/asm/src/FDGManager_80414518.o \
 $(BUILD_DIR)/asm/src/FontKindUtil_80414528.o \
 $(BUILD_DIR)/asm/src/FreezeThread_80414570.o \
 $(BUILD_DIR)/asm/src/ColorAnimMaterialTarget_80414598.o \
@@ -3146,7 +3147,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
 $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
 # .data
 O_FILES += \
-$(BUILD_DIR)/asm/src/FDGManager_804537e0.o \
 $(BUILD_DIR)/asm/src/FontKindUtil_804537f0.o \
 $(BUILD_DIR)/asm/src/Console_804538a0.o \
 $(BUILD_DIR)/asm/src/Exception_80453990.o \
@@ -4775,9 +4775,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
 $(BUILD_DIR)/asm/src/Table_80556398.o
 # .sdata
 O_FILES += \
-$(BUILD_DIR)/asm/src/FDGManager_80556d10.o \
-$(BUILD_DIR)/asm/src/FileLoader_80556d18.o \
-$(BUILD_DIR)/asm/src/Utility_80556d20.o \
 $(BUILD_DIR)/asm/src/FontKindUtil_80556d28.o \
 $(BUILD_DIR)/asm/src/FontManager_80556d30.o \
 $(BUILD_DIR)/asm/src/Exception_80556d38.o \
@@ -5138,7 +5135,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
 $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
 # .sbss
 O_FILES += \
-$(BUILD_DIR)/asm/src/Utility_8055d180.o \
 $(BUILD_DIR)/asm/src/Exception_8055d188.o \
 $(BUILD_DIR)/asm/src/FreezeManager_8055d190.o \
 $(BUILD_DIR)/asm/src/MapFile_8055d1a0.o \
@@ -5271,7 +5267,6 @@ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
 $(BUILD_DIR)/asm/src/Alarm_8055df68.o
 # .sdata2
 O_FILES += \
-$(BUILD_DIR)/asm/src/FDGManager_8055f650.o \
 $(BUILD_DIR)/asm/src/Exception_8055f658.o \
 $(BUILD_DIR)/asm/src/AutoReqAnim_8055f660.o \
 $(BUILD_DIR)/asm/src/CharaAnimBlender_8055f670.o \