6 files changed, 135 insertions, 9 deletions
diff --git a/data/maps/Route105/border.bin b/data/maps/Route105/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route105/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppp
-\ No newline at end of file
diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc
index 44357db1e..ac03944b7 100644
--- a/data/maps/Route105/connections.inc
+++ b/data/maps/Route105/connections.inc
@@ -1,7 +1,7 @@
 Route105_MapConnectionsList: @ 8486898
-	connection up, 0, ROUTE_104, 0
-	connection down, 0, ROUTE_106, 0
-	connection dive, 0, UNDERWATER_6, 0
+	connection up, 0, MAP_ROUTE104
+	connection down, 0, MAP_ROUTE106
+	connection dive, 0, MAP_UNDERWATER6
 
 Route105_MapConnections: @ 84868BC
 	.4byte 0x3
diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc
new file mode 100644
index 000000000..aa9b9b420
--- /dev/null
+++ b/data/maps/Route105/events.inc
@@ -0,0 +1,20 @@
+Route105_EventObjects: @ 85286F0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, 1003
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0
+	object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0
+
+Route105_MapWarps: @ 85287B0
+	warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
+
+Route105_MapBGEvents: @ 85287B8
+	bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, 89
+	bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, 111
+
+Route105_MapEvents:: @ 85287D0
+	map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
+
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
index de48be1a5..59ea4f3df 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -1,15 +1,15 @@
 Route105: @ 84826E8
-	.4byte Route105_MapAttributes
+	.4byte Route105_Layout
 	.4byte Route105_MapEvents
 	.4byte Route105_MapScripts
 	.4byte Route105_MapConnections
 	.2byte MUS_NEXTROAD
 	.2byte 21
-	.byte 20
+	.byte MAPSEC_ROUTE_105
 	.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/Route105/map.bin b/data/maps/Route105/map.bin
deleted file mode 100644
index c4bd8286c..000000000
--- a/data/maps/Route105/map.bin
+++ /dev/null
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
new file mode 100644
index 000000000..3cb6d9ae6
--- /dev/null
+++ b/data/maps/Route105/scripts.inc
@@ -0,0 +1,107 @@
+Route105_MapScripts:: @ 81EE1DB
+	map_script 1, Route105_MapScript1_1EE1EB
+	map_script 3, Route105_MapScript1_1EE21E
+	map_script 2, Route105_MapScript2_1EE240
+	.byte 0
+
+Route105_MapScript1_1EE1EB: @ 81EE1EB
+	checkflag FLAG_0x0E4
+	call_if 0, Route105_EventScript_1EE20B
+	compare VAR_0x4037, 9
+	call_if 1, Route105_EventScript_2739AB
+	compare VAR_0x4037, 10
+	call_if 1, Route105_EventScript_273A18
+	end
+
+Route105_EventScript_1EE20B:: @ 81EE20B
+	setmetatile 9, 19, 124, 1
+	setmetatile 9, 20, 145, 1
+	return
+
+Route105_MapScript1_1EE21E: @ 81EE21E
+	compare VAR_0x4039, 1
+	call_if 1, Route105_EventScript_273D13
+	compare VAR_0x4037, 9
+	call_if 1, Route105_EventScript_273D17
+	compare VAR_0x4037, 10
+	call_if 1, Route105_EventScript_273D17
+	end
+
+Route105_MapScript2_1EE240: @ 81EE240
+	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	.2byte 0
+
+Route105_EventScript_1EE24A:: @ 81EE24A
+	trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62
+	msgbox Route105_Text_295DAB, 6
+	end
+
+Route105_EventScript_1EE261:: @ 81EE261
+	trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66
+	msgbox Route105_Text_295E72, 6
+	end
+
+Route105_EventScript_1EE278:: @ 81EE278
+	trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA
+	msgbox Route105_Text_295F08, 6
+	end
+
+Route105_EventScript_1EE28F:: @ 81EE28F
+	trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0
+	msgbox Route105_Text_295FAE, 6
+	end
+
+Route105_EventScript_1EE2A6:: @ 81EE2A6
+	trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059
+	msgbox Route105_Text_296076, 6
+	end
+
+Route105_EventScript_1EE2BD:: @ 81EE2BD
+	trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB
+	msgbox Route105_Text_2962EC, 6
+	end
+
+Route105_EventScript_1EE2D4:: @ 81EE2D4
+	trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route105_EventScript_1EE31F
+	msgbox Route105_Text_2960FA, 4
+	release
+	end
+
+Route105_EventScript_1EE300:: @ 81EE300
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route105_Text_296159, 4
+	setvar VAR_0x8004, 737
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 737
+	callstd 8
+	release
+	end
+
+Route105_EventScript_1EE31F:: @ 81EE31F
+	trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD
+	msgbox Route105_Text_2961FE, 6
+	end
+
+Route104_Text_1EE336: @ 81EE336
+	.string "… … … … … …\n"
+	.string "… … … … … Beep!\p"
+	.string "DAD: Oh, {PLAYER}?\p"
+	.string "… … … … … …\n"
+	.string "Where are you now?\l"
+	.string "It sounds windy wherever you are.\p"
+	.string "I just heard from DEVON’s MR. STONE\n"
+	.string "about your POKéNAV, so I decided\l"
+	.string "to give you a call.\p"
+	.string "It sounds like you’re doing fine,\n"
+	.string "so that’s fine with me.\p"
+	.string "You take care now.\p"
+	.string "… … … … … …\n"
+	.string "… … … … … Click!$"
+
+Route104_Text_1EE463: @ 81EE463
+	.string "Registered DAD NORMAN\n"
+	.string "in the POKéNAV.$"