From 08f4d3e105a77531c3d817b16d0797b2be885f7f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 1 Apr 2019 14:41:37 -0400
Subject: Rename these objects to union_room_battle

---
 data/union_room_801A3F4.s | 64 -----------------------------------------------
 data/union_room_battle.s  | 64 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100755 data/union_room_801A3F4.s
 create mode 100755 data/union_room_battle.s

(limited to 'data')

diff --git a/data/union_room_801A3F4.s b/data/union_room_801A3F4.s
deleted file mode 100755
index 65e8d4229..000000000
--- a/data/union_room_801A3F4.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gWirelessInfoScreenPal:: @ 82F0790
-	.incbin "graphics/interface/wireless_info_screen.gbapal"
-
-	.align 2
-gWirelessInfoScreenGfx:: @ 82F0990
-	.incbin "graphics/interface/wireless_info_screen.4bpp.lz"
-
-	.align 2
-gWirelessInfoScreenTilemap:: @ 82F0BA0
-	.incbin "graphics/interface/wireless_info_screen.bin.lz"
-
-	.align 2
-gUnknown_082F0D34:: @ 82F0D34
-	.4byte 0x000001f8
-    .4byte 0x00001081
-
-	.align 2
-gUnknown_082F0D3C:: @ 82F0D3C
-	window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001
-	window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049
-	window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184
-	null_window_template
-
-	.align 2
-gUnknown_082F0D5C:: @ 82F0D5C
-	.4byte gText_WirelessCommStatus
-	.4byte gText_PeopleTrading
-	.4byte gText_PeopleBattling
-	.4byte gText_PeopleInUnionRoom
-	.4byte gText_PeopleCommunicating
-
-	.align 2
-gUnknown_082F0D70:: @ 82F0D70
-	.byte 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x03, 0x01
-	.byte 0x04, 0x04, 0x00, 0x02, 0x06, 0x03, 0x02, 0x07
-	.byte 0x03, 0x02, 0x09, 0x03, 0x00, 0x0a, 0x03, 0x00
-	.byte 0x0b, 0x03, 0x00, 0x0c, 0xff, 0x00, 0x0d, 0x00
-	.byte 0x00, 0x10, 0x03, 0x00, 0x0f, 0x03, 0x00, 0x40
-	.byte 0x02, 0x01, 0x41, 0x02, 0x02, 0x44, 0x02, 0x02
-	.byte 0x45, 0x02, 0x00, 0x48, 0x02, 0x02, 0x54, 0x02
-	.byte 0x01, 0x53, 0x02, 0x02, 0x51, 0x02, 0x01, 0x52
-	.byte 0x02, 0x01, 0x15, 0x03, 0x02, 0x16, 0x03, 0x02
-	.byte 0x17, 0x03, 0x00, 0x18, 0x03, 0x00, 0x19, 0x03
-	.byte 0x00, 0x1a, 0x03, 0x00, 0x1b, 0x03, 0x00, 0x1c
-	.byte 0x01, 0x02, 0x0e, 0x01, 0x02, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_082F0DD0:: @ 82F0DD0
-	.4byte 0x000001FC
-
-	.align 2
-gUnknown_082F0DD4:: @ 82F0DD4
-	window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014
-	null_window_template
-
-	.align 2
-gUnknown_082F0DE4:: @ 82F0DE4
-	.byte 0x01, 0x02, 0x03
diff --git a/data/union_room_battle.s b/data/union_room_battle.s
new file mode 100755
index 000000000..65e8d4229
--- /dev/null
+++ b/data/union_room_battle.s
@@ -0,0 +1,64 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gWirelessInfoScreenPal:: @ 82F0790
+	.incbin "graphics/interface/wireless_info_screen.gbapal"
+
+	.align 2
+gWirelessInfoScreenGfx:: @ 82F0990
+	.incbin "graphics/interface/wireless_info_screen.4bpp.lz"
+
+	.align 2
+gWirelessInfoScreenTilemap:: @ 82F0BA0
+	.incbin "graphics/interface/wireless_info_screen.bin.lz"
+
+	.align 2
+gUnknown_082F0D34:: @ 82F0D34
+	.4byte 0x000001f8
+    .4byte 0x00001081
+
+	.align 2
+gUnknown_082F0D3C:: @ 82F0D3C
+	window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001
+	window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049
+	window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184
+	null_window_template
+
+	.align 2
+gUnknown_082F0D5C:: @ 82F0D5C
+	.4byte gText_WirelessCommStatus
+	.4byte gText_PeopleTrading
+	.4byte gText_PeopleBattling
+	.4byte gText_PeopleInUnionRoom
+	.4byte gText_PeopleCommunicating
+
+	.align 2
+gUnknown_082F0D70:: @ 82F0D70
+	.byte 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x03, 0x01
+	.byte 0x04, 0x04, 0x00, 0x02, 0x06, 0x03, 0x02, 0x07
+	.byte 0x03, 0x02, 0x09, 0x03, 0x00, 0x0a, 0x03, 0x00
+	.byte 0x0b, 0x03, 0x00, 0x0c, 0xff, 0x00, 0x0d, 0x00
+	.byte 0x00, 0x10, 0x03, 0x00, 0x0f, 0x03, 0x00, 0x40
+	.byte 0x02, 0x01, 0x41, 0x02, 0x02, 0x44, 0x02, 0x02
+	.byte 0x45, 0x02, 0x00, 0x48, 0x02, 0x02, 0x54, 0x02
+	.byte 0x01, 0x53, 0x02, 0x02, 0x51, 0x02, 0x01, 0x52
+	.byte 0x02, 0x01, 0x15, 0x03, 0x02, 0x16, 0x03, 0x02
+	.byte 0x17, 0x03, 0x00, 0x18, 0x03, 0x00, 0x19, 0x03
+	.byte 0x00, 0x1a, 0x03, 0x00, 0x1b, 0x03, 0x00, 0x1c
+	.byte 0x01, 0x02, 0x0e, 0x01, 0x02, 0x00, 0x00, 0x00
+
+	.align 2
+gUnknown_082F0DD0:: @ 82F0DD0
+	.4byte 0x000001FC
+
+	.align 2
+gUnknown_082F0DD4:: @ 82F0DD4
+	window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014
+	null_window_template
+
+	.align 2
+gUnknown_082F0DE4:: @ 82F0DE4
+	.byte 0x01, 0x02, 0x03
-- 
cgit v1.2.3