Merge branch 'master' of https://github.com/ZetaNull/jep-hack

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

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

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

maps/DebugRoom.asm

@@ -110,6 +110,8 @@ DebugFlyScript:
 	setflag ENGINE_FLYPOINT_SILVER_CAVE
 	setflag ENGINE_FLYPOINT_SILENT_HILLS
 	
+	setevent EVENT_BEAT_ELITE_FOUR
+	
 	addcellnum PHONE_MOM
 	readvar VAR_BADGES
 	givepoke SHI_SHI, 70

maps/PokecomCenterAdminOfficeMobile.asm

@@ -1,12 +1,16 @@
 	object_const_def
-	const GOLDENRODPOKECENTER1F_NURSE
-	const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
-	const GOLDENRODPOKECENTER1F_GAMEBOY_KID
-	const GOLDENRODPOKECENTER1F_LASS
-	const GOLDENRODPOKECENTER1F_POKEFAN_F
 	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1
 	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2
 	const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3
+	const GOLDENRODPOKECENTER1F_NURSE
+	const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
+	const GOLDENRODPOKECENTER1F_LASS1
+	const GOLDENRODPOKECENTER1F_POKEFAN_F
+	const GOLDENRODPOKECENTER1F_YOUNGSTER
+	const GOLDENRODPOKECENTER1F_LASS2
+	const GOLDENRODPOKECENTER1F_GAMEBOYKID1
+	const GOLDENRODPOKECENTER1F_GAMEBOYKID2
+	const GOLDENRODPOKECENTER1F_COOLTRAINERM
 
 PokecomCenterAdminOfficeMobile_MapScripts:
 	def_scene_scripts
@@ -18,16 +22,15 @@ GoldenrodPokecenter1FNurseScript:
 	jumpstd PokecenterNurseScript
 
 GoldenrodPokecenter1F_GSBallSceneLeft:
-	setval BATTLETOWERACTION_CHECKMOBILEEVENT
-	special BattleTowerAction
-	ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
+	checkevent EVENT_BEAT_ELITE_FOUR
+	iftrue .gsball
 	end
 
 .gsball
 	checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
 	iftrue .cancel
 	playsound SFX_EXIT_BUILDING
-	moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 0, 7
+	moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 6, 10
 	disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	playmusic MUSIC_SHOW_ME_AROUND
@@ -50,16 +53,15 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
 	end
 
 GoldenrodPokecenter1F_GSBallSceneRight:
-	setval BATTLETOWERACTION_CHECKMOBILEEVENT
-	special BattleTowerAction
-	ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
+	checkevent EVENT_BEAT_ELITE_FOUR
+	iftrue .gsball
 	end
 
 .gsball
 	checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
 	iftrue .cancel
 	playsound SFX_EXIT_BUILDING
-	moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 0, 7
+	moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 7, 10
 	disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
 	playmusic MUSIC_SHOW_ME_AROUND
@@ -81,9 +83,6 @@ GoldenrodPokecenter1F_GSBallSceneRight:
 .cancel
 	end
 
-GoldenrodPokecenter1FGameboyKidScript:
-	jumptextfaceplayer GoldenrodPokecenter1FGameboyKidText
-
 GoldenrodPokecenter1FLassScript:
 	jumptextfaceplayer GoldenrodPokecenter1FLassText
 
@@ -122,262 +121,45 @@ GoldenrodPokecenter1FPokefanF:
 	end
 
 GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtLeftDoorwayTileMovement:
-	step UP
-	step RIGHT
-	step RIGHT
-	step RIGHT
-	turn_head DOWN
+	step DOWN
+	step DOWN
+	step DOWN
+	step DOWN
 	step_end
 
 GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromLeftDoorwayTileMovement:
-	step LEFT
-	step LEFT
-	step LEFT
-	step DOWN
-	step_end
-
-GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtRightDoorwayTileMovement:
+	step UP
+	step UP
 	step UP
 	step RIGHT
 	step RIGHT
 	step RIGHT
 	step RIGHT
-	turn_head DOWN
+	step RIGHT
+	step RIGHT
 	step_end
 
-GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromRightDoorwayTileMovement:
-	step LEFT
-	step LEFT
-	step LEFT
-	step LEFT
+GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtRightDoorwayTileMovement:
+	step DOWN
+	step DOWN
+	step DOWN
 	step DOWN
 	step_end
 
-GoldenrodPokecomCenterWelcomeToTradeCornerText: ; unreferenced
-	text "Hello! Welcome to"
-	line "#COM CENTER"
-	cont "TRADE CORNER."
-
-	para "You can trade"
-	line "#MON with other"
-	cont "people far away."
-	done
-
-GoldenrodPokecomCenterWeMustHoldYourMonText: ; unreferenced
-	text "To make a trade,"
-	line "we must hold your"
-	cont "#MON."
-
-	para "Would you like to"
-	line "trade?"
-	done
-
-GoldenrodPokecomCenterWhatMonDoYouWantText: ; unreferenced
-	text "What kind of"
-	line "#MON do you"
-	cont "want in return?"
-	done
-
-GoldenrodPokecomCenterWeWillTradeYourMonForMonText: ; unreferenced
-	text "Fine. We will try"
-	line "to trade your"
-
-	para "@"
-	text_ram wStringBuffer3
-	text " for"
-	line "@"
-	text_ram wStringBuffer4
-	text "."
-
-	para "We'll have to hold"
-	line "your #MON"
-	cont "during the trade."
-
-	para "Please wait while"
-	line "we prepare the"
-	cont "room for it."
-	done
-
-GoldenrodPokecomCenterWeWillTradeYourMonForNewText: ; unreferenced
-	text "Fine. We will try"
-	line "to trade your"
-
-	para "@"
-	text_ram wStringBuffer3
-	text " for a"
-	line "#MON that you"
-	cont "have never seen."
-
-	para "We'll have to hold"
-	line "your #MON"
-	cont "during the trade."
-
-	para "Please wait while"
-	line "we prepare the"
-	cont "room for it."
-	done
-
-GoldenrodPokecomCenterYourMonHasBeenReceivedText: ; unreferenced
-	text "Your trade #MON"
-	line "has been received."
-
-	para "It will take time"
-	line "to find a trade"
-
-	para "partner. Please"
-	line "come back later."
-	done
-
-GoldenrodPokecomCenterYouHaveOnlyOneMonText: ; unreferenced
-	text "Oh? You have only"
-	line "one #MON in"
-	cont "your party. "
-
-	para "Please come back"
-	line "once you've in-"
-	cont "creased the size"
-	cont "of your party."
-	done
-
-GoldenrodPokecomCenterWeHopeToSeeYouAgainText: ; unreferenced
-	text "We hope to see you"
-	line "again."
-	done
-
-GoldenrodPokecomCenterCommunicationErrorText: ; unreferenced
-	text "Communication"
-	line "error…"
-	done
-
-GoldenrodPokecomCenterCantAcceptLastMonText: ; unreferenced
-	text "If we accept that"
-	line "#MON, what will"
-	cont "you battle with?"
-	done
-
-GoldenrodPokecomCenterCantAcceptEggText: ; unreferenced
-	text "Sorry. We can't"
-	line "accept an EGG."
-	done
-
-GoldenrodPokecomCenterCantAcceptAbnormalMonText: ; unreferenced
-	text "Sorry, but your"
-	line "#MON appears to"
-
-	para "be abnormal. We"
-	line "can't accept it."
-	done
-
-GoldenrodPokecomCenterAlreadyHoldingMonText: ; unreferenced
-	text "Oh? Aren't we"
-	line "already holding a"
-	cont "#MON of yours?"
-	done
-
-GoldenrodPokecomCenterCheckingTheRoomsText: ; unreferenced
-	text "We'll check the"
-	line "rooms."
-
-	para "Please wait."
-	done
-
-GoldenrodPokecomCenterTradePartnerHasBeenFoundText: ; unreferenced
-	text "Thank you for your"
-	line "patience."
-
-	para "A trade partner"
-	line "has been found."
-	done
-
-GoldenrodPokecomCenterItsYourNewPartnerText: ; unreferenced
-	text "It's your new"
-	line "partner."
-
-	para "Please take care"
-	line "of it with love."
-
-	para "We hope to see you"
-	line "again."
-	done
-
-GoldenrodPokecomCenterYourPartyIsFullText: ; unreferenced
-	text "Uh-oh. Your party"
-	line "is already full."
-
-	para "Please come back"
-	line "when you have room"
-	cont "in your party."
-	done
-
-GoldenrodPokecomCenterNoTradePartnerFoundText: ; unreferenced
-	text "It's unfortunate,"
-	line "but no one has"
-
-	para "come forward as a"
-	line "trade partner."
-
-	para "Would you like"
-	line "your #MON back?"
-	done
-
-GoldenrodPokecomCenterReturnedYourMonText: ; unreferenced
-	text "We have returned"
-	line "your #MON."
-	done
-
-GoldenrodPokecomCenterYourMonIsLonelyText: ; unreferenced
-	text "It's unfortunate,"
-	line "but no one has"
-
-	para "come forward as a"
-	line "trade partner."
-
-	para "We've held your"
-	line "#MON for a long"
-
-	para "time. As a result,"
-	line "it is very lonely."
-
-	para "Sorry, but we must"
-	line "return it to you."
-	done
-
-GoldenrodPokecenter1FWeHopeToSeeYouAgainText_2: ; unreferenced
-	text "We hope to see you"
-	line "again."
-	done
-
-GoldenrodPokecomCenterContinueToHoldYourMonText: ; unreferenced
-	text "Fine. We will"
-	line "continue to hold"
-	cont "your #MON."
-	done
-
-GoldenrodPokecomCenterRecentlyLeftYourMonText: ; unreferenced
-	text "Oh? You left your"
-	line "#MON with us"
-	cont "only recently."
-
-	para "Please come back"
-	line "later."
-	done
-
-GoldenrodPokecomCenterSaveBeforeTradeCornerText: ; unreferenced
-	text "We'll SAVE before"
-	line "connecting to the"
-	cont "CENTER."
-	done
-
-GoldenrodPokecomCenterWhichMonToTradeText: ; unreferenced
-	text "Which #MON do"
-	line "you want to trade?"
-	done
-
-GoldenrodPokecomCenterTradeCanceledText: ; unreferenced
-	text "Sorry, but we must"
-	line "cancel the trade."
-	done
+GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromRightDoorwayTileMovement:
+	step UP
+	step UP
+	step UP
+	step RIGHT
+	step RIGHT
+	step RIGHT
+	step RIGHT
+	step RIGHT
+	step RIGHT
+	step_end
 
+; Egg Ticket stuff.
+; Martha ought to restore this..?
 GoldenrodPokecomCenterEggTicketText: ; unreferenced
 	text "Oh!"
 
@@ -424,11 +206,6 @@ GoldenrodPokecomCenterOddEggBriefingText: ; unreferenced
 	line "chosen room."
 	done
 
-GoldenrodPokecomCenterPleaseWaitAMomentText: ; unreferenced
-	text "Please wait a"
-	line "moment."
-	done
-
 GoldenrodPokecomCenterHereIsYourOddEggText: ; unreferenced
 	text "Thank you for"
 	line "waiting."
@@ -442,99 +219,44 @@ GoldenrodPokecomCenterHereIsYourOddEggText: ; unreferenced
 	line "with loving care."
 	done
 
-GoldenrodPokecomCenterNoEggTicketServiceText: ; unreferenced
-	text "I'm awfully sorry."
+; The News feature obviously can't work in our build, as we won't use the Mobile Adapter.
+; What we can do is give an idea of what it was like.
+; So here, we're referencing the 2000 National Tournament. 
+; Sato Yuki won using Heracross, Zapdos, and Kangaskhan.
+; A video used to be here (https://www.youtube.com/watch?v=fhG1sa6KtNw) but it's disappeared...
+; But Gold recounts it here http://pokemon.s20.xrea.com/historia-single.html.
+GoldenrodPokecomCenterNewsMachineScript:
+	opentext
+	writetext GoldenrodPokecomCenterNewsMachineText
+	waitbutton
+	closetext
+	end
 
-	para "The EGG TICKET"
-	line "exchange service"
-	cont "isn't running now."
-	done
-
-GoldenrodPokecomCenterNewsMachineText: ; unreferenced
+GoldenrodPokecomCenterNewsMachineText:
 	text "It's a #MON"
 	line "NEWS MACHINE."
+	
+	para "Wow! HERACROSS"
+	line "just keeps going!"
+	
+	para "…"
+	
+	para "…"
+	
+	para "That's it! The"
+	line "crowd goes wild!"
+	
+	para "SATO YUKI wins"
+	line "the 4th #MON"
+	cont "LEAGUE National"
+	cont "Tournament!"
+	
 	done
 
-GoldenrodPokecomCenterWhatToDoText: ; unreferenced
-	text "What would you"
-	line "like to do?"
-	done
+GoldenrodPokecomCenterPerson1Script:
+	jumptextfaceplayer GoldenrodPokecomCenterPerson1Text
 
-GoldenrodPokecomCenterNewsMachineExplanationText: ; unreferenced
-	text "#MON NEWS is"
-	line "news compiled from"
-
-	para "the SAVE files of"
-	line "#MON trainers."
-
-	para "When reading the"
-	line "NEWS, your SAVE"
-
-	para "file may be sent"
-	line "out."
-
-	para "The SAVE file data"
-	line "will contain your"
-
-	para "adventure log and"
-	line "mobile profile."
-
-	para "Your phone number"
-	line "will not be sent."
-
-	para "The contents of"
-	line "the NEWS will vary"
-
-	para "depending on the"
-	line "SAVE files sent by"
-
-	para "you and the other"
-	line "#MON trainers."
-
-	para "You might even be"
-	line "in the NEWS!"
-	done
-
-GoldenrodPokecomCenterWouldYouLikeTheNewsText: ; unreferenced
-	text "Would you like to"
-	line "get the NEWS?"
-	done
-
-GoldenrodPokecomCenterReadingTheLatestNewsText: ; unreferenced
-	text "Reading the latest"
-	line "NEWS… Please wait."
-	done
-
-GoldenrodPokecomCenterNoOldNewsText: ; unreferenced
-	text "There is no old"
-	line "NEWS…"
-	done
-
-GoldenrodPokecomCenterCorruptedNewsDataText: ; unreferenced
-	text "The NEWS data is"
-	line "corrupted."
-
-	para "Please download"
-	line "the NEWS again."
-	done
-
-GoldenrodPokecomCenterMakingPreparationsText: ; unreferenced
-	text "We're making"
-	line "preparations."
-
-	para "Please come back"
-	line "later."
-	done
-
-GoldenrodPokecomCenterSaveBeforeNewsMachineText: ; unreferenced
-	text "We will SAVE your"
-	line "progress before"
-
-	para "starting the NEWS"
-	line "MACHINE."
-	done
-
-GoldenrodPokecomCenterPerson1Text: ; unreferenced
+GoldenrodPokecomCenterPerson1Text:
 	text "Whoa, this #MON"
 	line "CENTER is huge."
 
@@ -545,7 +267,10 @@ GoldenrodPokecomCenterPerson1Text: ; unreferenced
 	line "new machines too."
 	done
 
-GoldenrodPokecomCenterPerson2Text: ; unreferenced
+GoldenrodPokecomCenterPerson2Script:
+	jumptextfaceplayer GoldenrodPokecomCenterPerson2Text
+
+GoldenrodPokecomCenterPerson2Text:
 	text "I thought up a fun"
 	line "new thing for the"
 	cont "TRADE CORNER!"
@@ -573,29 +298,37 @@ GoldenrodPokecomCenterPerson2Text: ; unreferenced
 	line "friends!"
 	done
 
-GoldenrodPokecomCenterPerson3Text: ; unreferenced
-	text "They said you can"
-	line "trade #MON with"
+GoldenrodPokecomCenterPerson3Script:
+	jumptextfaceplayer GoldenrodPokecomCenterPerson3Text
+	
+GoldenrodPokecomCenterPerson3Text:
+	text "You can trade #"
+	line "MON with foreigners"
+	cont "here."
 
-	para "total strangers up"
-	line "here."
-
-	para "But they're still"
-	line "adjusting things."
+	para "It seems they want"
+	line "to connect worldwide,"
+	cont "though!"
 	done
 
-GoldenrodPokecomCenterPerson4Text: ; unreferenced
+GoldenrodPokecomCenterPerson4Script:
+	jumptextfaceplayer GoldenrodPokecomCenterPerson4Text
+	
+GoldenrodPokecomCenterPerson4Text:
 	text "Some girl I don't"
 	line "know sent me her"
-
-	para "HOPPIP."
-	line "You should trade"
-
-	para "for a #MON that"
-	line "you want."
+	cont "WOOPER, but its"
+	cont "type is different!"
+	
+	para "You should trade"
+	line "for a #MON that"
+	cont "you want."
 	done
 
-GoldenrodPokecomCenterPerson5Text: ; unreferenced
+GoldenrodPokecomCenterPerson5Script:
+	jumptextfaceplayer GoldenrodPokecomCenterPerson5Text
+	
+GoldenrodPokecomCenterPerson5Text:
 	text "I received a"
 	line "female HOPPIP, but"
 	cont "its named STANLEY!"
@@ -604,79 +337,10 @@ GoldenrodPokecomCenterPerson5Text: ; unreferenced
 	line "name!"
 	done
 
-GoldenrodPokecomCenterPerson6Text: ; unreferenced
-	text "What is the NEWS"
-	line "MACHINE?"
+GoldenrodPokecomCenterPerson6Script:
+	jumptextfaceplayer GoldenrodPokecomCenterPerson6Text
 
-	para "Does it get news"
-	line "from a wider area"
-	cont "than the radio?"
-	done
-
-GoldenrodPokecomCenterPerson7Text: ; unreferenced
-	text "The #COM CENTER"
-	line "will link with all"
-
-	para "#MON CENTERS in"
-	line "a wireless net."
-
-	para "That must mean"
-	line "I'll be able to"
-
-	para "link with all"
-	line "sorts of people."
-	done
-
-GoldenrodPokecomCenterPerson8Text: ; unreferenced
-	text "The machines here"
-	line "can't be used yet."
-
-	para "Still, it's nice"
-	line "coming to a trendy"
-
-	para "place before other"
-	line "people."
-	done
-
-GoldenrodPokecomCenterPerson9Text: ; unreferenced
-	text "My friend was in"
-	line "the NEWS a while"
-
-	para "back. I was really"
-	line "surprised!"
-	done
-
-GoldenrodPokecomCenterPerson10Text: ; unreferenced
-	text "I get anxious if I"
-	line "don't check out"
-	cont "the latest NEWS!"
-	done
-
-GoldenrodPokecomCenterPerson11Text: ; unreferenced
-	text "If I get in the"
-	line "NEWS and become"
-
-	para "famous, I bet I'll"
-	line "be adored."
-
-	para "I wonder how I"
-	line "could get in the"
-	cont "NEWS?"
-	done
-
-GoldenrodPokecenter1FGameboyKidText:
-	text "The COLOSSEUM"
-	line "upstairs is for"
-	cont "link battles."
-
-	para "Battle records are"
-	line "posted on the"
-
-	para "wall, so I can't"
-	line "afford to lose."
-	done
-
-GoldenrodPokecomCenterPerson12Text: ; unreferenced
+GoldenrodPokecomCenterPerson6Text:
 	text "I came over here"
 	line "when I got word"
 
@@ -694,14 +358,6 @@ GoldenrodPokecomCenterPerson12Text: ; unreferenced
 	line "preparations…"
 	done
 
-GoldenrodPokecomCenterPerson13Text: ; unreferenced
-	text "Just seeing all"
-	line "these new things"
-
-	para "here makes me feel"
-	line "younger!"
-	done
-
 GoldenrodPokecenter1FLassText:
 	text "A higher level"
 	line "#MON doesn't"
@@ -735,7 +391,14 @@ GoldenrodPokeCenter1FLinkReceptionistPleaseDoComeAgainText:
 	line "again!"
 	done
 
-GoldenrodPokecomCenterSignText: ; unreferenced
+GoldenrodPokecomCenterSignScript:
+	opentext
+	writetext GoldenrodPokecomCenterSignText
+	waitbutton
+	closetext
+	end
+	
+GoldenrodPokecomCenterSignText:
 	text "#COM CENTER"
 	line "1F INFORMATION"
 
@@ -749,14 +412,6 @@ GoldenrodPokecomCenterSignText: ; unreferenced
 	line "#MON NEWS"
 	done
 
-GoldenrodPokecomCenterNewsMachineNotYetText: ; unreferenced
-	text "It's a #MON"
-	line "NEWS MACHINE!"
-
-	para "It's not in"
-	line "operation yet…"
-	done
-
 GoldenrodPokecenter1FPokefanFDoYouHaveEonMailText:
 	text "Oh my, your pack"
 	line "looks so heavy!"
@@ -1065,8 +720,8 @@ PokecomCenterAdminOfficeMobile_MapEvents:
 	warp_event  1, 31, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 5
 	warp_event  6, 15, GOLDENROD_CITY, 15
 	warp_event  7, 15, GOLDENROD_CITY, 15
-	warp_event  0, 15, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 1
-	warp_event  0,  6, POKECENTER_2F, 1
+	warp_event  0,  6, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 1
+	warp_event  0, 15, POKECENTER_2F, 1
 
 	def_coord_events
 	coord_event  6, 15, SCENE_GOLDENRODPOKECENTER1F_GS_BALL, GoldenrodPokecenter1F_GSBallSceneLeft
@@ -1076,6 +731,23 @@ PokecomCenterAdminOfficeMobile_MapEvents:
 	bg_event  6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer1
 	bg_event  6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer2
 	bg_event  3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileComputer3
+	bg_event  2,  9, BGEVENT_READ, GoldenrodPokecomCenterSignScript
+	bg_event 24,  9, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 27, 11, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 26, 11, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 25, 11, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 24,  8, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 24,  7, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 24,  6, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 24,  5, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 24,  4, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 29,  9, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 29,  8, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 29,  7, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 29,  6, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 29,  5, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 29,  4, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
+	bg_event 28, 11, BGEVENT_READ, GoldenrodPokecomCenterNewsMachineScript
 
 	def_object_events
 	object_event  4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1
@@ -1083,6 +755,10 @@ PokecomCenterAdminOfficeMobile_MapEvents:
 	object_event  7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1
 	object_event  7,  7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FNurseScript, -1
 	object_event 16,  8, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
-	object_event  9, 11, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FGameboyKidScript, -1
 	object_event  3, 12, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FLassScript, -1
-	object_event 12, 11, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FPokefanF, -1
+	object_event 11, 13, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecenter1FPokefanF, -1
+	object_event 15, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson1Script, -1
+	object_event 13,  8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson2Script, -1
+	object_event 18, 13, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson4Script, -1
+	object_event 19, 13, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson5Script, -1
+	object_event 22,  7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokecomCenterPerson6Script, -1

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."

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."

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: