From cd86e669aab194c7173f7817bf4add43bf9b34b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 10:07:38 +0100 Subject: [PATCH] merge libms --- .../{commonbin_80174470.s => commonbin.s} | 0 asm/libms/{libms_80174190.s => libms.s} | 10 +++ asm/libms/libms_8055d0e8.s | 10 --- asm/libms/{msgfile_80174210.s => msgfile.s} | 36 ++++++++ asm/libms/msgfile_80452ae0.s | 10 --- asm/libms/msgfile_80556af0.s | 26 ------ asm/libms/{projfile_801746a0.s => projfile.s} | 84 +++++++++++++++++++ asm/libms/projfile_80452af0.s | 10 --- asm/libms/projfile_80556b10.s | 74 ---------------- obj_files.mk | 14 ++-- 10 files changed, 135 insertions(+), 139 deletions(-) rename asm/libms/{commonbin_80174470.s => commonbin.s} (100%) rename asm/libms/{libms_80174190.s => libms.s} (92%) delete mode 100644 asm/libms/libms_8055d0e8.s rename asm/libms/{msgfile_80174210.s => msgfile.s} (94%) delete mode 100644 asm/libms/msgfile_80452ae0.s delete mode 100644 asm/libms/msgfile_80556af0.s rename asm/libms/{projfile_801746a0.s => projfile.s} (94%) delete mode 100644 asm/libms/projfile_80452af0.s delete mode 100644 asm/libms/projfile_80556b10.s diff --git a/asm/libms/commonbin_80174470.s b/asm/libms/commonbin.s similarity index 100% rename from asm/libms/commonbin_80174470.s rename to asm/libms/commonbin.s diff --git a/asm/libms/libms_80174190.s b/asm/libms/libms.s similarity index 92% rename from asm/libms/libms_80174190.s rename to asm/libms/libms.s index ea15c850..a31cbd73 100644 --- a/asm/libms/libms_80174190.s +++ b/asm/libms/libms.s @@ -47,3 +47,13 @@ lbl_801741FC: /* 80174204 00170044 00 00 00 00 */ .4byte 0x00000000 /* 80174208 00170048 00 00 00 00 */ .4byte 0x00000000 /* 8017420C 0017004C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global g_pMalloc +g_pMalloc: + .skip 0x4 + +.global g_pFree +g_pFree: + .skip 0x4 diff --git a/asm/libms/libms_8055d0e8.s b/asm/libms/libms_8055d0e8.s deleted file mode 100644 index 7fc693e3..00000000 --- a/asm/libms/libms_8055d0e8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global g_pMalloc -g_pMalloc: - .skip 0x4 - -.global g_pFree -g_pFree: - .skip 0x4 diff --git a/asm/libms/msgfile_80174210.s b/asm/libms/msgfile.s similarity index 94% rename from asm/libms/msgfile_80174210.s rename to asm/libms/msgfile.s index f46089fa..a1331cbb 100644 --- a/asm/libms/msgfile_80174210.s +++ b/asm/libms/msgfile.s @@ -183,3 +183,39 @@ lbl_80174454: /* 80174464 001702A4 4E 80 00 20 */ blr /* 80174468 001702A8 00 00 00 00 */ .4byte 0x00000000 /* 8017446C 001702AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@2545" +"@2545": + + .4byte 0x4D736753 + .4byte 0x7464426E + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@2546" +"@2546": + + .4byte 0x4C424C31 + .4byte 0 + +.global "@2547" +"@2547": + + .4byte 0x54585432 + .4byte 0 + +.global "@2548" +"@2548": + + .4byte 0x41545231 + .4byte 0 + +.global "@2549_80556B08" +"@2549_80556B08": + + .4byte 0x54535931 + .4byte 0 diff --git a/asm/libms/msgfile_80452ae0.s b/asm/libms/msgfile_80452ae0.s deleted file mode 100644 index 6a487028..00000000 --- a/asm/libms/msgfile_80452ae0.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@2545" -"@2545": - - .4byte 0x4D736753 - .4byte 0x7464426E - .4byte 0 - .4byte 0 diff --git a/asm/libms/msgfile_80556af0.s b/asm/libms/msgfile_80556af0.s deleted file mode 100644 index 04f33d9c..00000000 --- a/asm/libms/msgfile_80556af0.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@2546" -"@2546": - - .4byte 0x4C424C31 - .4byte 0 - -.global "@2547" -"@2547": - - .4byte 0x54585432 - .4byte 0 - -.global "@2548" -"@2548": - - .4byte 0x41545231 - .4byte 0 - -.global "@2549_80556B08" -"@2549_80556B08": - - .4byte 0x54535931 - .4byte 0 diff --git a/asm/libms/projfile_801746a0.s b/asm/libms/projfile.s similarity index 94% rename from asm/libms/projfile_801746a0.s rename to asm/libms/projfile.s index e4458ff7..8907bfc5 100644 --- a/asm/libms/projfile_801746a0.s +++ b/asm/libms/projfile.s @@ -333,3 +333,87 @@ lbl_80174AB4: /* 80174ACC 0017090C 80 03 00 04 */ lwz r0, 0x4(r3) /* 80174AD0 00170910 7C 65 02 14 */ add r3, r5, r0 /* 80174AD4 00170914 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@3242_80452AF0" +"@3242_80452AF0": + + .4byte 0x4D736750 + .4byte 0x726A426E + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@3243" +"@3243": + + .4byte 0x434C5231 + .4byte 0 + +.global "@3244" +"@3244": + + .4byte 0x434C4231 + .4byte 0 + +.global "@3245" +"@3245": + + .4byte 0x41544932 + .4byte 0 + +.global "@3246" +"@3246": + + .4byte 0x414C4231 + .4byte 0 + +.global "@3247" +"@3247": + + .4byte 0x414C4932 + .4byte 0 + +.global "@3248_80556B38" +"@3248_80556B38": + + .4byte 0x54474732 + .4byte 0 + +.global "@3249" +"@3249": + + .4byte 0x54414732 + .4byte 0 + +.global "@3250_80556B48" +"@3250_80556B48": + + .4byte 0x54475032 + .4byte 0 + +.global "@3251" +"@3251": + + .4byte 0x54474C32 + .4byte 0 + +.global "@3252" +"@3252": + + .4byte 0x53594C33 + .4byte 0 + +.global "@3253" +"@3253": + + .4byte 0x534C4231 + .4byte 0 + +.global "@3254" +"@3254": + + .4byte 0x43544931 + .4byte 0 diff --git a/asm/libms/projfile_80452af0.s b/asm/libms/projfile_80452af0.s deleted file mode 100644 index f1023276..00000000 --- a/asm/libms/projfile_80452af0.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@3242_80452AF0" -"@3242_80452AF0": - - .4byte 0x4D736750 - .4byte 0x726A426E - .4byte 0 - .4byte 0 diff --git a/asm/libms/projfile_80556b10.s b/asm/libms/projfile_80556b10.s deleted file mode 100644 index b054a1f6..00000000 --- a/asm/libms/projfile_80556b10.s +++ /dev/null @@ -1,74 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@3243" -"@3243": - - .4byte 0x434C5231 - .4byte 0 - -.global "@3244" -"@3244": - - .4byte 0x434C4231 - .4byte 0 - -.global "@3245" -"@3245": - - .4byte 0x41544932 - .4byte 0 - -.global "@3246" -"@3246": - - .4byte 0x414C4231 - .4byte 0 - -.global "@3247" -"@3247": - - .4byte 0x414C4932 - .4byte 0 - -.global "@3248_80556B38" -"@3248_80556B38": - - .4byte 0x54474732 - .4byte 0 - -.global "@3249" -"@3249": - - .4byte 0x54414732 - .4byte 0 - -.global "@3250_80556B48" -"@3250_80556B48": - - .4byte 0x54475032 - .4byte 0 - -.global "@3251" -"@3251": - - .4byte 0x54474C32 - .4byte 0 - -.global "@3252" -"@3252": - - .4byte 0x53594C33 - .4byte 0 - -.global "@3253" -"@3253": - - .4byte 0x534C4231 - .4byte 0 - -.global "@3254" -"@3254": - - .4byte 0x43544931 - .4byte 0 diff --git a/obj_files.mk b/obj_files.mk index 9b8f16ac..c417ae61 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -627,12 +627,13 @@ $(BUILD_DIR)/asm/libMobiclip/VX2_InverseQuantization.o \ $(BUILD_DIR)/asm/libMobiclip/VX2_MotionCompensation.o \ $(BUILD_DIR)/asm/libMobiclip/VX2_Pred.o \ \ +$(BUILD_DIR)/asm/libms/libms.o \ +$(BUILD_DIR)/asm/libms/msgfile.o \ +$(BUILD_DIR)/asm/libms/commonbin.o \ +$(BUILD_DIR)/asm/libms/projfile.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/libms/libms_80174190.o \ -$(BUILD_DIR)/asm/libms/msgfile_80174210.o \ -$(BUILD_DIR)/asm/libms/commonbin_80174470.o \ -$(BUILD_DIR)/asm/libms/projfile_801746a0.o \ $(BUILD_DIR)/asm/src/Main_80174ad8.o \ $(BUILD_DIR)/asm/src/TPL_80174af8.o \ $(BUILD_DIR)/asm/src/AddOnMint_80174cb8.o \ @@ -3133,8 +3134,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/libms/msgfile_80452ae0.o \ -$(BUILD_DIR)/asm/libms/projfile_80452af0.o \ $(BUILD_DIR)/asm/src/AppImpl_80452b00.o \ $(BUILD_DIR)/asm/src/DvdWatch_80452b30.o \ $(BUILD_DIR)/asm/src/DvdWatch_ENG_80452bc0.o \ @@ -4781,8 +4780,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/libms/msgfile_80556af0.o \ -$(BUILD_DIR)/asm/libms/projfile_80556b10.o \ $(BUILD_DIR)/asm/src/Main_80556b70.o \ $(BUILD_DIR)/asm/src/DvdWatch_ENG_80556b78.o \ $(BUILD_DIR)/asm/src/HIDErrorMenu_80556b80.o \ @@ -5153,7 +5150,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/libms/libms_8055d0e8.o \ $(BUILD_DIR)/asm/src/AppImpl_8055d0f0.o \ $(BUILD_DIR)/asm/src/Application_8055d130.o \ $(BUILD_DIR)/asm/src/AutoResetTimer_8055d138.o \