diff --git a/asm/wenc/wenc_8004d474.s b/asm/wenc/wenc.s similarity index 95% rename from asm/wenc/wenc_8004d474.s rename to asm/wenc/wenc.s index aa3b64c5..8a26aaba 100644 --- a/asm/wenc/wenc_8004d474.s +++ b/asm/wenc/wenc.s @@ -214,3 +214,33 @@ lbl_8004D718: /* 8004D744 00049584 38 21 00 90 */ addi r1, r1, 0x90 /* 8004D748 00049588 4E 80 00 20 */ blr /* 8004D74C 0004958C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@1993" +"@1993": + + .4byte 0x3FECC000 + .4byte 0 + .4byte 0x3FECC000 + .4byte 0 + .4byte 0x3FECC000 + .4byte 0 + .4byte 0x3FECC000 + .4byte 0 + .4byte 0x3FF33000 + .4byte 0 + .4byte 0x3FF99000 + .4byte 0 + .4byte 0x40000000 + .4byte 0 + .4byte 0x40033000 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2084_8055E740" +"@2084_8055E740": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/wenc/wenc_80407ca8.s b/asm/wenc/wenc_80407ca8.s deleted file mode 100644 index 348331c8..00000000 --- a/asm/wenc/wenc_80407ca8.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@1993" -"@1993": - - .4byte 0x3FECC000 - .4byte 0 - .4byte 0x3FECC000 - .4byte 0 - .4byte 0x3FECC000 - .4byte 0 - .4byte 0x3FECC000 - .4byte 0 - .4byte 0x3FF33000 - .4byte 0 - .4byte 0x3FF99000 - .4byte 0 - .4byte 0x40000000 - .4byte 0 - .4byte 0x40033000 - .4byte 0 diff --git a/asm/wenc/wenc_8055e740.s b/asm/wenc/wenc_8055e740.s deleted file mode 100644 index a660c599..00000000 --- a/asm/wenc/wenc_8055e740.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2084_8055E740" -"@2084_8055E740": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/obj_files.mk b/obj_files.mk index 8687919e..aa35625d 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -224,9 +224,10 @@ $(BUILD_DIR)/asm/sc/scsystem.o \ $(BUILD_DIR)/asm/sc/scapi.o \ $(BUILD_DIR)/asm/sc/scapi_prdinfo.o \ \ +$(BUILD_DIR)/asm/wenc/wenc.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/wenc/wenc_8004d474.o \ $(BUILD_DIR)/asm/enc/encutility_8004d750.o \ $(BUILD_DIR)/asm/enc/encunicode_8004d990.o \ $(BUILD_DIR)/asm/arc/arc_8004dd70.o \ @@ -3001,7 +3002,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/wenc/wenc_80407ca8.o \ $(BUILD_DIR)/asm/wpad/WPAD_80407ce8.o \ $(BUILD_DIR)/asm/wpad/WPADHIDParser_80407db8.o \ $(BUILD_DIR)/asm/bte/hcisu_h2_80407de8.o \ @@ -5776,7 +5776,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/wenc/wenc_8055e740.o \ $(BUILD_DIR)/asm/wpad/WPAD_8055e748.o \ $(BUILD_DIR)/asm/wpad/WPADHIDParser_8055e750.o \ $(BUILD_DIR)/asm/wpad/WUD_8055e7c8.o \