Merge pull request #636 from huderlem/assets

Map organization

6 files changed, 238 insertions, 4 deletions

diff --git a/data/maps/Route104_Prototype/border.bin b/data/maps/Route104_Prototype/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route104_Prototype/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-Ô
Õ
Ü
Ý

\ No newline at end of file
diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc
new file mode 100644
index 000000000..2d7c90dc1
--- /dev/null
+++ b/data/maps/Route104_Prototype/events.inc
@@ -0,0 +1,23 @@
+Route104_Prototype_EventObjects:: @ 8391F2C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 9, 3, 23, 0, 0, 1, 1, Route104_Prototype_EventScript_160D2E, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 9, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 10, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 21, 3, 8, 0, 0, 1, 1, Route104_Prototype_EventScript_160D7B, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 30, 3, 24, 0, 0, 1, 1, Route104_Prototype_EventScript_160D92, 0
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 2, 3, 8, 0, 0, 1, 3, Route104_Prototype_EventScript_160DA9, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 37, 3, 7, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 28, 3, 2, 1, 1, 0, 0, Route104_Prototype_EventScript_160D0A, 0
+
+Route104_Prototype_MapWarps:: @ 839204C
+	warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP
+
+Route104_Prototype_MapBGEvents:: @ 8392054
+	bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C
+	bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25
+
+Route104_Prototype_MapEvents:: @ 839206C
+	map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
index 7f5115386..3fbbdad95 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -1,9 +1,9 @@
 Route104_Prototype:: @ 8307CF8
-	.4byte Route104_Prototype_MapAttributes
+	.4byte Route104_Prototype_Layout
 	.4byte Route104_Prototype_MapEvents
 	.4byte Route104_Prototype_MapScripts
 	.4byte 0x0
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 288
 	.byte 19
 	.byte 0
diff --git a/data/maps/Route104_Prototype/map.bin b/data/maps/Route104_Prototype/map.bin
deleted file mode 100644
index 71bd63e62..000000000
--- a/data/maps/Route104_Prototype/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-

\ No newline at end of file
diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc
new file mode 100644
index 000000000..e0aba01c9
--- /dev/null
+++ b/data/maps/Route104_Prototype/scripts.inc
@@ -0,0 +1,98 @@
+Route104_Prototype_MapScripts:: @ 8160C4A
+	.byte 0
+
+Route104_Prototype_EventScript_160C4B:: @ 8160C4B
+	lock
+	faceplayer
+	goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99
+	goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99
+	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
+	msgbox Route104_Prototype_Text_19B267, 4
+	goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB
+	release
+	end
+
+Route104_Prototype_EventScript_160C99:: @ 8160C99
+	msgbox Route104_Prototype_Text_19B22E, 4
+	release
+	end
+
+Route104_Prototype_EventScript_160CA3:: @ 8160CA3
+	lock
+	faceplayer
+	goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1
+	goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1
+	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
+	msgbox Route104_Prototype_Text_19B2E9, 4
+	goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB
+	release
+	end
+
+Route104_Prototype_EventScript_160CF1:: @ 8160CF1
+	msgbox Route104_Prototype_Text_19B2B6, 4
+	release
+	end
+
+Route104_Prototype_EventScript_160CFB:: @ 8160CFB
+	closemessage
+	delay 60
+	fadescreen 1
+	delay 60
+	special DoSoftReset
+	waitstate
+	release
+	end
+
+Route104_Prototype_EventScript_160D0A:: @ 8160D0A
+	msgbox Route104_Prototype_Text_19B33B, 2
+	end
+
+Route104_Prototype_EventScript_160D13:: @ 8160D13
+	msgbox Route104_Prototype_Text_19B37F, 2
+	end
+
+Route104_Prototype_EventScript_160D1C:: @ 8160D1C
+	msgbox Route104_Prototype_Text_19B3DE, 3
+	end
+
+Route104_Prototype_EventScript_160D25:: @ 8160D25
+	msgbox Route104_Prototype_Text_19B3FF, 3
+	end
+
+Route104_Prototype_EventScript_160D2E:: @ 8160D2E
+	trainerbattle 0, OPPONENT_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA
+	msgbox Route104_Prototype_Text_19ADF7, 6
+	end
+
+Route104_Prototype_EventScript_160D45:: @ 8160D45
+	trainerbattle 4, OPPONENT_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9
+	msgbox Route104_Prototype_Text_19AE6A, 6
+	end
+
+Route104_Prototype_EventScript_160D60:: @ 8160D60
+	trainerbattle 4, OPPONENT_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD
+	msgbox Route104_Prototype_Text_19B18D, 6
+	end
+
+Route104_Prototype_EventScript_160D7B:: @ 8160D7B
+	trainerbattle 0, OPPONENT_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E
+	msgbox Route104_Prototype_Text_19AF56, 6
+	end
+
+Route104_Prototype_EventScript_160D92:: @ 8160D92
+	trainerbattle 0, OPPONENT_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB
+	msgbox Route104_Prototype_Text_19B00D, 6
+	end
+
+Route104_Prototype_EventScript_160DA9:: @ 8160DA9
+	trainerbattle 0, OPPONENT_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7
+	msgbox Route104_Prototype_Text_19B0EF, 6
+	end
diff --git a/data/maps/Route104_Prototype/text.inc b/data/maps/Route104_Prototype/text.inc
new file mode 100644
index 000000000..7ce19f609
--- /dev/null
+++ b/data/maps/Route104_Prototype/text.inc
@@ -0,0 +1,115 @@
+Route104_Prototype_Text_19AD9B:: @ 819AD9B
+	.string "Oh? You look like a good TRAINER.\n"
+	.string "Will you look at my POKéMON?$"
+
+Route104_Prototype_Text_19ADDA:: @ 819ADDA
+	.string "I’m not good enough for you.$"
+
+Route104_Prototype_Text_19ADF7:: @ 819ADF7
+	.string "I enjoyed our battle very much.\n"
+	.string "Please battle with me some other time.$"
+
+Route104_Prototype_Text_19AE3E:: @ 819AE3E
+	.string "Go!\n"
+	.string "Go, our POKéMON!$"
+
+Route104_Prototype_Text_19AE53:: @ 819AE53
+	.string "Oh... We couldn’t win.$"
+
+Route104_Prototype_Text_19AE6A:: @ 819AE6A
+	.string "Did it surprise you that two POKéMON\n"
+	.string "battled at the same time?$"
+
+Route104_Prototype_Text_19AEA9:: @ 819AEA9
+	.string "You can’t battle with us if you have\n"
+	.string "only one POKéMON.\l"
+	.string "Why? Because we’re strong!$"
+
+Route104_Prototype_Text_19AEFB:: @ 819AEFB
+	.string "Hey, hey! This is my first battle in\n"
+	.string "a while. I’ll give it my all!$"
+
+Route104_Prototype_Text_19AF3E:: @ 819AF3E
+	.string "But I gave it my all...$"
+
+Route104_Prototype_Text_19AF56:: @ 819AF56
+	.string "You’re far too strong!\n"
+	.string "You must be a great TRAINER!$"
+
+Route104_Prototype_Text_19AF8A:: @ 819AF8A
+	.string "My POKéMON are extremely cute and\n"
+	.string "extremely strong.\l"
+	.string "Please allow me to show you.$"
+
+Route104_Prototype_Text_19AFDB:: @ 819AFDB
+	.string "I must concede defeat.\n"
+	.string "After all, you are strong.$"
+
+Route104_Prototype_Text_19B00D:: @ 819B00D
+	.string "The next time we meet, I will have raised\n"
+	.string "my POKéMON much more.\p"
+	.string "Don’t expect mercy then!$"
+
+Route104_Prototype_Text_19B066:: @ 819B066
+	.string "We HIKERS are always full of energy!\n"
+	.string "My POKéMON are also full of energy, too.\l"
+	.string "We’re always itching for a battle!$"
+
+Route104_Prototype_Text_19B0D7:: @ 819B0D7
+	.string "We ran out of energy...$"
+
+Route104_Prototype_Text_19B0EF:: @ 819B0EF
+	.string "Wahahah! Sure, we lost!\n"
+	.string "But we had a great battle, didn’t we?\l"
+	.string "We’re satisfied with that!$"
+
+Route104_Prototype_Text_19B148:: @ 819B148
+	.string "You look like a strong TRAINER,\n"
+	.string "but can you beat us?$"
+
+Route104_Prototype_Text_19B17D:: @ 819B17D
+	.string "Waaah!\n"
+	.string "We lost!$"
+
+Route104_Prototype_Text_19B18D:: @ 819B18D
+	.string "If two POKéMON can battle at the same\n"
+	.string "time, all sorts of new things can happen.$"
+
+Route104_Prototype_Text_19B1DD:: @ 819B1DD
+	.string "Do you only have one POKéMON that can\n"
+	.string "battle?\p"
+	.string "Then we can’t battle with you yet.$"
+
+Route104_Prototype_Text_19B22E:: @ 819B22E
+	.string "Have you tried beating all the other\n"
+	.string "TRAINERS in battle?$"
+
+Route104_Prototype_Text_19B267:: @ 819B267
+	.string "Thanks for coming today!\p"
+	.string "I hope you’re looking forward to this\n"
+	.string "game’s release!$"
+
+Route104_Prototype_Text_19B2B6:: @ 819B2B6
+	.string "Huh? Did you battle with all the\n"
+	.string "TRAINERS already?$"
+
+Route104_Prototype_Text_19B2E9:: @ 819B2E9
+	.string "Thank you for coming today!\p"
+	.string "I hope you’re looking forward to this\n"
+	.string "game’s release!$"
+
+Route104_Prototype_Text_19B33B:: @ 819B33B
+	.string "I’ve never seen the POKéMON you have.\n"
+	.string "It makes me envious a little.$"
+
+Route104_Prototype_Text_19B37F:: @ 819B37F
+	.string "Look at all those TRAINERS!\n"
+	.string "They have different POKéMON, too.\l"
+	.string "And they’re all waiting for you!$"
+
+Route104_Prototype_Text_19B3DE:: @ 819B3DE
+	.string "Welcome to the World of POKéMON!$"
+
+Route104_Prototype_Text_19B3FF:: @ 819B3FF
+	.string "May all POKéMON battles be bright,\n"
+	.string "fun, and ferocious!$"