merge with battle tent update

5 files changed, 126 insertions, 12 deletions

diff --git a/data/maps/UnionRoom/border.bin b/data/maps/UnionRoom/border.bin
deleted file mode 100644
index f496f458e..000000000
--- a/data/maps/UnionRoom/border.bin
+++ /dev/null
diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc
new file mode 100644
index 000000000..1a50ea7d8
--- /dev/null
+++ b/data/maps/UnionRoom/events.inc
@@ -0,0 +1,18 @@
+UnionRoom_EventObjects: @ 853B020
+	object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0
+	object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 1, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D204, 706
+	object_event 3, 247, 0, 7, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, 710
+	object_event 4, 246, 0, 1, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D222, 709
+	object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 7, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D218, 708
+	object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 13, 4, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, 707
+	object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 10, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, 705
+	object_event 8, EVENT_OBJ_GFX_TRADER, 0, 13, 8, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, 704
+	object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 4, 6, 3, 2, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, 703
+
+UnionRoom_MapWarps: @ 853B0F8
+	warp_def 7, 11, 3, 127, MAP_NONE
+	warp_def 8, 11, 3, 127, MAP_NONE
+
+UnionRoom_MapEvents:: @ 853B108
+	map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc
index d0b38c071..b79ae81a2 100644
--- a/data/maps/UnionRoom/header.inc
+++ b/data/maps/UnionRoom/header.inc
@@ -1,5 +1,5 @@
 UnionRoom: @ 8485120
-	.4byte UnionRoom_MapAttributes
+	.4byte UnionRoom_Layout
 	.4byte UnionRoom_MapEvents
 	.4byte UnionRoom_MapScripts
 	.4byte 0x0
diff --git a/data/maps/UnionRoom/map.bin b/data/maps/UnionRoom/map.bin
deleted file mode 100644
index cb1b009c3..000000000
--- a/data/maps/UnionRoom/map.bin
+++ /dev/null
@@ -1,11 +0,0 @@
-
(	#
-
-
-
-
-
-
-
-
-
-0222222222222222222222222222222222222222222222222222222222222222222222222222222222 2!2"2222222222222222222222222222222222222
222222222222222





222






\ No newline at end of file
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
new file mode 100644
index 000000000..250b4b402
--- /dev/null
+++ b/data/maps/UnionRoom/scripts.inc
@@ -0,0 +1,107 @@
+UnionRoom_MapScripts:: @ 823D1A6
+	map_script 5, UnionRoom_MapScript1_23D1B1
+	map_script 3, UnionRoom_MapScript1_23D1E5
+	.byte 0
+
+UnionRoom_MapScript1_23D1B1: @ 823D1B1
+	setflag FLAG_0x2BF
+	setflag FLAG_0x2C0
+	setflag FLAG_0x2C1
+	setflag FLAG_0x2C2
+	setflag FLAG_0x2C3
+	setflag FLAG_0x2C4
+	setflag FLAG_0x2C5
+	setflag FLAG_0x2C6
+	removeobject 9
+	removeobject 8
+	removeobject 7
+	removeobject 2
+	removeobject 6
+	removeobject 5
+	removeobject 4
+	removeobject 3
+	special UnionRoomSpecial
+	end
+
+UnionRoom_MapScript1_23D1E5: @ 823D1E5
+	end
+
+UnionRoom_EventScript_23D1E6:: @ 823D1E6
+	lock
+	faceplayer
+	setvar VAR_RESULT, 1
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D1F0:: @ 823D1F0
+	lock
+	faceplayer
+	setvar VAR_RESULT, 2
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D1FA:: @ 823D1FA
+	lock
+	faceplayer
+	setvar VAR_RESULT, 3
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D204:: @ 823D204
+	lock
+	faceplayer
+	setvar VAR_RESULT, 4
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D20E:: @ 823D20E
+	lock
+	faceplayer
+	setvar VAR_RESULT, 5
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D218:: @ 823D218
+	lock
+	faceplayer
+	setvar VAR_RESULT, 6
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D222:: @ 823D222
+	lock
+	faceplayer
+	setvar VAR_RESULT, 7
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D22C:: @ 823D22C
+	lock
+	faceplayer
+	setvar VAR_RESULT, 8
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D236:: @ 823D236
+	lock
+	faceplayer
+	setvar VAR_RESULT, 9
+	waitstate
+	release
+	end
+
+UnionRoom_EventScript_23D240:: @ 823D240
+	lockall
+	setvar VAR_RESULT, 10
+	waitstate
+	releaseall
+	end
+