6 files changed, 218 insertions, 8 deletions
diff --git a/data/maps/Route115/border.bin b/data/maps/Route115/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route115/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp
-\ No newline at end of file
diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc
index 3f283eb91..4518e31fa 100644
--- a/data/maps/Route115/connections.inc
+++ b/data/maps/Route115/connections.inc
@@ -1,6 +1,6 @@
 Route115_MapConnectionsList: @ 8486A14
-	connection down, 0, RUSTBORO_CITY, 0
-	connection right, -40, ROUTE_114, 0
+	connection down, 0, MAP_RUSTBORO_CITY
+	connection right, -40, MAP_ROUTE114
 
 Route115_MapConnections: @ 8486A2C
 	.4byte 0x2
diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc
new file mode 100644
index 000000000..36888bd7a
--- /dev/null
+++ b/data/maps/Route115/events.inc
@@ -0,0 +1,49 @@
+Route115_EventObjects: @ 852A1BC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, BerryTreeScript, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, BerryTreeScript, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, BerryTreeScript, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0
+	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, 1017
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, 1018
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, 17
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, 1118
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0
+	object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0
+	object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0
+	object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, 1161
+	object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, 1144
+
+Route115_MapWarps: @ 852A3E4
+	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
+	warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+	warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+
+Route115_MapBGEvents: @ 852A3FC
+	bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2
+	bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2
+	bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C
+	bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F2985
+	bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3
+	bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2
+	bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2
+	bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3
+	bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3
+	bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4
+	bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3
+	bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3
+	bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1
+	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, 97
+
+Route115_MapEvents:: @ 852A4A4
+	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
+
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
index 4d135e0b6..5da7c8990 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -1,15 +1,15 @@
 Route115: @ 8482800
-	.4byte Route115_MapAttributes
+	.4byte Route115_Layout
 	.4byte Route115_MapEvents
 	.4byte Route115_MapScripts
 	.4byte Route115_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 31
-	.byte 30
+	.byte MAPSEC_ROUTE_115
 	.byte 0
-	.byte 2
-	.byte 3
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_ROUTE
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/Route115/map.bin b/data/maps/Route115/map.bin
deleted file mode 100644
index 64a58e691..000000000
--- a/data/maps/Route115/map.bin
+++ /dev/null
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
new file mode 100644
index 000000000..967f2f9ce
--- /dev/null
+++ b/data/maps/Route115/scripts.inc
@@ -0,0 +1,162 @@
+Route115_MapScripts:: @ 81F2920
+	map_script 1, Route115_MapScript1_1F2930
+	map_script 3, Route115_MapScript1_1F2947
+	map_script 2, Route115_MapScript2_1F2969
+	.byte 0
+
+Route115_MapScript1_1F2930: @ 81F2930
+	compare VAR_0x4037, 3
+	call_if 1, Route115_EventScript_273939
+	compare VAR_0x4037, 4
+	call_if 1, Route115_EventScript_27394C
+	end
+
+Route115_MapScript1_1F2947: @ 81F2947
+	compare VAR_0x4039, 1
+	call_if 1, Route115_EventScript_273D13
+	compare VAR_0x4037, 3
+	call_if 1, Route115_EventScript_273D1B
+	compare VAR_0x4037, 4
+	call_if 1, Route115_EventScript_273D1B
+	end
+
+Route115_MapScript2_1F2969: @ 81F2969
+	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	.2byte 0
+
+Route115_EventScript_1F2973:: @ 81F2973
+	msgbox Route115_Text_1F2B55, 2
+	end
+
+Route115_EventScript_1F297C:: @ 81F297C
+	msgbox Route115_Text_1F2BC9, 3
+	end
+
+Route115_EventScript_1F2985:: @ 81F2985
+	msgbox Route115_Text_1F2BE3, 3
+	end
+
+Route115_EventScript_1F298E:: @ 81F298E
+	trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route115_EventScript_1F29D9
+	msgbox Route115_Text_29B258, 4
+	release
+	end
+
+Route115_EventScript_1F29BA:: @ 81F29BA
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route115_Text_29B2B3, 4
+	setvar VAR_0x8004, 307
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 307
+	callstd 8
+	release
+	end
+
+Route115_EventScript_1F29D9:: @ 81F29D9
+	trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372
+	msgbox Route115_Text_29B385, 6
+	end
+
+Route115_EventScript_1F29F0:: @ 81F29F0
+	trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED
+	msgbox Route115_Text_29B3FF, 6
+	end
+
+Route115_EventScript_1F2A07:: @ 81F2A07
+	trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route115_EventScript_1F2A52
+	msgbox Route115_Text_29B49D, 4
+	release
+	end
+
+Route115_EventScript_1F2A33:: @ 81F2A33
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route115_Text_29B50B, 4
+	setvar VAR_0x8004, 183
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 183
+	callstd 8
+	release
+	end
+
+Route115_EventScript_1F2A52:: @ 81F2A52
+	trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D
+	msgbox Route115_Text_29B5B5, 6
+	end
+
+Route115_EventScript_1F2A69:: @ 81F2A69
+	trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route115_EventScript_1F2AB4
+	msgbox Route115_Text_29B647, 4
+	release
+	end
+
+Route115_EventScript_1F2A95:: @ 81F2A95
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route115_Text_29B6AB, 4
+	setvar VAR_0x8004, 427
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 427
+	callstd 8
+	release
+	end
+
+Route115_EventScript_1F2AB4:: @ 81F2AB4
+	trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A
+	msgbox Route115_Text_29B737, 6
+	end
+
+Route115_EventScript_1F2ACB:: @ 81F2ACB
+	trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5
+	msgbox Route115_Text_29B7EA, 6
+	end
+
+Route115_EventScript_1F2AE2:: @ 81F2AE2
+	trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D
+	msgbox Route115_Text_29B869, 6
+	end
+
+Route115_EventScript_1F2AF9:: @ 81F2AF9
+	trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8
+	msgbox Route115_Text_29B904, 6
+	end
+
+Route115_EventScript_1F2B10:: @ 81F2B10
+	trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6
+	msgbox Route115_Text_29BA04, 6
+	end
+
+Route115_EventScript_1F2B27:: @ 81F2B27
+	trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958
+	msgbox Route115_Text_29B971, 6
+	end
+
+Route115_EventScript_1F2B3E:: @ 81F2B3E
+	trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67
+	msgbox Route115_Text_29BA87, 6
+	end
+
+Route115_Text_1F2B55: @ 81F2B55
+	.string "Exploring a cave isn’t like walking\n"
+	.string "on a road.\p"
+	.string "You never know when wild POKéMON will\n"
+	.string "appear. It’s full of suspense.$"
+
+Route115_Text_1F2BC9: @ 81F2BC9
+	.string "ROUTE 115\n"
+	.string "{DOWN_ARROW} RUSTBORO CITY$"
+
+Route115_Text_1F2BE3: @ 81F2BE3
+	.string "METEOR FALLS\n"
+	.string "FALLARBOR TOWN THROUGH HERE$"
+