From e1240fbb6cb6bd62fa3bb23e33efbb87e2f337c9 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:06:47 +0100
Subject: [PATCH] merge db

---
 asm/db/{db_8002bab0.s => db.s} | 6 ++++++
 asm/db/db_8055c8f8.s           | 6 ------
 obj_files.mk                   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename asm/db/{db_8002bab0.s => db.s} (80%)
 delete mode 100644 asm/db/db_8055c8f8.s

diff --git a/asm/db/db_8002bab0.s b/asm/db/db.s
similarity index 80%
rename from asm/db/db_8002bab0.s
rename to asm/db/db.s
index 11251bce..2292ad71 100644
--- a/asm/db/db_8002bab0.s
+++ b/asm/db/db.s
@@ -13,3 +13,9 @@ lbl_8002BAC4:
 /* 8002BAC4 00027904  80 63 00 00 */	lwz r3, 0x0(r3)
 /* 8002BAC8 00027908  4E 80 00 20 */	blr
 /* 8002BACC 0002790C  00 00 00 00 */	.4byte 0x00000000
+.include "macros.inc"
+
+.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
+.global __DBInterface
+__DBInterface:
+	.skip 0x8
diff --git a/asm/db/db_8055c8f8.s b/asm/db/db_8055c8f8.s
deleted file mode 100644
index bbe7c946..00000000
--- a/asm/db/db_8055c8f8.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macros.inc"
-
-.section .sbss, "", @nobits  # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
-.global __DBInterface
-__DBInterface:
-	.skip 0x8
diff --git a/obj_files.mk b/obj_files.mk
index ebfee3e0..8ea1be45 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -152,9 +152,10 @@ $(BUILD_DIR)/asm/exi/EXICommon.o \
 $(BUILD_DIR)/asm/si/SIBios.o \
 $(BUILD_DIR)/asm/si/SISamplingRate.o \
 \
+$(BUILD_DIR)/asm/db/db.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/db/db_8002bab0.o \
 $(BUILD_DIR)/asm/vi/vi_8002bad0.o \
 $(BUILD_DIR)/asm/vi/i2c_8002e490.o \
 $(BUILD_DIR)/asm/vi/vi3in1_8002edb0.o \
@@ -5636,7 +5637,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/db/db_8055c8f8.o \
 $(BUILD_DIR)/asm/vi/vi_8055c900.o \
 $(BUILD_DIR)/asm/vi/i2c_8055c9b0.o \
 $(BUILD_DIR)/asm/vi/vi3in1_8055c9b8.o \