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

data/pokemon/dex_entries/alphalith.asm

@@ -0,0 +1,10 @@
+	db "LITHIC@" ; species name
+	dw 1002, 8800 ; height, weight
+
+	db   "Seems to be drawn"
+	next "to the radio waves"
+	next "being given off"
+
+	page "by the many UNOWN"
+	next "markings on its"
+	next "strange pillar.@"

data/pokemon/dex_entries/cloyster.asm

@@ -1,10 +1,10 @@
 	db "BIVALVE@" ; species name
 	dw 411, 2920 ; height, weight
 
-	db   "Its shell is as"
-	next "hard as diamonds."
-	next "Its SPIKE CANNON"
+	db   "Only KINGLER can"
+	next "break its shell."
+	next "To defend itself,"
 
-	page "ensures nothing"
-	next "can get close e-"
-	next "nough to open it.@"
+	page "it closes up and"
+	next "fires its two"
+	next "large spikes.@" ; Carddass reference.

data/pokemon/dex_entries/dewgonga.asm

@@ -0,0 +1,10 @@
+	db "MONK SEAL@" ; species name
+	dw 507, 2070 ; height, weight
+
+	db   "Having adapted to"
+	next "warmer oceans, its"
+	next "blubber is much"
+
+	page "less thick than"
+	next "that of most other"
+	next "DEWGONG.@"

data/pokemon/dex_entries/exeggcute.asm

@@ -1,10 +1,10 @@
 	db "EGG@" ; species name
 	dw 104, 60 ; height, weight
 
-	db   "If even one is"
-	next "separated from the"
-	next "group, the energy"
+	db   "When a member goes"
+	next "missing, the group"
+	next "panics and tries"
 
-	page "bond between the"
-	next "six will make them"
-	next "rejoin instantly.@"
+	page "to replace it. TO-"
+	next "GEPI is a very co-"
+	next "mmon victim.@" ; Pikachu's Rescue Adventure reference.

data/pokemon/dex_entries/exeggutor.asm

@@ -1,10 +1,10 @@
 	db "COCONUT@" ; species name
 	dw 607, 2650 ; height, weight
 
-	db   "Living in a good"
-	next "environment makes"
-	next "it grow lots of"
+	db   "Against smaller"
+	next "foes, EXEGGUTOR"
+	next "laughs and squashes"
 
-	page "heads. A head that"
-	next "drops off becomes"
-	next "an EXEGGCUTE.@"
+	page "them with a STOMP."
+	next "Each head has a"
+	next "different laugh.@" ; Carddass reference and generally contextualised.

data/pokemon/dex_entries/hitmonchan.asm

@@ -1,10 +1,10 @@
 	db "PUNCHING@" ; species name
 	dw 407, 1110 ; height, weight
 
-	db   "To increase the"
-	next "strength of all"
-	next "its punch moves,"
+	db   "Its body carries" ; Illustrated book lore
+	next "the spirit of a"
+	next "boxer. This lets" ; RIP 海老原博幸 Hiroyuki Ebihara.
 
-	page "it spins its arms"
-	next "just before making"
-	next "contact.@"
+	page "it quickly block"
+	next "any attack and"
+	next "swiftly COUNTER.@" ; Carddass reference.

data/pokemon/dex_entries/hitmonlee.asm

@@ -1,10 +1,10 @@
 	db "KICKING@" ; species name
 	dw 411, 1100 ; height, weight
 
-	db   "It is also called"
-	next "the Kick Master."
-	next "It uses its"
+	db   "Its body carries" ; Illustrated book lore
+	next "the spirit of a"
+	next "kickboxer. This" ; RIP 沢村忠 Tadashi Sawamura.
 
-	page "elastic legs to"
-	next "execute every"
-	next "known kick.@"
+	page "gives it full"
+	next "control over"
+	next "its ligaments.@" ; Could have more clarity, but in general, tying together lore from the illustrated book with modern lore.

data/pokemon/dex_entries/horsea.asm

@@ -1,10 +1,10 @@
 	db "DRAGON@" ; species name
 	dw 104, 180 ; height, weight
 
-	db   "When they're in a"
-	next "safe location,"
-	next "they can be seen"
+	db   "Lives in tropical" ; Seahorses usually live in these types of places.
+	next "oceans. The EGGs" ; Illustrated book, used for GSC-like flair: Breeding is rare.
+	next "it lays will be"
 
-	page "playfully tangling"
-	next "their tails"
-	next "together.@"
+	page "raised by males" ; Likewise, genders are new.
+	next "that spin the str-"
+	next "ongest WHIRLPOOLs.@" ; Shield data, contextualised into GSC given it's new and can be a sign of power.

data/pokemon/dex_entries/magiprey.asm

@@ -1,10 +1,10 @@
 	db "LAMPREY@" ; species name
-	dw 211, 220 ; height, weight
+	dw 303, 110 ; height, weight
 
 	db   "It hides in desert"
-	next "sands. When #MON"
-	next "come close, it"
+	next "sands. It latches"
+	next "onto #MON that"
 
-	page "latches onto"
-	next "them to suck"
+	page "wander too close,"
+	next "attempting to suck"
 	next "their blood.@" ; blood is rarely said in mons so consider revising

data/pokemon/dex_entries/mewtwoa.asm

@@ -0,0 +1,10 @@
+	db "GENETIC@" ; species name
+	dw 607, 2690 ; height, weight
+
+	db   "The armor controls"
+	next "its PSI abilities."
+	next "However, years of"
+
+	page "constraint and ex-"
+	next "periments has made"
+	next "MEWTWO vengeful.@" ; not sure about this line

data/pokemon/dex_entries/nidoran_f.asm

@@ -3,9 +3,9 @@
 
 	db   "Baby NIDORAN"
 	next "are just 10 cm" ; I don't know the orthography for this.
-	next "long. When threat-"
+	next "long. It loses"
 
-	page "ened, they GROWL"
-	next "in hopes the pre-"
-	next "dator leaves.@"
+	page "the ability to"
+	next "breed upon ev-"
+	next "olving.@"
 ; Illustrated Book and Carddass references.

data/pokemon/dex_entries/nidorina.asm

@@ -1,11 +1,11 @@
 	db "POISON PIN@" ; species name
 	dw 207, 440 ; height, weight
 
-	db   "Mating seasons for"
-	next "NIDORINO and NIDO-"
-	next "RINA last 2 months."
+	db   "It can fit many"
+	next "objects into its"
+	next "mouth. However, it"
 
-	page "NIDORINA can't bre-"
-	next "ed after evolving"
-	next "so it acts fast.@"
-; Illustrated Book reference. Part about Nidorina losing the ability to breed could be better.
+	page "will sometimes eat"
+	next "things it can't,"
+	next "such as VOLTORB.@"
+; Carddass reference.

data/pokemon/dex_entries/nidorino.asm

@@ -1,12 +1,12 @@
 	db "POISON PIN@" ; species name
 	dw 211, 430 ; height, weight
 	
-	db   "It begins to"
-	next "prepare nests for"
-	next "NIDORINA in the"
+	db   "Mating seasons for"
+	next "NIDORINO and NIDO-"
+	next "RAN♀ last 2 months."
 
-	page "summer. Before it"
-	next "battles, it does"
+	page "When battling for"
+	next "mates, it performs"
 	next "deimatic displays.@" ; Focus Energy
 
 ; Dual reference to the illustrated book and Carddass card.

data/pokemon/dex_entries/nimbeon.asm

@@ -0,0 +1,10 @@
+	db "AERIAL@" ; species name
+	dw 303, 480 ; height, weight
+
+	db   "Often challenges"
+	next "flocks of PIDGEOT"
+	next "to races. Although"
+
+	page "it can fly faster,"
+	next "it possesses less"
+	next "stamina.@"	; this can definitely be rewritten when we settle on a design

data/pokemon/dex_entries/porybit.asm

@@ -0,0 +1,10 @@
+	db "PIXEL@" ; species name
+	dw 100, 2 ; height, weight
+
+	db   "Believed to be a"
+	next "prototype form of"
+	next "PORYGON. Its two-"
+
+	page "dimensional body"
+	next "makes it a very"
+	next "unique species.@" ; can definitely be improved somehow

data/pokemon/dex_entries/rhydona.asm

@@ -0,0 +1,10 @@
+	db "DRILL@" ; species name
+	dw 603, 2650 ; height, weight
+
+	db   "Capable of firing"
+	next "lightning bolts"
+	next "from the tip of"
+
+	page "its horn, which is"
+	next "thought to be made"
+	next "of quartz.@"	; could probably be rewritten better

data/pokemon/dex_entries/rhyhorna.asm

@@ -0,0 +1,10 @@
+	db "SPIKES@" ; species name
+	dw 303, 2540 ; height, weight
+
+	db   "Electricity builds"
+	next "up within its body"
+	next "when it starts to"
+
+	page "run. Touching its"
+	next "horn will give you"
+	next "a painful shock!@"

data/pokemon/dex_entries/scyther.asm

@@ -1,10 +1,10 @@
 	db "MANTIS@" ; species name
 	dw 411, 1230 ; height, weight
 
-	db   "It's very proud of"
-	next "its speed. It"
-	next "moves so fast that"
+	db   "It rarely uses its"
+	next "wings for flight." ; from the illustrated book and KEP
+	next "For some reason,"
 
-	page "its opponent does"
-	next "not even know what"
-	next "knocked it down.@"
+	page "seeing the color"
+	next "red sends it into"
+	next "a blind rage.@"	; from Showdown at Dark City!

data/pokemon/dex_entries/scythera.asm

@@ -0,0 +1,10 @@
+	db "ORCHID@" ; species name
+	dw 403, 1070 ; height, weight
+
+	db   "Camouflages itself"
+	next "among vivid flower"
+	next "beds. It waits for"
+
+	page "prey to approach,"
+	next "then skewers them"
+	next "with its lances.@"

data/pokemon/dex_entries/seadra.asm

@@ -1,10 +1,10 @@
 	db "DRAGON@" ; species name
 	dw 311, 550 ; height, weight
 
-	db   "The male raises"
-	next "the young. If it"
-	next "is approached, it"
+	db   "Its scales contain" ; Alluding to Kingdra and the Dragon Scale.
+	next "draconic DNA that"
+	next "has stumped rese-"
 
-	page "uses its toxic"
-	next "spikes to fend off"
-	next "the intruder.@"
+	page "archers. Its dor-"
+	next "sal fin contains" ; General data. I want to mention it's stronger in mating season given it's GSC, but no space.
+	next "strong toxins.@"

data/pokemon/dex_entries/seel.asm

@@ -1,10 +1,10 @@
 	db "SEA LION@" ; species name
 	dw 307, 1980 ; height, weight
 
-	db   "The light blue fur"
-	next "that covers it"
-	next "keeps it protected"
+	db   "RESTs on icebergs." ; Carddass!
+	next "When it wakes up,"
+	next "it haphazardly"
 
-	page "against the cold."
-	next "It loves iceberg-"
-	next "filled oceans.@"
+	page "waddles into 14F"
+	next "oceans without a" ; -10C. 
+	next "care in the world.@"

data/pokemon/dex_entries/seela.asm

@@ -0,0 +1,10 @@
+	db "MONK SEAL@" ; species name
+	dw 307, 1480 ; height, weight
+
+	db   "It spends most of"
+	next "its time RESTing"
+	next "on sandy beaches."
+
+	page "Unlike other SEEL,"
+	next "it much prefers"
+	next "warmer weather.@"

data/pokemon/dex_entries/shellder.asm

@@ -1,10 +1,10 @@
 	db "BIVALVE@" ; species name
 	dw 100, 90 ; height, weight
 
-	db   "Clamping on to an"
-	next "opponent reveals"
-	next "its vulnerable"
+	db   "For some reason,"
+	next "CLAMPing to SLOW-"
+	next "POKETAILs causes" ; Alluding to DISTURBAN, but this may be too elaborate and explicit given it's already present in the Pokedex. Consider revising to be more of a dichotomy.
 
-	page "parts, so it uses"
-	next "this move only as"
-	next "a last resort.@"
+	page "a sudden mutation."
+	next "This has stumped"
+	next "specialists.@" ; Alluding to Prof. Westwood V.

data/pokemon/dex_entries/snorlax.asm

@@ -1,10 +1,10 @@
 	db "SLEEPING@" ; species name
 	dw 611, 10140 ; height, weight
 
-	db   "This #MON's"
-	next "stomach is so"
-	next "strong, even"
+	db   "Despite its size,"
+	next "SNORLAX can charge"
+	next "incredibly fast"
 
-	page "eating moldy or"
-	next "rotten food will"
-	next "not affect it.@"
+	page "when motivated,"
+	next "decimating every-"
+	next "thing in its way.@" ; Carddass reference, could also work as one to Pulverizing Pancake

data/pokemon/dex_entries/snorlaxa.asm

@@ -0,0 +1,10 @@
+	db "AWOKEN@" ; species name
+	dw 611, 10140 ; height, weight
+
+	db   "It roams around in"
+	next "search of sparring"
+	next "partners. Respects"
+
+	page "those with enough"
+	next "power to push it"
+	next "to one side.@"

data/pokemon/dex_entries/starmie.asm

@@ -1,10 +1,10 @@
 	db "MYSTERIOUS@" ; species name
 	dw 307, 1760 ; height, weight
 
-	db   "It is said that it"
-	next "uses the seven-"
-	next "colored core of"
+	db   "Because of its PSI"
+	next "abilites and herm-"
+	next "aphroditism, some"
 
-	page "its body to send"
-	next "electric waves"
-	next "into outer space.@"
+	page "think it comes fr-" ; General context combined with the illustrated book.
+	next "om space. Its core"
+	next "flashes when weak.@" ; Anime reference

data/pokemon/dex_entries/staryu.asm

@@ -1,10 +1,10 @@
 	db "STARSHAPE@" ; species name
 	dw 207, 760 ; height, weight
 
-	db   "When the stars"
-	next "twinkle at night,"
-	next "it floats up from"
+	db   "SHARPOON love to"
+	next "eat its arms, but"
+	next "they grow back." ; Reworded version of future dex entries, contextualised to Jagg instead.
 
-	page "the sea floor, and"
-	next "its body's center"
-	next "core flickers.@"
+	page "It sometimes drif-"
+	next "ts into estuaries"
+	next "and river mouths.@" ; Pokemon Snap reference

data/pokemon/dex_entries/tangela.asm

@@ -6,5 +6,5 @@
 	next "the more the vines"
 
 	page "on its body conti-"
-	next "nue to grow. Its"
-	next "face is obscured.@" ; last bit is filler; rest is prototype dex entry. feel free to enhance.
+	next "nue to grow. This"
+	next "obscures its face.@" ; prototype dex entry.

data/pokemon/dex_entries/tyrogue.asm

@@ -1,10 +1,10 @@
 	db "SCUFFLE@" ; species name
 	dw 204, 460 ; height, weight
 
-	db   "To brush up on its"
-	next "fighting skills,"
-	next "it will challenge"
+	db   "It's still learn-"
+	next "ing to fight. The"
+	next "battles ahead will"
 
-	page "anyone. It has a"
-	next "very strong com-"
-	next "petitive spirit.@"
+	page "determine its fu-" ; Vaguely alluding to how Tyrogue evolves. You wouldn't believe it, but no game actually explains this.
+	next "ture. Hates chea-"
+	next "ters like RIBBITO.@" ; May as well add a sense of honour to it, given its appearance.

maps/FightingDojo.asm

@@ -1,3 +1,6 @@
+; Set to become a Gym Leader rematch area like HGSS.
+; Additionally, I want there to be Dojogoers explaining Tyrogue and other bits. Tyrogue is extremely poorly explained.
+
 	object_const_def
 	const FIGHTINGDOJO_BLACK_BELT
 	const FIGHTINGDOJO_POKE_BALL