Merge pull request #636 from huderlem/assets

Map organization

6 files changed, 123 insertions, 3 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/events.inc b/data/maps/FallarborTown/events.inc
new file mode 100644
index 000000000..37308b07c
--- /dev/null
+++ b/data/maps/FallarborTown/events.inc
@@ -0,0 +1,25 @@
+FallarborTown_EventObjects:: @ 8380E04
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_14E814, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_14E81D, 0
+	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR
+
+FallarborTown_MapWarps:: @ 8380E64
+	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
+	warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_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:: @ 8380E8C
+	bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1
+	bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA
+	bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839
+	bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA
+	bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842
+	bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1
+	bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B
+	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C
+
+FallarborTown_MapEvents:: @ 8380EEC
+	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index bd719a36b..e6e0041b6 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -1,9 +1,9 @@
 FallarborTown:: @ 83055B4
-	.4byte FallarborTown_MapAttributes
+	.4byte FallarborTown_Layout
 	.4byte FallarborTown_MapEvents
 	.4byte FallarborTown_MapScripts
 	.4byte FallarborTown_MapConnections
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 14
 	.byte 4
 	.byte 0
diff --git a/data/maps/FallarborTown/map.bin b/data/maps/FallarborTown/map.bin
deleted file mode 100644
index 08f68b6ea..000000000
--- a/data/maps/FallarborTown/map.bin
+++ /dev/null
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
new file mode 100644
index 000000000..a168a0ef5
--- /dev/null
+++ b/data/maps/FallarborTown/scripts.inc
@@ -0,0 +1,55 @@
+FallarborTown_MapScripts:: @ 814E7E0
+	map_script 3, FallarborTown_MapScript1_14E7E6
+	.byte 0
+
+FallarborTown_MapScript1_14E7E6:: @ 814E7E6
+	setflag FLAG_VISITED_FALLARBOR_TOWN
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	clearflag FLAG_CONTEST_SKETCH_CREATED
+	end
+
+FallarborTown_EventScript_14E7F5:: @ 814E7F5
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A
+	msgbox FallarborTown_Text_16C7FF, 4
+	release
+	end
+
+FallarborTown_EventScript_14E80A:: @ 814E80A
+	msgbox FallarborTown_Text_16C855, 4
+	release
+	end
+
+FallarborTown_EventScript_14E814:: @ 814E814
+	msgbox FallarborTown_Text_16C8D6, 2
+	end
+
+FallarborTown_EventScript_14E81D:: @ 814E81D
+	msgbox FallarborTown_Text_16C941, 2
+	end
+
+FallarborTown_EventScript_14E826:: @ 814E826
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_AZURILL, 0
+	msgbox FallarborTown_Text_16C92C, 4
+	waitmoncry
+	release
+	end
+
+FallarborTown_EventScript_14E839:: @ 814E839
+	msgbox FallarborTown_Text_16CA39, 3
+	end
+
+FallarborTown_EventScript_14E842:: @ 814E842
+MeteorFalls_1F_1R_EventScript_14E842:: @ 814E842
+MeteorFalls_1F_2R_EventScript_14E842:: @ 814E842
+	msgbox FallarborTown_Text_16CA83, 3
+	end
+
+FallarborTown_EventScript_14E84B:: @ 814E84B
+	msgbox FallarborTown_Text_16CAB9, 3
+	end
diff --git a/data/maps/FallarborTown/text.inc b/data/maps/FallarborTown/text.inc
new file mode 100644
index 000000000..1483272de
--- /dev/null
+++ b/data/maps/FallarborTown/text.inc
@@ -0,0 +1,41 @@
+FallarborTown_Text_16C7FF:: @ 816C7FF
+	.string "What’s up, what’s up?\p"
+	.string "I saw a shady fellow scuttling in and\n"
+	.string "out of PROF. COZMO’s LAB.$"
+
+FallarborTown_Text_16C855:: @ 816C855
+	.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_16C8D6:: @ 816C8D6
+	.string "See! Take a look!\n"
+	.string "This is my precious AZURILL!\p"
+	.string "It’s slick and smooth and plushy, too!$"
+
+FallarborTown_Text_16C92C:: @ 816C92C
+	.string "AZURILL: Rooreelooo.$"
+
+FallarborTown_Text_16C941:: @ 816C941
+	.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_16CA39:: @ 816CA39
+	.string "POKéMON CONTESTS\n"
+	.string "SUPER RANK REGISTRATION\p"
+	.string "“Burst on to the POKéMON scene!”$"
+
+FallarborTown_Text_16CA83:: @ 816CA83
+	.string "FALLARBOR TOWN\n"
+	.string "“A farm community with small gardens.”$"
+
+FallarborTown_Text_16CAB9:: @ 816CAB9
+	.string "MOVE TUTOR’S HOUSE\n"
+	.string "“New moves taught to POKéMON.”$"