From 21ca035aa1d50594d57c3a40f455c75e4a1a273d Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sat, 13 Jul 2024 11:11:19 +0100
Subject: [PATCH] Restore some lore and make Eon Mail and Egg Tickets
 obtainable

The Egg Ticket still needs its function to be usable, but is now at least obtainable in some way. This makes Buena's Password much, much more interesting.
---
 README.md                   |  2 ++
 data/items/buena_prizes.asm |  4 ++--
 maps/CeladonCity.asm        |  6 +++++-
 maps/Route34.asm            | 13 ++-----------
 maps/Route36.asm            |  7 +++++--
 maps/Route45.asm            | 13 ++++---------
 6 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index a6ff143..97f19b0 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,8 @@ In general, there have been many wild encounter tweaks. View this document for d
 - The Kanto Safari Zone map from the prototype has been restored.
 - The prototype Lake of Rage village has been restored, complete with an Evolution Stone shop and Trader NPC! In general, it's themed around Pokemon evolution.
 - The Pokemon Communications Centre from JP GSC has been added and tweaked into a Regional Variant Trade hub, increasing with badge count.
+	- The GS Ball event has been restored, now being obtainable after beating the Elite Four and trying to exit the building.
+	- The Egg Ticket and Eon Mail events have been restored, now being associated with Buena's Password.
 	- Additionally, old lore relating to the area has now been restored.
 - Breakable rocks now give useful items...
 	- 1% MAX_REVIVE
diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm
index 4e2005c..7a3cff3 100644
--- a/data/items/buena_prizes.asm
+++ b/data/items/buena_prizes.asm
@@ -1,7 +1,7 @@
 BuenaPrizeItems:
 	table_width 2, BuenaPrizeItems
-	db ULTRA_BALL,   2
-	db FULL_RESTORE, 2
+	db EGG_TICKET,   2
+	db EON_MAIL, 2
 	db NUGGET,       3
 	db RARE_CANDY,   3
 	db PROTEIN,      5
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index a0a9a18..a26afff 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -158,7 +158,10 @@ CeladonCityTeacher2Text:
 	line "a sales clerk."
 	done
 
-CeladonCityLassText_Mobile: ; unreferenced
+CeladonCityLassText_MobileScript:
+	jumptextfaceplayer CeladonCityLassText_Mobile
+
+CeladonCityLassText_Mobile: ; Now existing
 	text "I love being"
 	line "surrounded by tall"
 	cont "buildings!"
@@ -267,3 +270,4 @@ CeladonCity_MapEvents:
 	object_event 24, 33, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1
 	object_event  6, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
 	object_event  7, 22, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1
+	object_event 10, 11, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassText_MobileScript, -1
diff --git a/maps/Route34.asm b/maps/Route34.asm
index abadb9c..3dced97 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -385,7 +385,7 @@ TrainerYoungsterSamuel:
 .Script:
 	endifjustbattled
 	opentext
-	writetext YoungsterSamuelAfterText
+	writetext YoungsterSamuelMobileText
 	waitbutton
 	closetext
 	end
@@ -515,7 +515,7 @@ YoungsterSamuelBeatenText:
 	line "passing stranger!"
 	done
 
-YoungsterSamuelMobileText: ; unreferenced
+YoungsterSamuelMobileText:
 	text "Have you been to"
 	line "GOLDENROD CITY?"
 
@@ -526,15 +526,6 @@ YoungsterSamuelMobileText: ; unreferenced
 	line "#MON CENTER?"
 	done
 
-YoungsterSamuelAfterText:
-	text "I'm going to train"
-	line "even harder."
-
-	para "After all, I'm"
-	line "trying to become"
-	cont "a GYM LEADER."
-	done
-
 YoungsterIanSeenText:
 	text "I'm the best in my"
 	line "class at #MON."
diff --git a/maps/Route36.asm b/maps/Route36.asm
index ec5f7ea..2191cee 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -526,8 +526,11 @@ Route36LassText:
 	line "blocking the way"
 	cont "to GOLDENROD CITY."
 
-	para "It's preventing"
-	line "me from shopping."
+	para "I wanted to go"
+	line "shopping and see"
+	cont "the huge #MON"
+	cont "CENTER they just"
+	cont "opened…"
 
 	para "Something should"
 	line "be done about it."
diff --git a/maps/Route45.asm b/maps/Route45.asm
index cf24706..781e6ae 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -497,18 +497,13 @@ CooltrainerfKellyAfterBattleText:
 	cont "to harm #MON."
 	done
 
-Route45DummyText:
-	text "I'm really, really"
-	line "tough!"
-
-	para "Is there anywhere"
-	line "I can prove how"
-	cont "tough I really am?"
-	done
-
 CamperQuentinSeenText:
 	text "I'm really, really"
 	line "tough!"
+	
+	para "Is there anywhere"
+	line "I can prove how"
+	cont "tough I really am?"
 	done
 
 CamperQuentinBeatenText: