From 6f30a28cb32a408edea1eda5799f33f2966f8211 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 08:59:44 +0100
Subject: [PATCH] merge base

---
 asm/base/{PPCArch_8001a0b0.s => PPCArch.s} | 20 ++++++++++++++++++++
 asm/base/PPCArch_80421da0.s                | 20 --------------------
 obj_files.mk                               |  4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)
 rename asm/base/{PPCArch_8001a0b0.s => PPCArch.s} (95%)
 delete mode 100644 asm/base/PPCArch_80421da0.s

diff --git a/asm/base/PPCArch_8001a0b0.s b/asm/base/PPCArch.s
similarity index 95%
rename from asm/base/PPCArch_8001a0b0.s
rename to asm/base/PPCArch.s
index 52963c20..c945f257 100644
--- a/asm/base/PPCArch_8001a0b0.s
+++ b/asm/base/PPCArch.s
@@ -185,3 +185,23 @@ lbl_8001A2AC:
 /* 8001A2B4 000160F4  7C 08 03 A6 */	mtlr r0
 /* 8001A2B8 000160F8  38 21 00 10 */	addi r1, r1, 0x10
 /* 8001A2BC 000160FC  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
+.global "@2249"
+"@2249":
+
+	.4byte 0x48344120
+	.4byte 0x73686F75
+	.4byte 0x6C64206E
+	.4byte 0x6F742062
+	.4byte 0x6520636C
+	.4byte 0x65617265
+	.4byte 0x64206265
+	.4byte 0x63617573
+	.4byte 0x65206F66
+	.4byte 0x2042726F
+	.4byte 0x61647761
+	.4byte 0x79206572
+	.4byte 0x72617461
+	.4byte 0x2E0A0000
diff --git a/asm/base/PPCArch_80421da0.s b/asm/base/PPCArch_80421da0.s
deleted file mode 100644
index fea1efa4..00000000
--- a/asm/base/PPCArch_80421da0.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.include "macros.inc"
-
-.section .data, "wa"  # 0x80421040 - 0x80496700 ; 0x000756C0
-.global "@2249"
-"@2249":
-
-	.4byte 0x48344120
-	.4byte 0x73686F75
-	.4byte 0x6C64206E
-	.4byte 0x6F742062
-	.4byte 0x6520636C
-	.4byte 0x65617265
-	.4byte 0x64206265
-	.4byte 0x63617573
-	.4byte 0x65206F66
-	.4byte 0x2042726F
-	.4byte 0x61647761
-	.4byte 0x79206572
-	.4byte 0x72617461
-	.4byte 0x2E0A0000
diff --git a/obj_files.mk b/obj_files.mk
index b7a56e1d..829cd3d7 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -107,11 +107,12 @@ $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/mslsupp.o \
 $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/targimpl.o \
 $(BUILD_DIR)/asm/TRK_Hollywood_Revolution/target_options.o \
 \
+$(BUILD_DIR)/asm/base/PPCArch.o \
+\
 $(BUILD_DIR)/asm/os/__start_800062c0.o \
 $(BUILD_DIR)/asm/os/__ppc_eabi_init_80006620.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/base/PPCArch_8001a0b0.o \
 $(BUILD_DIR)/asm/os/OS_8001a2c0.o \
 $(BUILD_DIR)/asm/os/OSAlarm_8001b7a0.o \
 $(BUILD_DIR)/asm/os/OSAlloc_8001c050.o \
@@ -3218,7 +3219,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/base/PPCArch_80421da0.o \
 $(BUILD_DIR)/asm/os/OS_80421dd8.o \
 $(BUILD_DIR)/asm/os/OSAlarm_804221e8.o \
 $(BUILD_DIR)/asm/os/OSAudioSystem_804221f8.o \