From dbd6cd42b15f45a66ea49b301a5b790b7f855ccc 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:34:21 +0100
Subject: [PATCH] merge euart

---
 asm/euart/{euart_80072ed0.s => euart.s} | 18 ++++++++++++++++++
 asm/euart/euart_8055cec0.s              | 18 ------------------
 obj_files.mk                            |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)
 rename asm/euart/{euart_80072ed0.s => euart.s} (97%)
 delete mode 100644 asm/euart/euart_8055cec0.s

diff --git a/asm/euart/euart_80072ed0.s b/asm/euart/euart.s
similarity index 97%
rename from asm/euart/euart_80072ed0.s
rename to asm/euart/euart.s
index 8f54576d..e6cf2e4e 100644
--- a/asm/euart/euart_80072ed0.s
+++ b/asm/euart/euart.s
@@ -281,3 +281,21 @@ lbl_80073238:
 /* 80073244 0006F084  7C 08 03 A6 */	mtlr r0
 /* 80073248 0006F088  38 21 00 30 */	addi r1, r1, 0x30
 /* 8007324C 0006F08C  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global __EUARTInitialized
+__EUARTInitialized:
+	.skip 0x4
+
+.global __EUARTLastErrorCode
+__EUARTLastErrorCode:
+	.skip 0x4
+
+.global __EUARTSendStop
+__EUARTSendStop:
+	.skip 0x4
+
+.global Enabled_8055CECC
+Enabled_8055CECC:
+	.skip 0x4
diff --git a/asm/euart/euart_8055cec0.s b/asm/euart/euart_8055cec0.s
deleted file mode 100644
index bdf1ca1c..00000000
--- a/asm/euart/euart_8055cec0.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global __EUARTInitialized
-__EUARTInitialized:
-	.skip 0x4
-
-.global __EUARTLastErrorCode
-__EUARTLastErrorCode:
-	.skip 0x4
-
-.global __EUARTSendStop
-__EUARTSendStop:
-	.skip 0x4
-
-.global Enabled_8055CECC
-Enabled_8055CECC:
-	.skip 0x4
diff --git a/obj_files.mk b/obj_files.mk
index 8c8562d4..1aa8ae91 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -253,9 +253,10 @@ $(BUILD_DIR)/asm/kpad/KPAD.o \
 $(BUILD_DIR)/asm/kpad/KMPLS.o \
 $(BUILD_DIR)/asm/kpad/KZMplsTestSub.o \
 \
+$(BUILD_DIR)/asm/euart/euart.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/euart/euart_80072ed0.o \
 $(BUILD_DIR)/asm/usb/usb_80073250.o \
 $(BUILD_DIR)/asm/bte/gki_buffer_80074790.o \
 $(BUILD_DIR)/asm/bte/gki_time_80075c30.o \
@@ -5549,7 +5550,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/euart/euart_8055cec0.o \
 $(BUILD_DIR)/asm/usb/usb_8055ced0.o \
 $(BUILD_DIR)/asm/bte/uusb_ppc_8055cee0.o \
 $(BUILD_DIR)/asm/bte/bte_hcisu_8055cef8.o \