From 8d28a3ae0ed27dfa6aed9eb53692941a9f1dc4a8 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sat, 25 Nov 2023 12:36:10 +0000
Subject: [PATCH] Restore unreferenced Porygon PC

This was deleted when I was sprucing up the final Silph Co. floor, but I decided to restore it instead.

Because of the weird way PCs work, I made it so the text is a literal bg event on a monitor, true to the text. I think it works fine.

The text was changed to use `prompt` instead of `done` to fix text scrolling issues.
---
 README.md                         |  1 +
 data/maps/objects/RedsHouse2F.asm |  4 ++--
 data/maps/objects/SilphCo11F.asm  |  1 +
 scripts/SilphCo11F.asm            | 13 +++++++++++++
 text/SilphCo11F.asm               |  6 ++++++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6075ead2..751f6a56 100644
--- a/README.md
+++ b/README.md
@@ -143,6 +143,7 @@ Improved Areas
 - Fuchsia City has been made to resemble the more walkable LGPE version, removing the Cut trees among other things.
 - The Fighting Dojo has been revamped, featuring a design reminiscent of the prototype versions; rough floors, the elder in the back, and more. Additionally, you can now get a Hitmontop as a third option. The Karate Master is also now treated somewhat more like a Gym Leader, having Gym Scaling and a Rematch system. 
 - Silph Co's pathing was completely overhauled to make navigating it less tedious.
+- Silph Co. 11F's unreferenced Porygon PC was restored. It's on the monitor!
 - Cinnabar Island is a lot bigger, with the volcano being added to it. The mansion seems different too...
 	- Cinnabar Lab's Trade Room now features the Trader, who will evolve trade-evolving Pokemon for you!
 - Viridian Gym now has a minor new area once you make Giovanni leave.
diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm
index 8a02d3b2..3c719bf4 100644
--- a/data/maps/objects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
@@ -4,14 +4,14 @@ RedsHouse2F_Object:
 	def_warp_events
 	warp_event  7,  1, REDS_HOUSE_1F, 3
 	;warp_event  5,  1, SILPH_GAUNTLET_7F, 1 ; - Test Chief 
-	;warp_event  5,  1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
+	warp_event  5,  1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
 	;warp_event  5,  1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
 	;warp_event  5,  1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
 	;warp_event  5,  1, CELESTE_HILL, 1 ; - Test GMolt
 	;warp_event	 5,  1, HALL_OF_FAME, 1 ; Test post-game setup
 	;warp_event	 5,  1, GARNET_CAVERN_B1F, 1 ; Test GCuno
 	;warp_event	 5,  1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew
-	warp_event	 5,  1, GIOVANNIS_ROOM, 1 ; Test spinner tiles
+	;warp_event	 5,  1, GIOVANNIS_ROOM, 1 ; Test spinner tiles
 
 	def_bg_events
 
diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm
index 8e6839cd..dd4536af 100644
--- a/data/maps/objects/SilphCo11F.asm
+++ b/data/maps/objects/SilphCo11F.asm
@@ -8,6 +8,7 @@ SilphCo11F_Object:
 	warp_event  3,  2, SILPH_CO_7F, 3
 
 	def_bg_events
+	bg_event 11, 12, 14 ; Porygon PC
 
 	def_object_events
 	object_event  7,  5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm
index e579eb04..445ba971 100644
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -653,6 +653,7 @@ SilphCo11F_TextPointers:
 	dw OmegaText
 	dw Omega2Text
 	dw StupidGiovanniFix
+	dw SilphCo11FPorygonText
 
 SilphCo11TrainerHeaders:
 	def_trainers 5
@@ -796,3 +797,15 @@ Omega2BattleText:
 StupidGiovanniFix:
 	text_far _SilphCo10Text_62335
 	text_end
+
+SilphCo11FPorygonText:
+	text_asm
+	ld hl, .Text
+	call PrintText
+	ld a, PORYGON
+	call DisplayPokedex
+	jp TextScriptEnd
+
+.Text:
+	text_far _SilphCo11FPorygonText
+	text_end
diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm
index a645b956..68f5d81b 100644
--- a/text/SilphCo11F.asm
+++ b/text/SilphCo11F.asm
@@ -176,3 +176,9 @@ _SilphCoJessieJamesText4::
 
 	para "Again...@"
 	text_end
+
+_SilphCo11FPorygonText::
+	text "The monitor has"
+	line "#MON on it!"
+	prompt ; this fixes its strange scrolling issue
+