6 files changed, 129 insertions, 9 deletions

diff --git a/data/maps/FallarborTown/border.bin b/data/maps/FallarborTown/border.bin
deleted file mode 100644
index 23e2a92e5..000000000
--- a/data/maps/FallarborTown/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-klst
\ No newline at end of file
diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc
index 27b654f90..3808099d8 100644
--- a/data/maps/FallarborTown/connections.inc
+++ b/data/maps/FallarborTown/connections.inc
@@ -1,6 +1,6 @@
 FallarborTown_MapConnectionsList: @ 8486674
-	connection left, 0, ROUTE_114, 0
-	connection right, 0, ROUTE_113, 0
+	connection left, 0, MAP_ROUTE114
+	connection right, 0, MAP_ROUTE113
 
 FallarborTown_MapConnections: @ 848668C
 	.4byte 0x2
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc
new file mode 100644
index 000000000..fae6f714e
--- /dev/null
+++ b/data/maps/FallarborTown/events.inc
@@ -0,0 +1,26 @@
+FallarborTown_EventObjects: @ 8527BE0
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0
+	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907
+
+FallarborTown_MapWarps: @ 8527C40
+	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
+	warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY
+	warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
+	warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1
+	warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2
+
+FallarborTown_MapBGEvents: @ 8527C68
+	bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
+	bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73
+	bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250
+	bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73
+	bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259
+	bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A
+	bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262
+	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, 28
+
+FallarborTown_MapEvents:: @ 8527CC8
+	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
+
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index a6ea87c04..0c2053b8b 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -1,15 +1,15 @@
 FallarborTown: @ 8482624
-	.4byte FallarborTown_MapAttributes
+	.4byte FallarborTown_Layout
 	.4byte FallarborTown_MapEvents
 	.4byte FallarborTown_MapScripts
 	.4byte FallarborTown_MapConnections
 	.2byte MUS_TONEKUSA
 	.2byte 14
-	.byte 4
+	.byte MAPSEC_FALLARBOR_TOWN
 	.byte 0
-	.byte 2
-	.byte 1
+	.byte WEATHER_SUNNY
+	.byte MAP_TYPE_TOWN
 	.2byte 0
 	.byte 13
-	.byte 0
+	.byte MAP_BATTLE_SCENE_NORMAL
 
diff --git a/data/maps/FallarborTown/map.bin b/data/maps/FallarborTown/map.bin
deleted file mode 100644
index 950a54761..000000000
--- a/data/maps/FallarborTown/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-yyyyyiiiiiiiiiiiiijiiiiiiiiiiiijziiiiij"##$��JKLMNjziiiiijz�����6�6RSTUVzi����jzi�����2y2Z[\]^q2q2PQRSzii����y2#6bcdef#6y2XYZ[q2q2q2y2y2y2y2#6jklmn#6y2�ab�y2y2�2�2y2y2y2y2y2�2�2�2y2y2y2y2�2�2y2y2y2y2y2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2y2y2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2�2y2y2�2�2�2�2y2y2y2y2y2�2�2y2y2�2�2�2�2y2y2y2y2y2y2y2y2y2y2y2y2�2�2y2�2�2�2�2y2y2y2y2y2y2y2y2y2 3!3y2y2�2�2y20123y2�2y2%3&3'3y2}2~2(3)3y2y2�2�2y289:;22y2-3.3/3y2����y2�2�2�2y2�AB�6t6y2536373y2����y2y2�2�2�2�2�2y2�22l2y2y2y2y2����y2y2�2�2�2�2�2y22s6t6k222�2y2y2y2y2y2y2y2y2y2222l6kllklk2222222222st6sts6t6
\ No newline at end of file
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
new file mode 100644
index 000000000..21cea72e1
--- /dev/null
+++ b/data/maps/FallarborTown/scripts.inc
@@ -0,0 +1,96 @@
+FallarborTown_MapScripts:: @ 81EB1FA
+	map_script 3, FallarborTown_MapScript1_1EB200
+	.byte 0
+
+FallarborTown_MapScript1_1EB200: @ 81EB200
+	setflag FLAG_VISITED_FALLARBOR_TOWN
+	setvar VAR_0x4086, 0
+	clearflag FLAG_0x10E
+	end
+
+FallarborTown_EventScript_1EB20C:: @ 81EB20C
+	lock
+	faceplayer
+	checkflag FLAG_0x08B
+	goto_eq FallarborTown_EventScript_1EB221
+	msgbox FallarborTown_Text_1EB26B, 4
+	release
+	end
+
+FallarborTown_EventScript_1EB221:: @ 81EB221
+	msgbox FallarborTown_Text_1EB2DE, 4
+	release
+	end
+
+FallarborTown_EventScript_1EB22B:: @ 81EB22B
+	msgbox FallarborTown_Text_1EB35F, 2
+	end
+
+FallarborTown_EventScript_1EB234:: @ 81EB234
+	msgbox FallarborTown_Text_1EB3CA, 2
+	end
+
+FallarborTown_EventScript_1EB23D:: @ 81EB23D
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_AZURILL, 0
+	msgbox FallarborTown_Text_1EB3B5, 4
+	waitmoncry
+	release
+	end
+
+FallarborTown_EventScript_1EB250:: @ 81EB250
+	msgbox FallarborTown_Text_1EB4C2, 3
+	end
+
+FallarborTown_EventScript_1EB259:: @ 81EB259
+	msgbox FallarborTown_Text_1EB4FE, 3
+	end
+
+FallarborTown_EventScript_1EB262:: @ 81EB262
+	msgbox FallarborTown_Text_1EB534, 3
+	end
+
+FallarborTown_Text_1EB26B: @ 81EB26B
+	.string "Something’s happening,\n"
+	.string "and I don’t like it!\p"
+	.string "I’ve seen shady characters wandering\n"
+	.string "in and out of PROF. COZMO’s home…$"
+
+FallarborTown_Text_1EB2DE: @ 81EB2DE
+	.string "This region’s been known for meteors\n"
+	.string "since the olden days.\p"
+	.string "They say METEOR FALLS was gouged out\n"
+	.string "by a falling meteorite long ago.$"
+
+FallarborTown_Text_1EB35F: @ 81EB35F
+	.string "See! Take a look!\n"
+	.string "This is my precious AZURILL!\p"
+	.string "It’s slick and smooth and plushy, too!$"
+
+FallarborTown_Text_1EB3B5: @ 81EB3B5
+	.string "AZURILL: Rooreelooo.$"
+
+FallarborTown_Text_1EB3CA: @ 81EB3CA
+	.string "Have you already challenged FLANNERY,\n"
+	.string "the LEADER of LAVARIDGE GYM?\p"
+	.string "The girl’s grandfather was famous.\n"
+	.string "He was one of the ELITE FOUR in the\l"
+	.string "POKéMON LEAGUE at one point.\p"
+	.string "It wouldn’t surprise me to see FLANNERY\n"
+	.string "become a great TRAINER in her own\l"
+	.string "right.$"
+
+FallarborTown_Text_1EB4C2: @ 81EB4C2
+	.string "BATTLE TENT FALLARBOR SITE\n"
+	.string "“May the Greatest Teams Gather!”$"
+
+FallarborTown_Text_1EB4FE: @ 81EB4FE
+	.string "FALLARBOR TOWN\n"
+	.string "“A farm community with small gardens.”$"
+
+FallarborTown_Text_1EB534: @ 81EB534
+	.string "MOVE TUTOR’S HOUSE\n"
+	.string "“New moves taught to POKéMON.”$"
+