Merge branch 'master' into document-eventscripts

2 files changed, 79 insertions, 15 deletions

diff --git a/data/text/eon_ticket.inc b/data/text/event_ticket_1.inc
index d436f2df1..da4d525f6 100644
--- a/data/text/eon_ticket.inc
+++ b/data/text/event_ticket_1.inc
@@ -1,16 +1,16 @@
-LilycoveCity_Harbor_Text_2A6848: @ 82A6848
+EventTicket_Text_ShowOldSeaMap: @ 82A6848
 	.string "The ferry to SLATEPORT is…\p"
 	.string "I beg your pardon?\n"
 	.string "Can we sail to this place on the map?\p"
 	.string "I know someone who will help you better.\n"
 	.string "Please wait.$"
 
-LilycoveCity_Harbor_Text_2A68D2: @ 82A68D2
+EventTicket_Text_ThatPass: @ 82A68D2
 	.string "The ferry to SLATEPORT is…\p"
 	.string "Oh?\n"
 	.string "That PASS…$"
 
-LilycoveCity_Harbor_Text_2A68FC: @ 82A68FC
+EventTicket_Text_ShowEonTicket: @ 82A68FC
 	.string "Aye, mate, are you the one who brought\n"
 	.string "that mighty odd PASS?\p"
 	.string "I'll tell you, you're trying to reach a\n"
@@ -20,29 +20,22 @@ LilycoveCity_Harbor_Text_2A68FC: @ 82A68FC
 	.string "That shivers my timbers!\p"
 	.string "All aboard!$"
 
-SouthernIsland_Exterior_Text_2A69F1: @ 82A69F1
+EventTicket_Text_SouthernIslandSailBack: @ 82A69F1
 	.string "Aye, mate, there's nothing here to\n"
 	.string "see or do on this forgettable island.\p"
 	.string "What say we sail back to LILYCOVE?$"
 
-BirthIsland_Harbor_Text_2A6A5D: @ 82A6A5D
-FarawayIsland_Entrance_Text_2A6A5D: @ 82A6A5D
-NavelRock_Harbor_Text_2A6A5D: @ 82A6A5D
-SouthernIsland_Exterior_Text_2A6A5D: @ 82A6A5D
+EventTicket_Text_SailHome: @ 82A6A5D
 	.string "Aye, right, then!\n"
 	.string "Sail home we will!$"
 
-BirthIsland_Harbor_Text_2A6A82: @ 82A6A82
-FarawayIsland_Entrance_Text_2A6A82: @ 82A6A82
-LilycoveCity_Harbor_Text_2A6A82: @ 82A6A82
-NavelRock_Harbor_Text_2A6A82: @ 82A6A82
-SouthernIsland_Exterior_Text_2A6A82: @ 82A6A82
+EventTicket_Text_AsYouLike: @ 82A6A82
 	.string "Aye, right, as you like, then.$"
 
-SouthernIsland_Interior_Text_2A6AA1: @ 82A6AA1
+SouthernIsland_Interior_Text_Sign: @ 82A6AA1
 	.string "“All dreams are but another reality.\n"
 	.string "Never forget…”$"
 
-SouthernIsland_Exterior_Text_2A6AD5: @ 82A6AD5
+SouthernIsland_Exterior_Text_Sign: @ 82A6AD5
 	.string "“Those whose memories fade seek to\n"
 	.string "carve them in their hearts…”$"
diff --git a/data/text/event_ticket_2.inc b/data/text/event_ticket_2.inc
new file mode 100644
index 000000000..e081edbd9
--- /dev/null
+++ b/data/text/event_ticket_2.inc
@@ -0,0 +1,71 @@
+EventTicket_Text_OldSeaMapTooFar: @ 82C68A5
+    .string "What's up, youngster?\p"
+    .string "What, it's you who's supposed to have\n"
+    .string "a tattered old map?\p"
+    .string "Let's have a look.\n"
+    .string "… … … … … …\p"
+    .string "Boy, this is quite a ways away.\n"
+    .string "I'm afraid I can't help you…$"
+
+EventTicket_Text_BrineyHoldOnASecond: @ 82C6951
+    .string "BRINEY: Hold on a second!\p"
+    .string "What's the idea of turning down\n"
+    .string "someone that I owe so much to?$"
+
+EventTicket_Text_BrineyLetsSail: @ 82C69AA
+    .string "{PLAYER}{KUN}, I'm terribly sorry.\p"
+    .string "You came to me seeking my help,\n"
+    .string "and we almost turned you away.\p"
+    .string "Well, let me make things right.\p"
+    .string "We'll sail right away, of course!\p"
+    .string "Let's find this island on\n"
+    .string "this OLD SEA MAP!$"
+
+EventTicket_Text_OddTicketGetOnBoard: @ 82C6A71
+    .string "Is it you who brought that odd\n"
+    .string "ticket?\p"
+    .string "Where you're trying to go is an island\n"
+    .string "that's far, far away.\p"
+    .string "No one knows what awaits there…\p"
+    .string "The very thought excites my blood\n"
+    .string "as a sailing man!\p"
+    .string "Get on board, youngster!$"
+
+FarawayIsland_Entrance_Text_SailorReturn: @ 82C6B42
+    .string "CAPT. BRINEY can be so maddeningly\n"
+    .string "fickle…\p"
+    .string "Do you want to return to LILYCOVE?$"
+
+BirthIsland_Harbor_Text_SailorReturn: @ 82C6B90
+    .string "What an oddly shaped island, eh?\n"
+    .string "Do you want to return to LILYCOVE?$"
+
+EventTicket_Text_OddTicketsWhereTo: @ 82C6BD4
+    .string "Is it you who brought those\n"
+    .string "odd tickets?\p"
+    .string "… … …Hm.\p"
+    .string "These tickets will get you to islands\n"
+    .string "that are far, far away.\p"
+    .string "No one knows what awaits there,\n"
+    .string "or what may happen there.\p"
+    .string "The very thought excites my blood\n"
+    .string "as a sailing man!\p"
+    .string "Get on board, youngster!\n"
+    .string "Where shall we sail first?$"
+
+NavelRock_Harbor_Text_SailorReturn: @ 82C6CE6
+    .string "Did… Did you hear that?\n"
+    .string "That low growling from deep in there.\p"
+    .string "Are you sure it's safe?\n"
+    .string "Do you think we should leave?$"
+
+FarawayIsland_Entrance_Text_Sign: @ 82C6D5A
+    .string "The writing is fading as if it was\n"
+    .string "written a long time ago…\p"
+    .string "“…ber, 6th day\n"
+    .string "If any human…sets foot here…\l"
+    .string "again…et it be a kindhearted pers…\l"
+    .string "…ith that hope, I depar…”$"
+
+FarawayIsland_Interior_Text_Mew: @ 82C6DFF
+    .string "Myuu…$"