34 or so modified dex entries (&Torpir)

This reworks Hippunk into Torpir (well, not entirely internally, it's still HIPPUNK there).

I have also done several new dex entries. May need vetting by some of the others, the writing is inconsistent.

data/pokemon/base_stats/hippunk.asm

@@ -1,9 +1,9 @@
 	db 0 ; species ID placeholder
 
-	db  90,  75,  75,  30,  80,  80
+	db  35,  33,  30,  27,  28,  75
 	;   hp  atk  def  spd  sat  sdf
 
-	db PSYCHIC_TYPE, DARK ; type
+	db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
 	db 160 ; catch rate
 	db 110 ; base exp
 	db NO_ITEM, NO_ITEM ; items
@@ -16,6 +16,6 @@
 	db GROWTH_MEDIUM_FAST ; growth rate
 	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
-	; tm/hm learnset
+	; tm/hm learnset - Drowzee minus the punches
-	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, SURF, STRENGTH, FLASH
+	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, FLASH
 	; end

data/pokemon/dex_entries/balumba.asm

@@ -3,7 +3,7 @@
 
 	db   "Lives near small"
 	next "villages. Pulling"
-	next "BALUMBA's shriek"
+	next "BALUMBA's string"
 	
 	page "causes it great"
 	next "pain, making it"

data/pokemon/dex_entries/blottle.asm

@@ -1,10 +1,10 @@
 	db "INK@" ; species name
 	dw 211, 1000 ; height, weight - temp
 
-	db   "Recent studies show"
+	db   "Recent studies"
-	next "BLOTTLE and OMANY-"
+	next "show BLOTTLE and"
-	next "TE share a common"
+	next "OMANYTE share an"
 
-	page "ancestor. BLOTTLE"
+	page "ancestor. It is"
-	next "outcompeted it"
+	next "thought BLOTTLE"
-	next "for food.@"
+	next "outcompeted it.@"

data/pokemon/dex_entries/diglett.asm

@@ -1,10 +1,10 @@
 	db "MOLE@" ; species name
 	dw 8, 20 ; height, weight
 
-	db   "It digs under-"
+	db   "Shy and dislikes"
-	next "ground and chews"
+	next "sunlight. Because"
-	next "on tree roots,"
+	next "it flees so quic-"
 
-	page "sticking its head"
+	page "kly, its footprint"
-	next "out only when the"
+	next "has never been"
-	next "sun isn't bright.@"
+	next "documented.@" ; PMD reference.

data/pokemon/dex_entries/dodrio.asm

@@ -1,10 +1,10 @@
 	db "TRIPLEBIRD@" ; species name
 	dw 511, 1880 ; height, weight
 
-	db   "An enemy that"
+	db   "The weakest head"
-	next "takes its eyes off"
+	next "has returned."
-	next "any of the three"
+	next "Strong and irate,"
 
-	page "heads--even for a"
+	page "it now commands"
-	next "second--will get"
+	next "the others with"
-	next "pecked severely.@"
+	next "bravado.@"

data/pokemon/dex_entries/doduo.asm

@@ -1,10 +1,10 @@
 	db "TWIN BIRD@" ; species name
 	dw 407, 860 ; height, weight
 
-	db   "It lives on a"
+	db   "The weakest head" ; Alluding to Dodaerie.
-	next "grassy plain where"
+	next "has merged into"
-	next "it can see a long"
+	next "its body. The two"
 
-	page "way. If it sees an"
+	page "that remain get"
-	next "enemy, it runs"
+	next "tangled up and"
-	next "away at 60 mph.@"
+	next "panic sometimes.@" ; Carddass reference.

data/pokemon/dex_entries/drowzee.asm

@@ -1,10 +1,10 @@
 	db "HYPNOSIS@" ; species name
 	dw 303, 710 ; height, weight
 
-	db   "When it twitches"
+	db   "Said to be related"
-	next "its nose, it can"
+	next "to Baku, DROWZEE" ; Mentioned in illustrated book and KEP.
-	next "tell where someone"
+	next "TRAINERs pioneered" ; Referencing anime EP027
 
-	page "is sleeping and"
+	page "combination atta-"
-	next "what that person"
+	next "cks with HYPNOSIS"
-	next "is dreaming about.@"
+	next "and DREAM EATER.@"

data/pokemon/dex_entries/dugtrio.asm

@@ -1,10 +1,10 @@
 	db "MOLE@" ; species name
 	dw 204, 730 ; height, weight
 
-	db   "These DIGLETT"
+	db   "Considered an"
-	next "triplets dig over"
+	next "asset to agricul-"
-	next "60 miles below sea"
+	next "ture, DUGTRIO is"
 
-	page "level. No one"
+	page "loved by farmers."
-	next "knows what it's"
+	next "It's sometimes se-"
-	next "like underground.@"
+	next "en in tree stumps.@" ; Pikachu's Winter Adventure reference, otherwise aggregating outside data. 

data/pokemon/dex_entries/electrode.asm

@@ -1,10 +1,12 @@
 	db "BALL@" ; species name
 	dw 311, 1470 ; height, weight
 
-	db   "The more energy it"
+	db   "Like a gachapon"
-	next "charges up, the"
+	next "capsule, ELECTRODE"
-	next "faster it gets."
+	next "is hollow. Resear-"
 
-	page "But this also"
+	page "ch into this has"
-	next "makes it more"
+	next "stumped even the"
-	next "likely to explode.@"
+	next "best of the best.@" ; Carddass Reference
+
+; Writing is iffy. Consider revising.

data/pokemon/dex_entries/gengar.asm

@@ -1,10 +1,10 @@
 	db "SHADOW@" ; species name
 	dw 411, 890 ; height, weight
 
-	db   "Hiding in people's"
+	db   "Feeds on dreams." ; Carddass reference.
-	next "shadows at night,"
+	next "Because SNORLAX"
-	next "it absorbs their"
+	next "dreams about food,"
 
-	page "heat. The chill it"
+	page "it's GENGAR's fav-"
-	next "causes makes the"
+	next "ourite target, but"
-	next "victims shake.@"
+	next "HYPNO intervenes.@" ; Added Hypno into the mix to worldbuild.

data/pokemon/dex_entries/grimer.asm

@@ -1,10 +1,10 @@
 	db "SLUDGE@" ; species name
 	dw 211, 660 ; height, weight
 
-	db   "When two of these"
+	db   "It loves taking"
-	next "#MON's bodies"
+	next "in toxic fumes"
-	next "are combined"
+	next "to spit them" ; Carddass reference
 
-	page "together, new"
+	page "out at onlookers."
-	next "poisons are"
+	next "Nicotine smoke" ; Since KEP's Charmander mentions smokers, Grimer can inhale passive smoke.
-	next "created.@"
+	next "is a favourite.@"

data/pokemon/dex_entries/haunter.asm

@@ -1,10 +1,10 @@
 	db "GAS@" ; species name
 	dw 503, 2 ; height, weight
 
-	db   "Is it possible a"
+	db   "It's theorised a"
 	next "HAUNTER that has"
 	next "been to the spi-"
 
 	page "rit world could"
-	next "become a GENGAR?"
+	next "become a GENGAR."
-	next "It's possible.@" ; prototype dex entry with incredibly interesting implications.
+	next "Research ongoing.@" ; prototype dex entry with incredibly interesting implications.

data/pokemon/dex_entries/hippunk.asm

@@ -1,11 +1,10 @@
-	db "PUNK@" ; species name
+	db "HYPNOSIS@" ; species name
-	dw 304, 2117 ; height, weight
+	dw 204, 2117 ; height, weight
 
-	db   "It disturbs"
+	db   "It is too energ-"
-	next "SLOWPOKE from"
+	next "etic to put most"
-	next "their slumber with"
+	next "#MON to sleep,"
 
-	page "high pitched"
+	page "but SLOWPOKE"
-	next "squeals before"
+	next "are easy enough"
-	next "attacking.@"
+	next "targets.@" ; it looks like Slowpoke but CryptoDex among others gave the compelling case of it being Drowzee, so let's keep referencing Slowpoke.
-; being reworked

data/pokemon/dex_entries/hypno.asm

@@ -1,10 +1,10 @@
 	db "HYPNOSIS@" ; species name
 	dw 503, 1670 ; height, weight
 
-	db   "The longer it"
+	db   "Its PSI powers"
-	next "swings its"
+	next "require a heavy"
-	next "pendulum, the"
+	next "diet of dreams."
 
-	page "longer the effects"
+	page "When using MEDI-"
-	next "of its hypnosis"
+	next "TATE, a healthy"
-	next "last.@"
+	next "HYPNO will float.@" ; Carddass reference.

data/pokemon/dex_entries/kingler.asm

@@ -1,10 +1,10 @@
 	db "PINCER@" ; species name
 	dw 403, 1320 ; height, weight
 
-	db   "Its oversized claw"
+	db   "Preys on CLOYSTER"
-	next "is very powerful,"
+	next "and DISTURBAN by"
-	next "but when it's not"
+	next "prying open their" ; Re-contextualised Stadium dex entry, now including Disturban.
 
-	page "in battle, the"
+	page "shells with"
-	next "claw just gets in"
+	next "10,000 horsepower"
-	next "the way.@"
+	next "of force.@"

data/pokemon/dex_entries/koffing.asm

@@ -1,10 +1,10 @@
 	db "POISON GAS@" ; species name
 	dw 200, 20 ; height, weight
 
-	db   "If one gets close"
+	db   "No two KOFFING" ; Referencing early sprites where the face would be in various different places, as well as Weezing.
-	next "enough to it when"
+	next "look alike. Its"
-	next "it expels poison-"
+	next "gas can be igni-"
 
-	page "ous gas, the gas"
+	page "ted, prompting"
-	next "swirling inside it"
+	next "risk of gas EXP-"
-	next "can be seen.@"
+	next "LOSIONs@" ; Referencing Pokemon Emergency and Carddass.

data/pokemon/dex_entries/krabby.asm

@@ -1,10 +1,10 @@
 	db "RIVER CRAB@" ; species name
 	dw 104, 140 ; height, weight
 
-	db   "If it is unable"
+	db   "Hides under rocks" ; Quasi-lore reference with Krabby being a Rock Smash Pokemon.
-	next "to find food, it"
+	next "on beaches. If"
-	next "will absorb"
+	next "discovered, it"
 
-	page "nutrients by"
+	page "will wave its" ; Illustrated book reference.
-	next "swallowing a"
+	next "claws before re-"
-	next "mouthful of sand.@"
+	next "treating.@"

data/pokemon/dex_entries/machamp.asm

@@ -5,6 +5,6 @@
 	next "punches a second,"
 	next "and thanks to its"
 
-	page "sturdy loewer"
+	page "sturdy lower"
 	next "body, it keeps"
 	next "its balance.@" ; prototype dex entry detail

data/pokemon/dex_entries/machoke.asm

@@ -1,10 +1,10 @@
 	db "SUPERPOWER@" ; species name
 	dw 411, 1550 ; height, weight
 
-	db   "This tough #MON"
+	db   "It takes pride in"
-	next "always stays in"
+	next "its appearance."
-	next "the zone. Its"
+	next "When attacked,"
 
-	page "muscles become"
+	page "it will check"
-	next "thicker after"
+	next "its face before"
-	next "every battle.@"
+	next "returning the blow.@" ; Stadium animation reference, I believe some other media discusses its modest, dainty side as well.

data/pokemon/dex_entries/machop.asm

@@ -1,10 +1,10 @@
 	db "SUPERPOWER@" ; species name
 	dw 207, 430 ; height, weight
 
-	db   "It trains by"
+	db   "As it grows more"
-	next "lifting rocks in"
+	next "confident, it will"
-	next "the mountains. It"
+	next "challenge TYROGUE" ; recontextualising future entries about it fighting Makuhita.
 
-	page "can even pick up a"
+	page "to fights. It will"
-	next "GRAVELER with"
+	next "decide if it stops"
-	next "ease.@"
+	next "a RHYHORN charge!@" ; writing is missing a slight reference. consider revising.

data/pokemon/dex_entries/magnemite.asm

@@ -1,10 +1,10 @@
 	db "MAGNET@" ; species name
 	dw 100, 130 ; height, weight
 
-	db   "It seems to be"
+	db   "Seemingly attract-"
-	next "attracted to magn-"
+	next "ed to magnetic"
-	next "etic forces, it's"
+	next "forces, MAGNEMITE"
 
-	page "not uncommon for"
+	page "are known for swa-"
-	next "them to appear at"
+	next "rming around the"
-	next "the MAGNET TRAIN.@" ; prototype dex entry contextualised into them swarming the magnet train
+	next "MAGNET TRAIN.@" ; prototype dex entry contextualised into them swarming the magnet train

data/pokemon/dex_entries/magneton.asm

@@ -1,10 +1,10 @@
 	db "MAGNET@" ; species name
 	dw 303, 1320 ; height, weight
 
-	db   "When many"
+	db   "When sleeping,"
-	next "MAGNETON gather"
+	next "its magnetism"
-	next "together, the"
+	next "becomes unstable."
 
-	page "resulting magnetic"
+	page "Sometimes, a"
-	next "storm disrupts"
+	next "MAGNEMITE may"
-	next "radio waves.@"
+	next "unlink.@" ; Pokemon Sleep and Snap dual-reference. However, it could be more explicit. Consider revising.

data/pokemon/dex_entries/marowak.asm

@@ -1,10 +1,10 @@
 	db "BONEKEEPER@" ; species name
 	dw 303, 990 ; height, weight
 
-	db   "Somewhere in the"
+	db   "Its bone gives it" ; GSC doesn't imply the Thick Club boosts Marowak's Attack at all! The nerve!
-	next "world is a ceme-"
+	next "extreme power."
-	next "tery just for"
+	next "Attempts to re-"
 
-	page "MAROWAK. It gets"
+	page "search this are"
-	next "its bones from"
+	next "met with furious"
-	next "those graves.@"
+	next "resistance.@"

data/pokemon/dex_entries/muk.asm

@@ -1,10 +1,10 @@
 	db "SLUDGE@" ; species name
 	dw 311, 660 ; height, weight
 
-	db   "The toxins in its"
+	db   "Merely touching"
-	next "body will mix to-"
+	next "MUK causes severe"
-	next "gether to form"
+	next "illness. When"
 
-	page "new ones. Doctors"
+	page "pursuing targets,"
-	next "have trouble kee-"
+	next "it will pelt them"
-	next "ping track.@"
+	next "with its SLUDGE.@" ; Carddass reference that is very fucking scary tbh

data/pokemon/dex_entries/onix.asm

@@ -1,10 +1,10 @@
 	db "ROCK SNAKE@" ; species name
 	dw 2810, 4630 ; height, weight
 
-	db   "As it digs through"
+	db   "Its body segments"
-	next "the ground, it"
+	next "become rounder"
-	next "absorbs many hard"
+	next "and more diamond-"
 
-	page "objects. This is"
+	page "like as it ages."
-	next "what makes its"
+	next "If separated, they"
-	next "body so solid.@"
+	next "can reattach.@" ; Pokemon Adventures and aggregation of general data about its body.

data/pokemon/dex_entries/pendraken.asm

@@ -6,5 +6,5 @@
 	next "makes it popular"
 
 	page "with calligraphers."
-	next "it can write kanji" ; in a localisation during this time period, I doubt it would pass.
+	next "It can write kanji" ; in a localisation during this time period, I doubt it would pass, so consider revising.
-	next "with ease!@" ; consider revising. I imagine it would write 水 quite well!
+	next "with ease!@" ; I imagine it would write 水 quite well, though!

data/pokemon/dex_entries/ponyta.asm

@@ -1,10 +1,10 @@
 	db "FIRE HORSE@" ; species name
 	dw 303, 660 ; height, weight
 
-	db   "Training by"
+	db   "When leaping into"
-	next "jumping over grass"
+	next "the sky, PONYTA"
-	next "that grows longer"
+	next "cloaks itself with" ; Carddass reference
 
-	page "every day has made"
+	page "FIRE SPIN. It's a"
-	next "it a world-class"
+	next "standard circus" ; Circuses tend to have a horse jumping through fire. Why not take it a step further?
-	next "jumper.@"
+	next "performance now.@"

data/pokemon/dex_entries/slowbro.asm

@@ -1,10 +1,10 @@
 	db "HERMITCRAB@" ; species name
 	dw 503, 1730 ; height, weight
 
-	db   "An attached"
+	db   "The SHELLDER that"
-	next "SHELLDER won't let"
+	next "bit it evolved"
-	next "go because of the"
+	next "into DISTURBAN."
 
-	page "tasty flavor that"
+	page "If it falls off,"
-	next "oozes out of its"
+	next "SLOWBRO becomes a" ; Discussing the differences between the Pokemon and how their evolutions work.
-	next "tail.@"
+	next "SLOWPOKE again.@" ; Using RBY dex entries for the Slowbro part. 

data/pokemon/dex_entries/slowking.asm

@@ -1,10 +1,10 @@
 	db "ROYAL@" ; species name
 	dw 607, 1750 ; height, weight
 
-	db   "Every time it ya-"
+	db   "It is said that"
-	next "wns, SHELLDER"
+	next "1 in 10,000"
-	next "injects more poi-"
+	next "SHELLDER bite a"
 
-	page "son into it. The"
+	page "SLOWPOKE's head,"
-	next "poison makes it"
+	next "activating its"
-	next "more intelligent.@"
+	next "brain cells.@" ; Pocket Monsters Official Fanbook.

data/pokemon/dex_entries/slowpoke.asm

@@ -1,10 +1,10 @@
 	db "DOPEY@" ; species name
 	dw 311, 790 ; height, weight
 
-	db   "It is always so"
+	db   "Its TAIL is a deli-"
-	next "absent-minded that"
+	next "cacy in many diffe-"
-	next "it won't react,"
+	next "rent countries." ; Referencing various regions that don't have anywhere near as much controversy relating to eating Slowpoketails.
 
-	page "even if its"
+	page "Depending on what"
-	next "flavorful tail is"
+	next "it eats, the fla-"
-	next "bitten.@"
+	next "vor will change.@" ; Referencing Galarian Slowpoke's entry in Pokemon Journeys. Presumably applies to both.

data/pokemon/dex_entries/smujj.asm

@@ -1,9 +1,9 @@
 	db "SLUDGE@" ; species name
 	dw 6, 17 ; height, weight
 
-	db   "It's often"
+	db   "It's often mist-"
-	next "mistaken for a"
+	next "aken for a wad"
-	next "wad of chewing gum"
+	next "of chewing gum"
 
 	page "and stepped on,"
 	next "releasing a foul"

data/pokemon/dex_entries/steelix.asm

@@ -1,10 +1,10 @@
 	db "IRON SNAKE@" ; species name
 	dw 3002, 8820 ; height, weight
 
-	db   "The many small"
+	db   "It evolved large"
-	next "metal particles"
+	next "axles to help it" ; Weirdly enough, the Pokedex never talks about these, despite them being a massive part of the design. 
-	next "that cover this"
+	next "dig deeper. With"
 
-	page "#MON's body"
+	page "these, it can tu-"
-	next "reflect bright"
+	next "nnel through the"
-	next "light well.@"
+	next "Earth's mantle.@" ; It's capable of digging to the earth's core, so this works fine, right?

data/pokemon/dex_entries/tentacruel.asm

@@ -1,10 +1,10 @@
 	db "JELLYFISH@" ; species name
 	dw 503, 1210 ; height, weight
 
-	db   "When its 80 feel-"
+	db   "The jewels on its"
-	next "ers absorb water,"
+	next "forehead can glow"
-	next "it stretches to"
+	next "and shoot beams" ; Fossil TCG Tentacool and anime references.
 
-	page "become like a net"
+	page "of light. Some"
-	next "to entangle its"
+	next "TENTACRUEL grow"
-	next "prey.@"
+	next "to unusual sizes.@" ; Anime reference

data/pokemon/dex_entries/weezing.asm

@@ -1,10 +1,11 @@
 	db "POISON GAS@" ; species name
 	dw 311, 210 ; height, weight
 
-	db   "When it inhales"
+	db   "The effects of its" 
 	next "poisonous gases"
-	next "from garbage, its"
+	next "have prompted use"
 
-	page "body expands, and"
+	page "of its image in"
-	next "its insides smell"
+	next "green energy"
-	next "much worse.@"
+	next "campaigns.@"
+; Referencing its original localised name, La, whereas Koffing was Ny. These names referenced two of the US's most polluted cities.

data/pokemon/evos_attacks_johto.asm

@@ -1135,20 +1135,14 @@ SunfloraEvosAttacks:
 	db 0 ; no more level-up moves
 
 HippunkEvosAttacks:
+	dbbw EVOLVE_HAPPINESS, TR_NITE, DROWZEE ; I could make it anytime, but let's imagine the night making it tired enough to focus its powers. Drowzee was often placed as a nocturnal Pokemon in SW97...
 	db 0; no more evolutions
-	dbw 1, TACKLE
+	dbw 1, POUND
-	dbw 1, CONFUSION
+	dbw 1, CHARM
-	dbw 6, GROWL
+	dbw 4, HYPNOSIS
-	dbw 10, BITE
+	dbw 8, CONFUSION
-	dbw 15, SUPERSONIC
+	dbw 13, REST
-	dbw 20, STOMP
+	dbw 20, PSYWAVE
-	dbw 25, AMNESIA
-	dbw 29, ENCORE
-	dbw 34, BEAT_UP
-	dbw 39, PSYBEAM
-	dbw 43, PERISH_SONG
-	dbw 48, CRUNCH
-	dbw 54, FUTURE_SIGHT
 	db 0 ; no more level-up moves
 
 AercrowEvosAttacks:

data/pokemon/names.asm

@@ -274,7 +274,7 @@ PokemonNames::
 	db "SUNKERN@@@"
 	db "SUNBUD@@@@"
 	db "SUNFLORA@@"
-	db "HIPPUNK@@@"
+	db "TORPIR@@@@"
 	db "AERCROW@@@"
 	db "FOXFIRE@@@"
 	db "YANMA@@@@@"