From 805640ca5deeb844b1a33be0af856518fb1b454c 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:43:11 +0100
Subject: [PATCH] merge esp

---
 asm/esp/{esp_800a2020.s => esp.s} | 14 ++++++++++++++
 asm/esp/esp_80556948.s            | 14 --------------
 obj_files.mk                      |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename asm/esp/{esp_800a2020.s => esp.s} (99%)
 delete mode 100644 asm/esp/esp_80556948.s

diff --git a/asm/esp/esp_800a2020.s b/asm/esp/esp.s
similarity index 99%
rename from asm/esp/esp_800a2020.s
rename to asm/esp/esp.s
index 06083b4a..54f89a2a 100644
--- a/asm/esp/esp_800a2020.s
+++ b/asm/esp/esp.s
@@ -483,3 +483,17 @@ lbl_800A2628:
 /* 800A2634 0009E474  7C 08 03 A6 */	mtlr r0
 /* 800A2638 0009E478  7D 41 53 78 */	mr r1, r10
 /* 800A263C 0009E47C  4E 80 00 20 */	blr
+.include "macros.inc"
+
+.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
+.global __esFd
+__esFd:
+
+	.4byte 0xFFFFFFFF
+	.4byte 0
+
+.global "@1766_80556950"
+"@1766_80556950":
+
+	.4byte 0x2F646576
+	.4byte 0x2F657300
diff --git a/asm/esp/esp_80556948.s b/asm/esp/esp_80556948.s
deleted file mode 100644
index ee1005e9..00000000
--- a/asm/esp/esp_80556948.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macros.inc"
-
-.section .sdata, "wa"  # 0x80556420 - 0x8055C6E0 ; 0x000062C0
-.global __esFd
-__esFd:
-
-	.4byte 0xFFFFFFFF
-	.4byte 0
-
-.global "@1766_80556950"
-"@1766_80556950":
-
-	.4byte 0x2F646576
-	.4byte 0x2F657300
diff --git a/obj_files.mk b/obj_files.mk
index 6209e77c..c187c071 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -328,9 +328,10 @@ $(BUILD_DIR)/asm/bte/sdp_utils.o \
 \
 $(BUILD_DIR)/asm/tpl/TPL.o \
 \
+$(BUILD_DIR)/asm/esp/esp.o \
+\
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
 $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
-$(BUILD_DIR)/asm/esp/esp_800a2020.o \
 $(BUILD_DIR)/asm/mem/mem_heapCommon_800a2640.o \
 $(BUILD_DIR)/asm/mem/mem_expHeap_800a2ab0.o \
 $(BUILD_DIR)/asm/mem/mem_frameHeap_800a32e0.o \
@@ -5062,7 +5063,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/esp/esp_80556948.o \
 $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_80556958.o \
 $(BUILD_DIR)/asm/libnw4r_ef/ef_util_80556960.o \
 $(BUILD_DIR)/asm/libnw4r_ef/ef_drawbillboardstrategy_80556980.o \