Merge pull request #636 from huderlem/assets

Map organization

4 files changed, 59 insertions, 2 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..7173fb49c
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+RustboroCity_PokemonCenter_1F_EventObjects:: @ 8388B24
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0
+
+RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84
+	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:: @ 8388B9C
+	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 57cb84729..9b98aff0c 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_PokemonCenter_1F:: @ 83062B8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte RustboroCity_PokemonCenter_1F_MapEvents
 	.4byte RustboroCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 10
 	.byte 0
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..653cceb25
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,28 @@
+RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79
+	map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_157B7F
+	.byte 0
+
+RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F
+	setrespawn 6
+	call RustboroCity_PokemonCenter_1F_EventScript_19FD1B
+	end
+
+RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88
+	setvar VAR_SPECIAL_B, 1
+	call RustboroCity_PokemonCenter_1F_EventScript_19FD5B
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+RustboroCity_PokemonCenter_1F_EventScript_157B96:: @ 8157B96
+	msgbox RustboroCity_PokemonCenter_1F_Text_184B37, 2
+	end
+
+RustboroCity_PokemonCenter_1F_EventScript_157B9F:: @ 8157B9F
+	msgbox RustboroCity_PokemonCenter_1F_Text_184BAB, 2
+	end
+
+RustboroCity_PokemonCenter_1F_EventScript_157BA8:: @ 8157BA8
+	msgbox RustboroCity_PokemonCenter_1F_Text_184C19, 2
+	end
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/text.inc b/data/maps/RustboroCity_PokemonCenter_1F/text.inc
new file mode 100644
index 000000000..0265f0363
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/text.inc
@@ -0,0 +1,16 @@
+RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37
+	.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_184BAB:: @ 8184BAB
+	.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_184C19:: @ 8184C19
+	.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.$"