Merge pull request #636 from huderlem/assets

Map organization

4 files changed, 123 insertions, 2 deletions

diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..06f8068c6
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+FallarborTown_PokemonCenter_1F_EventObjects:: @ 8386860
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR
+
+FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0
+	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
+	warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN
+	warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F
+
+FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8
+	map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index 8ffb95e0c..e51dea9cc 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_PokemonCenter_1F:: @ 8305D08
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte FallarborTown_PokemonCenter_1F_MapEvents
 	.4byte FallarborTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 4
 	.byte 0
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..6ae897ec8
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,81 @@
+FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3
+	map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_153AF9
+	.byte 0
+
+FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9
+	setrespawn 17
+	call FallarborTown_PokemonCenter_1F_EventScript_19FD1B
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02
+	setvar VAR_SPECIAL_B, 1
+	call FallarborTown_PokemonCenter_1F_EventScript_19FD5B
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B10:: @ 8153B10
+	msgbox FallarborTown_PokemonCenter_1F_Text_17768C, 2
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B19:: @ 8153B19
+	msgbox FallarborTown_PokemonCenter_1F_Text_1776F5, 2
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22
+	lock
+	faceplayer
+	msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4
+	closemessage
+	switch FACING
+	case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49
+	case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74
+	waitmovement 0
+	goto FallarborTown_PokemonCenter_1F_EventScript_153B69
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81
+	waitmovement 0
+	goto FallarborTown_PokemonCenter_1F_EventScript_153B69
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69
+	playse SE_JIDO_DOA
+	removeobject 4
+	clearflag FLAG_HIDE_LANETTE
+	release
+	end
+
+FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
+
+FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/text.inc b/data/maps/FallarborTown_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..a626ff1e9
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/text.inc
@@ -0,0 +1,27 @@
+FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4
+	.string "Oh, hello.\n"
+	.string "You are?\p"
+	.string "Okay, your name’s {PLAYER}{KUN}.\n"
+	.string "I can see that you’re a TRAINER.\p"
+	.string "So that means you use the POKéMON\n"
+	.string "Storage System I developed.\p"
+	.string "How I arrived at that conclusion is\n"
+	.string "a simple deductive process.\p"
+	.string "You spoke to me because you wanted\n"
+	.string "to access something on this PC.\p"
+	.string "Oh, I’m sorry. I’m LANETTE.\p"
+	.string "Honestly, I’m glad to meet you - it’s\n"
+	.string "great you’re using the Storage System.\p"
+	.string "If you could, please visit me at home.\n"
+	.string "My house is on ROUTE 114.$"
+
+FallarborTown_PokemonCenter_1F_Text_17768C:: @ 817768C
+	.string "I wonder what POKéMON looked like\n"
+	.string "long, long ago?\p"
+	.string "Maybe the FOSSIL MANIAC at the edge\n"
+	.string "of town will know.$"
+
+FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5
+	.string "In the fields of FALLARBOR, we plant\n"
+	.string "seedlings of hardy trees that thrive\l"
+	.string "even in volcanic ash.$"