merge with battle tent update

5 files changed, 34 insertions, 3 deletions

diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/maps/OldaleTown_PokemonCenter_2F/border.bin
deleted file mode 100644
index 19d906679..000000000
--- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-




\ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..b25b155ea
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0
+	object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, 8, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702
+
+OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930
+	warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_UNION_ROOM
+	warp_def 9, 1, 3, 0, MAP_TRADE_CENTER
+
+OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948
+	map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
index 798a5f72b..9b9df67fd 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -1,5 +1,5 @@
 OldaleTown_PokemonCenter_2F: @ 8482BD4
-	.4byte OldaleTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte OldaleTown_PokemonCenter_2F_MapEvents
 	.4byte OldaleTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/maps/OldaleTown_PokemonCenter_2F/map.bin
deleted file mode 100644
index c623d86fc..000000000
--- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-?\?\?Gd6Gd6GØÙÙ¦Ï2ÍÏO2ÍÏOb2Öàà×]Õ×Û]Õ×Ú/2 2l2l2¶2a2¿2l2ã<¿2l2â/2˜2™222Ê2Ë2Ì22g2È2É22g2D ¡B2Ò2Ó2Ô222Ð2Ñ222'2¨2©222222222222'2 22222^2^222^2^222'2(622422ff42&2ff&24276
\ No newline at end of file
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
new file mode 100644
index 000000000..788157beb
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
@@ -0,0 +1,19 @@
+OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
+	map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_276C3B
+	map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_276B6C
+	map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_276BBE
+	map_script 3, OldaleTown_PokemonCenter_2F_MapScript1_276ACF
+	.byte 0
+
+OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D
+	call OldaleTown_PokemonCenter_2F_EventScript_276EB7
+	end
+
+OldaleTown_PokemonCenter_2F_EventScript_1FC233:: @ 81FC233
+	call OldaleTown_PokemonCenter_2F_EventScript_2770B2
+	end
+
+OldaleTown_PokemonCenter_2F_EventScript_1FC239:: @ 81FC239
+	call OldaleTown_PokemonCenter_2F_EventScript_2771DB
+	end
+