Merge pull request #1 from pret/master

synching with source repo

3 files changed, 62 insertions, 1 deletions

diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..e2945f435
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0
+
+RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754
+	warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY
+	warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F
+
+RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C
+	map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
index fb88549f7..3db96f00d 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -1,5 +1,5 @@
 RustboroCity_PokemonCenter_1F: @ 84833D0
-	.4byte RustboroCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte RustboroCity_PokemonCenter_1F_MapEvents
 	.4byte RustboroCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..a9156d5aa
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,47 @@
+RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
+	map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_214D6D
+	map_script 5, RustboroCity_PokemonCenter_1F_MapScript1_277C30
+	.byte 0
+
+RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D
+	setrespawn 6
+	call RustboroCity_PokemonCenter_1F_EventScript_2718DE
+	end
+
+RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76
+	setvar VAR_0x800B, 1
+	call RustboroCity_PokemonCenter_1F_EventScript_27191E
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+RustboroCity_PokemonCenter_1F_EventScript_214D84:: @ 8214D84
+	msgbox RustboroCity_PokemonCenter_1F_Text_214D9F, 2
+	end
+
+RustboroCity_PokemonCenter_1F_EventScript_214D8D:: @ 8214D8D
+	msgbox RustboroCity_PokemonCenter_1F_Text_214E13, 2
+	end
+
+RustboroCity_PokemonCenter_1F_EventScript_214D96:: @ 8214D96
+	msgbox RustboroCity_PokemonCenter_1F_Text_214E81, 2
+	end
+
+RustboroCity_PokemonCenter_1F_Text_214D9F: @ 8214D9F
+	.string "My POKéMON has a NAIVE nature, and my\n"
+	.string "friend’s has a JOLLY nature.\p"
+	.string "It’s fascinating how POKéMON have\n"
+	.string "personalities!$"
+
+RustboroCity_PokemonCenter_1F_Text_214E13: @ 8214E13
+	.string "Just like people, there are male and\n"
+	.string "female POKéMON.\p"
+	.string "But no one seems to have any idea how\n"
+	.string "they’re different.$"
+
+RustboroCity_PokemonCenter_1F_Text_214E81: @ 8214E81
+	.string "The man next door gave me an HM!\p"
+	.string "I used it to teach my POKéMON how to\n"
+	.string "CUT down skinny trees.$"
+