From 97cb4cfaf3159a54a68c4df471961b286c4fce49 Mon Sep 17 00:00:00 2001
From: May Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 17 Oct 2022 13:09:14 +0100
Subject: [PATCH] Add another CeladonU NPC

This is a reference to another bit of the Tamamushi booklets, where they talk about the Pokemon that can fly without wings.

Also, shortened one of the text chains. In general, they need to be much shorter.
---
 .../objects/CeladonUniversityPokecenter.asm   |  1 +
 engine/debug/debug_party.asm                  |  2 +-
 scripts/CeladonUniversityPokecenter.asm       |  5 +++++
 text/CeladonUniversityInside.asm              | 22 +++++--------------
 text/CeladonUniversityPokecenter.asm          | 10 +++++++++
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/data/maps/objects/CeladonUniversityPokecenter.asm b/data/maps/objects/CeladonUniversityPokecenter.asm
index 36080fb5..004f281e 100644
--- a/data/maps/objects/CeladonUniversityPokecenter.asm
+++ b/data/maps/objects/CeladonUniversityPokecenter.asm
@@ -11,6 +11,7 @@ CeladonUniversityPokecenter_Object:
 	object_event  3,  1, SPRITE_NURSE, STAY, DOWN, 1 ; person
 	object_event  8,  3, SPRITE_SCIENTIST, STAY, LEFT_RIGHT, 2 ; person
 	object_event 10,  5, SPRITE_MIDDLE_AGED_MAN, WALK, ANY_DIR, 3 ; spamton
+	object_event  3,  5, SPRITE_SUPER_NERD, STAY, DOWN, 4 ; person
 	object_event 11,  2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to CELADON_UNIVERSITY_POKECENTER
diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm
index 9a0ecc28..98bc55c7 100644
--- a/engine/debug/debug_party.asm
+++ b/engine/debug/debug_party.asm
@@ -154,7 +154,7 @@ DebugItemsList:
 	db COIN_CASE, 1
 	db POKE_FLUTE, 1
 	db SILPH_SCOPE, 1
-	; db OLDSEACHART, 1
+	db OLDSEACHART, 1
 	db -1 ; end
 
 DebugUnusedList:
diff --git a/scripts/CeladonUniversityPokecenter.asm b/scripts/CeladonUniversityPokecenter.asm
index b4fbbad5..716a3daf 100644
--- a/scripts/CeladonUniversityPokecenter.asm
+++ b/scripts/CeladonUniversityPokecenter.asm
@@ -6,6 +6,7 @@ CeladonUniversityPokecenter_TextPointers:
 	dw CeladonUniversityHealNurseText
 	dw CeladonUniversityPokecenterText2
 	dw CuboneSalesmanText
+	dw CeladonUniversityPokecenterText8
 	dw CeladonUniversityTradeNurseText
 
 CeladonUniversityTradeNurseText:
@@ -82,3 +83,7 @@ CuboneSalesmanText:
 .Text2
 	text_far _CuboneSalesmanText2
 	text_end
+
+CeladonUniversityPokecenterText8::
+	text_far _CeladonUniversityPokecenterText8
+	text_end
\ No newline at end of file
diff --git a/text/CeladonUniversityInside.asm b/text/CeladonUniversityInside.asm
index c9ec5e8d..34c93791 100644
--- a/text/CeladonUniversityInside.asm
+++ b/text/CeladonUniversityInside.asm
@@ -106,30 +106,18 @@ _BookcaseText3::
 	line "# BALL was"
 	cont "discovered by"
 	cont "PROF. WESTWOOD,"
-	cont "who accidentally"
-	cont "administered too"
-	cont "many drugs to a"
+	cont "as part of an"
+	cont "experiment to"
+	cont "extract the"
+	cont "energy of a"
 	cont "PRIMEAPE."
 	
-	para "This was part"
-	line "of an experiment"
-	cont "to extract its"
-	cont "angry energy."
-	
-	para "Weakened, it"
-	line "curled into a"
-	cont "ball and fit into"
-	cont "his glasses case."
-	
 	para "The modern #"
 	line "BALL was made by"
 	cont "researchers at"
 	cont "CELADON"
 	cont "UNIVERSITY"
-	cont "in 1925, and"
-	cont "mass production"
-	cont "began at SILPH"
-	cont "CO. soon after."
+	cont "in 1925."
 	
 	done
 
diff --git a/text/CeladonUniversityPokecenter.asm b/text/CeladonUniversityPokecenter.asm
index 435bde42..d931fc6a 100644
--- a/text/CeladonUniversityPokecenter.asm
+++ b/text/CeladonUniversityPokecenter.asm
@@ -46,3 +46,13 @@ _CuboneSalesmanText2::
 	text "MAN: As usual, no"
 	line "refunds!"
 	done
+
+_CeladonUniversityPokecenterText8::
+	text "I wonder how"
+	line "DRAGONAIR can fly"
+	cont "without wings..."
+	
+	text "#MON are strange"
+	line "creatures..."
+	
+	done
\ No newline at end of file