From afbc60efdbc53cc2a25cc39159e2d951e4ef6f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 09:29:17 +0100 Subject: [PATCH] merge fs --- asm/fs/{fs_80050bc0.s => fs.s} | 56 ++++++++++++++++++++++++++++++++++ asm/fs/fs_80438508.s | 16 ---------- asm/fs/fs_805567b0.s | 14 --------- asm/fs/fs_8055cd48.s | 26 ---------------- obj_files.mk | 6 ++-- 5 files changed, 58 insertions(+), 60 deletions(-) rename asm/fs/{fs_80050bc0.s => fs.s} (98%) delete mode 100644 asm/fs/fs_80438508.s delete mode 100644 asm/fs/fs_805567b0.s delete mode 100644 asm/fs/fs_8055cd48.s diff --git a/asm/fs/fs_80050bc0.s b/asm/fs/fs.s similarity index 98% rename from asm/fs/fs_80050bc0.s rename to asm/fs/fs.s index dd79252d..0b5281d8 100644 --- a/asm/fs/fs_80050bc0.s +++ b/asm/fs/fs.s @@ -1737,3 +1737,59 @@ lbl_80052288: /* 80052294 0004E0D4 7C 08 03 A6 */ mtlr r0 /* 80052298 0004E0D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8005229C 0004E0DC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@1709_80438508" +"@1709_80438508": + + .4byte 0x41505020 + .4byte 0x4552524F + .4byte 0x523A204E + .4byte 0x6F742065 + .4byte 0x6E6F7567 + .4byte 0x68204950 + .4byte 0x43206172 + .4byte 0x656E610A + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __fsFd +__fsFd: + + .4byte 0xFFFFFFFF + .4byte 0 + +.global "@1710_805567B8" +"@1710_805567B8": + + .4byte 0x2F646576 + .4byte 0x2F667300 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global __fsInitialized +__fsInitialized: + .skip 0x4 + +.global __devfs +__devfs: + .skip 0x4 + +.global _asynCnt +_asynCnt: + .skip 0x4 + +.global "@LOCAL@ISFS_OpenLib__Fv@lo" +"@LOCAL@ISFS_OpenLib__Fv@lo": + .skip 0x4 + +.global "@LOCAL@ISFS_OpenLib__Fv@hi@0" +"@LOCAL@ISFS_OpenLib__Fv@hi@0": + .skip 0x4 + +.global hId_8055CD5C +hId_8055CD5C: + .skip 0x4 diff --git a/asm/fs/fs_80438508.s b/asm/fs/fs_80438508.s deleted file mode 100644 index 6a4603fb..00000000 --- a/asm/fs/fs_80438508.s +++ /dev/null @@ -1,16 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@1709_80438508" -"@1709_80438508": - - .4byte 0x41505020 - .4byte 0x4552524F - .4byte 0x523A204E - .4byte 0x6F742065 - .4byte 0x6E6F7567 - .4byte 0x68204950 - .4byte 0x43206172 - .4byte 0x656E610A - .4byte 0 - .4byte 0 diff --git a/asm/fs/fs_805567b0.s b/asm/fs/fs_805567b0.s deleted file mode 100644 index 41922cab..00000000 --- a/asm/fs/fs_805567b0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __fsFd -__fsFd: - - .4byte 0xFFFFFFFF - .4byte 0 - -.global "@1710_805567B8" -"@1710_805567B8": - - .4byte 0x2F646576 - .4byte 0x2F667300 diff --git a/asm/fs/fs_8055cd48.s b/asm/fs/fs_8055cd48.s deleted file mode 100644 index edcf2bec..00000000 --- a/asm/fs/fs_8055cd48.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global __fsInitialized -__fsInitialized: - .skip 0x4 - -.global __devfs -__devfs: - .skip 0x4 - -.global _asynCnt -_asynCnt: - .skip 0x4 - -.global "@LOCAL@ISFS_OpenLib__Fv@lo" -"@LOCAL@ISFS_OpenLib__Fv@lo": - .skip 0x4 - -.global "@LOCAL@ISFS_OpenLib__Fv@hi@0" -"@LOCAL@ISFS_OpenLib__Fv@hi@0": - .skip 0x4 - -.global hId_8055CD5C -hId_8055CD5C: - .skip 0x4 diff --git a/obj_files.mk b/obj_files.mk index d6058cda..43d4fbad 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -236,9 +236,10 @@ $(BUILD_DIR)/asm/ipc/ipcclt.o \ $(BUILD_DIR)/asm/ipc/memory.o \ $(BUILD_DIR)/asm/ipc/ipcProfile.o \ \ +$(BUILD_DIR)/asm/fs/fs.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/fs/fs_80050bc0.o \ $(BUILD_DIR)/asm/pad/Padclamp_800522a0.o \ $(BUILD_DIR)/asm/pad/Pad_800524c0.o \ $(BUILD_DIR)/asm/wpad/WPAD_80053df0.o \ @@ -3230,7 +3231,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/fs/fs_80438508.o \ $(BUILD_DIR)/asm/pad/Pad_80438530.o \ $(BUILD_DIR)/asm/wpad/WPAD_80438588.o \ $(BUILD_DIR)/asm/wpad/WPADHIDParser_80438818.o \ @@ -5140,7 +5140,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/fs/fs_805567b0.o \ $(BUILD_DIR)/asm/pad/Pad_805567c0.o \ $(BUILD_DIR)/asm/wpad/WPAD_805567e0.o \ $(BUILD_DIR)/asm/wpad/WUD_805567f8.o \ @@ -5567,7 +5566,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/fs/fs_8055cd48.o \ $(BUILD_DIR)/asm/pad/Pad_8055cd60.o \ $(BUILD_DIR)/asm/wpad/WPAD_8055cd90.o \ $(BUILD_DIR)/asm/wpad/WPADHIDParser_8055ce08.o \