From 12d12e70a170896844f3280d6968e1e2d6cf1cba Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 22 Jan 2020 15:46:48 -0500
Subject: union_room_battle

---
 data/strings.s           |  6 +++---
 data/union_room_battle.s | 23 -----------------------
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 data/union_room_battle.s

(limited to 'data')

diff --git a/data/strings.s b/data/strings.s
index d25e28e94..e77730429 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -4598,14 +4598,14 @@ gText_WhichMoveShouldBeForgotten:: @ 841E50C
 gUnknown_841E52D:: @ 0x841E52D
 	.string "----------$"
 
-gUnknown_841E538:: @ 841E538
+gText_CommStandbyAwaitingOtherPlayer:: @ 841E538
 	.string "Communication standby‥\n"
 	.string "Awaiting another player to choose.$"
 
-gUnknown_841E572:: @ 841E572
+gText_BattleWasRefused:: @ 841E572
 	.string "The battle was refused.{PAUSE 0x3C}$"
 
-gUnknown_841E58D:: @ 841E58D
+gText_RefusedBattle:: @ 841E58D
 	.string "Refused the battle.{PAUSE 0x3C}$"
 
 gFameCheckerText_MainScreenUI:: @ 841E5A4
diff --git a/data/union_room_battle.s b/data/union_room_battle.s
deleted file mode 100644
index d7fff5e96..000000000
--- a/data/union_room_battle.s
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "constants/region_map.h"
-#include "constants/flags.h"
-#include "constants/moves.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2
-
-	.align 2
-gUnknown_8457194:: @ 8457194
-	.2byte 0x01FC, 0x0000 @ BgTemplate
-
-	.align 2
-gUnknown_8457198:: @ 8457198
-	.byte 0x00, 0x02, 0x0F, 0x1A, 0x04, 0x0E @ window template
-	.2byte 0x0014
-
-	.byte 0xFF, 0, 0, 0, 0, 0
-	.2byte 0x0000
-
-	.align 2
-gUnknown_84571A8:: @ 84571A8
-	.byte 0x01, 0x02, 0x03, 0x00
-- 
cgit v1.2.3